[maemo-commits] [maemo-commits] r11266 - in projects/haf/trunk/hildon-thumbnail: . debian

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-04-24 21:42:11 +0300 (Tue, 24 Apr 2007)
New Revision: 11266

Modified:
   projects/haf/trunk/hildon-thumbnail/configure.ac
   projects/haf/trunk/hildon-thumbnail/debian/changelog
   projects/haf/trunk/hildon-thumbnail/debian/control
Log:
hildon-thumbnail (0.10) unstable; urgency=low

  * Don't let libhildon-thumbnail0 conflict with osso-thumbnail0.  This is
    not necessary and complicates the transition.

 -- Marius Vollmer <marius.vollmer at nokia.com>  Tue, 24 Apr 2007 21:36:26 +0300


Modified: projects/haf/trunk/hildon-thumbnail/configure.ac
===================================================================
--- projects/haf/trunk/hildon-thumbnail/configure.ac	2007-04-24 18:37:52 UTC (rev 11265)
+++ projects/haf/trunk/hildon-thumbnail/configure.ac	2007-04-24 18:42:11 UTC (rev 11266)
@@ -1,6 +1,6 @@
 AC_INIT(Makefile.am)
 AC_CONFIG_AUX_DIR(config)
-AM_INIT_AUTOMAKE(hildon-thumbnail, 0.8)
+AM_INIT_AUTOMAKE(hildon-thumbnail, 0.10)
 AM_CONFIG_HEADER(config.h)
 
 AC_CANONICAL_HOST

Modified: projects/haf/trunk/hildon-thumbnail/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-thumbnail/debian/changelog	2007-04-24 18:37:52 UTC (rev 11265)
+++ projects/haf/trunk/hildon-thumbnail/debian/changelog	2007-04-24 18:42:11 UTC (rev 11266)
@@ -1,3 +1,10 @@
+hildon-thumbnail (0.10) unstable; urgency=low
+
+  * Don't let libhildon-thumbnail0 conflict with osso-thumbnail0.  This is
+    not necessary and complicates the transition.
+
+ -- Marius Vollmer <marius.vollmer at nokia.com>  Tue, 24 Apr 2007 21:36:26 +0300
+
 hildon-thumbnail (0.9) unstable; urgency=low
 
   * Folded into the Hildon family.

Modified: projects/haf/trunk/hildon-thumbnail/debian/control
===================================================================
--- projects/haf/trunk/hildon-thumbnail/debian/control	2007-04-24 18:37:52 UTC (rev 11265)
+++ projects/haf/trunk/hildon-thumbnail/debian/control	2007-04-24 18:42:11 UTC (rev 11266)
@@ -20,8 +20,7 @@
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: osso-thumbnail0, osso-thumbnail-libid3 (<< 0.3.0)
-Replaces: osso-thumbnail0
+Conflicts: osso-thumbnail0 (<< 0.3.0), osso-thumbnail-libid3 (<< 0.3.0)
 Description: Thumbnail library.
 
 Package: libhildon-thumbnail0-dbg