[maemo-commits] [maemo-commits] r10363 - projects/haf/trunk/hildon-fm/debian

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-03-05 15:47:36 +0200 (Mon, 05 Mar 2007)
New Revision: 10363

Modified:
   projects/haf/trunk/hildon-fm/debian/changelog
   projects/haf/trunk/hildon-fm/debian/control
Log:
  * Make libhildonfm2-dev conflict with hildon-fm-dev (<= 2.10).
    Conflicting with (<< 2) wasn't enough since there is a 2.0 version out
    there that does conflict.


Modified: projects/haf/trunk/hildon-fm/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-fm/debian/changelog	2007-03-05 12:43:15 UTC (rev 10362)
+++ projects/haf/trunk/hildon-fm/debian/changelog	2007-03-05 13:47:36 UTC (rev 10363)
@@ -1,3 +1,11 @@
+libhildonfm (2.13-2) unstable; urgency=low
+
+  * Make libhildonfm2-dev conflict with hildon-fm-dev (<= 2.10).
+    Conflicting with (<< 2) wasn't enough since there is a 2.0 version out
+    there that does conflict.
+
+ -- Marius Vollmer <marius.vollmer at nokia.com>  Mon,  5 Mar 2007 15:44:24 +0200
+
 libhildonfm (2.13-1) unstable; urgency=low
 
   * More consolidation.

Modified: projects/haf/trunk/hildon-fm/debian/control
===================================================================
--- projects/haf/trunk/hildon-fm/debian/control	2007-03-05 12:43:15 UTC (rev 10362)
+++ projects/haf/trunk/hildon-fm/debian/control	2007-03-05 13:47:36 UTC (rev 10363)
@@ -22,7 +22,7 @@
 Package: libhildonfm2-dev
 Section: devel
 Architecture: all
-Conflicts: hildon-fm-dev (<< 2)
+Conflicts: hildon-fm-dev (<= 2.10)
 Depends: libhildonfm2 (= ${Source-Version}), libgtk2.0-dev (>= 2:2.10), osso-thumbnail-dev, osso-gwconnect-dev, libhildon1-dev, libhildonmime-dev
 Description: Development files for libhildonfm2.