[maemo-commits] [maemo-commits] r10659 - projects/haf/trunk/hildon-desktop/debian

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-03-20 17:15:22 +0200 (Tue, 20 Mar 2007)
New Revision: 10659

Modified:
   projects/haf/trunk/hildon-desktop/debian/changelog
   projects/haf/trunk/hildon-desktop/debian/control
Log:

hildon-desktop (0.0.0-34) unstable; urgency=low

  * Conflict with maemo-af-desktop < 3.0.0 (transition package) 

 -- Johan Bilien <johan.bilien at nokia.com>  Tue, 20 Mar 2007 15:57:25 +0200


Modified: projects/haf/trunk/hildon-desktop/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-desktop/debian/changelog	2007-03-20 15:07:26 UTC (rev 10658)
+++ projects/haf/trunk/hildon-desktop/debian/changelog	2007-03-20 15:15:22 UTC (rev 10659)
@@ -1,3 +1,9 @@
+hildon-desktop (0.0.0-34) unstable; urgency=low
+
+  * Conflict with maemo-af-desktop < 3.0.0 (transition package) 
+
+ -- Johan Bilien <johan.bilien at nokia.com>  Tue, 20 Mar 2007 15:57:25 +0200
+
 hildon-desktop (0.0.0-33) unstable; urgency=low
 
   * Move from libosso-help to hildon-help

Modified: projects/haf/trunk/hildon-desktop/debian/control
===================================================================
--- projects/haf/trunk/hildon-desktop/debian/control	2007-03-20 15:07:26 UTC (rev 10658)
+++ projects/haf/trunk/hildon-desktop/debian/control	2007-03-20 15:15:22 UTC (rev 10659)
@@ -9,8 +9,7 @@
 Section: x11
 Architecture: any
 Depends:  ${shlibs:Depends}, ${misc:Depends}, ${launcher:Depends}, maemo-af-desktop-l10n-mr | maemo-af-desktop-l10n-mr0
-Conflicts: maemo-af-desktop, maemo-af-desktop-config
-Replaces: maemo-af-desktop
+Conflicts: maemo-af-desktop (<< 3.0.0), maemo-af-desktop-config
 Description: Desktop environment for embedded devices
   Hildon Desktop is a desktop environment for embedded devices. It
   is based on the GNOME platform