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

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-09-03 13:24:13 +0300 (Mon, 03 Sep 2007)
New Revision: 13557

Added:
   projects/haf/trunk/hildon-desktop/data/restore-menu.sh
Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/data/Makefile.am
   projects/haf/trunk/hildon-desktop/debian/conffiles
   projects/haf/trunk/hildon-desktop/debian/hildon-desktop.install
Log:

2007-09-03 Johan Bilien  <johan.bilien at nokia.com>

	* data/restore-menu.sh: added script to restore default
	menu when a backup from an older release is restored.
	Fixes: NB#62758



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-03 10:00:09 UTC (rev 13556)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-09-03 10:24:13 UTC (rev 13557)
@@ -1,5 +1,11 @@
 2007-09-03 Johan Bilien  <johan.bilien at nokia.com>
 
+	* data/restore-menu.sh: added script to restore default
+	menu when a backup from an older release is restored.
+	Fixes: NB#62758
+
+2007-09-03 Johan Bilien  <johan.bilien at nokia.com>
+
 	* src/main.c: added fork wrapper to unprotect children
 	from OOM-killing and reset their priority. Fixes: NB#49535
 	* src/hd-application-menu.c: removed duplicate code

Modified: projects/haf/trunk/hildon-desktop/data/Makefile.am
===================================================================
--- projects/haf/trunk/hildon-desktop/data/Makefile.am	2007-09-03 10:00:09 UTC (rev 13556)
+++ projects/haf/trunk/hildon-desktop/data/Makefile.am	2007-09-03 10:24:13 UTC (rev 13557)
@@ -16,6 +16,9 @@
 hildondesktopstartup_SCRIPTS = \
         hildon-desktop.sh
 
+ossobackup_SCRIPTS = restore-menu.sh
+ossobackupdir = $(sysconfdir)/osso-backup/restore.d/always
+
 bin_SCRIPTS = install_sbapplet.sh
 
 CLEANFILES = *~

Added: projects/haf/trunk/hildon-desktop/data/restore-menu.sh
===================================================================
--- projects/haf/trunk/hildon-desktop/data/restore-menu.sh	2007-09-03 10:00:09 UTC (rev 13556)
+++ projects/haf/trunk/hildon-desktop/data/restore-menu.sh	2007-09-03 10:24:13 UTC (rev 13557)
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+OSSO_CONF_DIR="${HOME}/.osso"
+MENU_CONF_DIR="${OSSO_CONF_DIR}/menus"
+OSSO_SOFTWARE_VERSION_FILE="/etc/osso_software_version"
+
+if [ ! $2 ]
+then
+  exit 0
+fi
+
+if [ ! -e $OSSO_SOFTWARE_VERSION_FILE ]
+then
+  exit 0
+fi
+
+OSSO_VERSION=`cat ${OSSO_SOFTWARE_VERSION_FILE}`
+
+if [ $2 != $OSSO_VERSION ]
+then
+  rm -f "${MENU_CONF_DIR}/applications.menu"
+fi


Property changes on: projects/haf/trunk/hildon-desktop/data/restore-menu.sh
___________________________________________________________________
Name: svn:executable
   + *

Modified: projects/haf/trunk/hildon-desktop/debian/conffiles
===================================================================
--- projects/haf/trunk/hildon-desktop/debian/conffiles	2007-09-03 10:00:09 UTC (rev 13556)
+++ projects/haf/trunk/hildon-desktop/debian/conffiles	2007-09-03 10:24:13 UTC (rev 13557)
@@ -5,3 +5,4 @@
 /etc/osso-af-init/hildon-desktop.sh
 /etc/xdg/menus/applications.menu
 /etc/init.d/hildon-desktop
+/etc/osso-backup/restore.d/restore-menu.sh

Modified: projects/haf/trunk/hildon-desktop/debian/hildon-desktop.install
===================================================================
--- projects/haf/trunk/hildon-desktop/debian/hildon-desktop.install	2007-09-03 10:00:09 UTC (rev 13556)
+++ projects/haf/trunk/hildon-desktop/debian/hildon-desktop.install	2007-09-03 10:24:13 UTC (rev 13557)
@@ -4,6 +4,7 @@
 etc/hildon-desktop
 etc/osso-af-init
 etc/xdg
+etc/osso-backup
 usr/share/dbus-1
 usr/share/applications
 usr/lib/hildon-desktop/*.so