[maemo-commits] [maemo-commits] r10131 - projects/haf/trunk/libhildonmime/debian

[From: subversion at stage.maemo.org]

Author: erikarls
Date: 2007-02-21 16:36:50 +0200 (Wed, 21 Feb 2007)
New Revision: 10131

Modified:
   projects/haf/trunk/libhildonmime/debian/changelog
   projects/haf/trunk/libhildonmime/debian/control
Log:
Fixed conflict

Modified: projects/haf/trunk/libhildonmime/debian/changelog
===================================================================
--- projects/haf/trunk/libhildonmime/debian/changelog	2007-02-21 14:23:45 UTC (rev 10130)
+++ projects/haf/trunk/libhildonmime/debian/changelog	2007-02-21 14:36:50 UTC (rev 10131)
@@ -1,3 +1,9 @@
+libhildonmime (1.9.1) unstable; urgency=low
+
+  * Added conflict package 
+
+ -- Erik Karlsson <erik.b.karlsson at nokia.com>  Wed, 21 Feb 2007 16:36:12 +0200
+
 libhildonmime (1.9.0-1) unstable; urgency=low
 
   * Start new development branch

Modified: projects/haf/trunk/libhildonmime/debian/control
===================================================================
--- projects/haf/trunk/libhildonmime/debian/control	2007-02-21 14:23:45 UTC (rev 10130)
+++ projects/haf/trunk/libhildonmime/debian/control	2007-02-21 14:36:50 UTC (rev 10131)
@@ -6,6 +6,7 @@
 Standards-Version: 3.6.1.0
 
 Package: libhildonmime0
+Conflicts: libossomime0 (<< 1.8.5) 
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, hildon-update-category-database (= ${Source-Version}), osso-uri-l10n-mr0 | osso-uri-l10n-mr