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

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-03-05 10:27:20 +0200 (Mon, 05 Mar 2007)
New Revision: 10351

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

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

  * libhildonwm-dev depends on libhildon1-dev
  * libhildondesktop-dev depends on libhildon1-dev and libxml2-dev
  * added applications.menu to the package and conffiles
  * consequently hildon-desktop conflicts with maemo-af-desktop-config



Modified: projects/haf/trunk/hildon-desktop/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-desktop/debian/changelog	2007-03-05 08:17:41 UTC (rev 10350)
+++ projects/haf/trunk/hildon-desktop/debian/changelog	2007-03-05 08:27:20 UTC (rev 10351)
@@ -2,6 +2,8 @@
 
   * libhildonwm-dev depends on libhildon1-dev
   * libhildondesktop-dev depends on libhildon1-dev and libxml2-dev
+  * added applications.menu to the package and conffiles
+  * consequently hildon-desktop conflicts with maemo-af-desktop-config
 
  -- Johan Bilien <johan.bilien at nokia.com>  Mon,  5 Mar 2007 10:10:14 +0200
 

Modified: projects/haf/trunk/hildon-desktop/debian/conffiles
===================================================================
--- projects/haf/trunk/hildon-desktop/debian/conffiles	2007-03-05 08:17:41 UTC (rev 10350)
+++ projects/haf/trunk/hildon-desktop/debian/conffiles	2007-03-05 08:27:20 UTC (rev 10351)
@@ -5,3 +5,4 @@
 /etc/hildon-desktop/home-layout.conf
 /etc/hildon-desktop/home-background.conf
 /etc/osso-af-init/hildon-desktop.sh
+/etc/xdg/menus/applications.menu

Modified: projects/haf/trunk/hildon-desktop/debian/control
===================================================================
--- projects/haf/trunk/hildon-desktop/debian/control	2007-03-05 08:17:41 UTC (rev 10350)
+++ projects/haf/trunk/hildon-desktop/debian/control	2007-03-05 08:27:20 UTC (rev 10351)
@@ -9,7 +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
+Conflicts: maemo-af-desktop, maemo-af-desktop-config
 Replaces: maemo-af-desktop
 Description: Desktop environment for embedded devices
   Hildon Desktop is a desktop environment for embedded devices. It

Modified: projects/haf/trunk/hildon-desktop/debian/hildon-desktop.install
===================================================================
--- projects/haf/trunk/hildon-desktop/debian/hildon-desktop.install	2007-03-05 08:17:41 UTC (rev 10350)
+++ projects/haf/trunk/hildon-desktop/debian/hildon-desktop.install	2007-03-05 08:27:20 UTC (rev 10351)
@@ -3,5 +3,6 @@
 usr/bin/hildon-background-manager*
 etc/hildon-desktop
 etc/osso-af-init
+etc/xdg
 usr/share/dbus-1
 usr/share/applications