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

[From: subversion at stage.maemo.org]

Author: marivoll
Date: 2007-02-20 18:18:44 +0200 (Tue, 20 Feb 2007)
New Revision: 10079

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).


Modified: projects/haf/trunk/hildon-fm/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-fm/debian/changelog	2007-02-20 15:43:53 UTC (rev 10078)
+++ projects/haf/trunk/hildon-fm/debian/changelog	2007-02-20 16:18:44 UTC (rev 10079)
@@ -1,3 +1,9 @@
+libhildonfm (2.10-2) unstable; urgency=low
+
+  * Make libhildonfm2-dev conflict with hildon-fm-dev (<< 2).
+  
+ -- Marius Vollmer <marius.vollmer at nokia.com>  Tue, 20 Feb 2007 18:10:16 +0200
+
 libhildonfm (2.10-1) unstable; urgency=low
 
   * Added Build dependency on libdbus-1-dev (>= 1.0).

Modified: projects/haf/trunk/hildon-fm/debian/control
===================================================================
--- projects/haf/trunk/hildon-fm/debian/control	2007-02-20 15:43:53 UTC (rev 10078)
+++ projects/haf/trunk/hildon-fm/debian/control	2007-02-20 16:18:44 UTC (rev 10079)
@@ -22,6 +22,7 @@
 Package: libhildonfm2-dev
 Section: devel
 Architecture: all
+Conflicts: hildon-fm-dev (<< 2)
 Depends: libhildonfm2 (= ${Source-Version}), libgtk2.0-dev (>= 2:2.10), osso-thumbnail-dev, osso-gwconnect-dev, libhildon1-dev, libossomime-dev
 Description: Development files for libhildonfm2.