[maemo-commits] [maemo-commits] r15399 - in projects/haf/trunk/hildon-desktop: . data debian

[From: subversion at stage.maemo.org]

Author: novo
Date: 2008-04-15 16:22:52 +0300 (Tue, 15 Apr 2008)
New Revision: 15399

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/configure.ac
   projects/haf/trunk/hildon-desktop/data/restore-menu.sh
   projects/haf/trunk/hildon-desktop/debian/changelog
Log:
2008-04-15  Karl Lattimer <karl.lattimer at nokia.com>

        * data/restore-menu.sh: ensure that backup restore from chinook
        always includes hildon-update-notifier.desktop in the statusbar.conf
        this is a substandard fix, more information can be found in the file
        comments.
        Fixes: NB#82941
        * configure.ac: 2.0.12


Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2008-04-15 12:10:45 UTC (rev 15398)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2008-04-15 13:22:52 UTC (rev 15399)
@@ -1,3 +1,12 @@
+2008-04-15  Karl Lattimer <karl.lattimer at nokia.com>
+
+	* data/restore-menu.sh: ensure that backup restore from chinook
+	always includes hildon-update-notifier.desktop in the statusbar.conf
+	this is a substandard fix, more information can be found in the file
+	comments.
+	Fixes: NB#82941
+	* configure.ac: 2.0.12
+
 2008-04-08  Rodrigo Novo <rodrigo.novo at nokia.com>
 
 	* configure.ac: 2.0.11

Modified: projects/haf/trunk/hildon-desktop/configure.ac
===================================================================
--- projects/haf/trunk/hildon-desktop/configure.ac	2008-04-15 12:10:45 UTC (rev 15398)
+++ projects/haf/trunk/hildon-desktop/configure.ac	2008-04-15 13:22:52 UTC (rev 15399)
@@ -1,6 +1,6 @@
 AC_INIT(Makefile.am)
 
-AM_INIT_AUTOMAKE(hildon-desktop, 2.0.11)
+AM_INIT_AUTOMAKE(hildon-desktop, 2.0.12)
 
 AM_CONFIG_HEADER(config.h)
 

Modified: projects/haf/trunk/hildon-desktop/data/restore-menu.sh
===================================================================
--- projects/haf/trunk/hildon-desktop/data/restore-menu.sh	2008-04-15 12:10:45 UTC (rev 15398)
+++ projects/haf/trunk/hildon-desktop/data/restore-menu.sh	2008-04-15 13:22:52 UTC (rev 15399)
@@ -21,4 +21,13 @@
 then
   rm -f "${MENU_CONF_DIR}/applications.menu"
   rm -f "${DESKTOP_CONF_DIR}/*.conf"
+
+  # This might not be the right place to put this fix, however this file was intended to fix this problem.
+  # Removing the files as the code above suggests does not work, this leads me to believe the files were already
+  # open when the removal was supposed to take place.
+  # after removing the file statusbar.conf we must ensure that the update notifier is added to the configured
+  # statusbar applets. NB#82941
+  echo "\n[/usr/share/applications/hildon-status-bar/hildon-update-notifier.desktop]" >> ${DESKTOP_CONF_DIR}/statusbar.conf
+  echo "X-Load=true" >> ${DESKTOP_CONF_DIR}/statusbar.conf
 fi
+

Modified: projects/haf/trunk/hildon-desktop/debian/changelog
===================================================================
--- projects/haf/trunk/hildon-desktop/debian/changelog	2008-04-15 12:10:45 UTC (rev 15398)
+++ projects/haf/trunk/hildon-desktop/debian/changelog	2008-04-15 13:22:52 UTC (rev 15399)
@@ -1,3 +1,14 @@
+hildon-desktop (1:2.0.12-1) sardine; urgency=low
+
+  * data/restore-menu.sh: ensure that backup restore from chinook
+    always includes hildon-update-notifier.desktop in the statusbar.conf
+    this is a substandard fix, more information can be found in the file
+    comments.
+    Fixes: NB#82941
+  * configure.ac: 2.0.12
+
+ -- Karl Lattimer <karl.lattimer at nokia.com>  Tue, 15 Apr 2008 16:17:00 +0300
+
 hildon-desktop (1:2.0.11-1) sardine; urgency=low
 
   * libhildondesktop/hildon-desktop-notification-manager.c: fix