Merge lp:~mterry/gconf/ubuntu-gsettings-trigger into lp:~ubuntu-desktop/gconf/ubuntu

[Michael Terry]

  * debian/gconf2.triggers, debian/gconf2.postinst, debian/gconf2.postrm:
    - Declare a new trigger on /usr/share/GConf/gsettings to watch when
      new gsettings convert files are installed. When a new one is
      installed, we notify that a reboot is required, to pick it up on
      next user login.

[Michael Terry (mterry)]

Hrm, just realized that this will trigger a notice when removing a package with a convert file... Let me readjust.

[lp:~mterry/gconf/ubuntu-gsettings-trigger]

55. By Michael Terry on 2011-01-06

don't bother with hash sums; only trigger a notification if a new file appears, not if a file disappears

[Michael Terry (mterry)]

OK, I updated the branch to ignore file removals.

=== modified file 'debian/changelog'
--- debian/changelog	2011-01-06 15:35:32 +0000
+++ debian/changelog	2011-01-06 21:01:42 +0000
@@ -1,3 +1,13 @@
+gconf (2.32.1-2ubuntu2) natty; urgency=low
+
+  * debian/gconf2.triggers, debian/gconf2.postinst, debian/gconf2.postrm:
+    - Declare a new trigger on /usr/share/GConf/gsettings to watch when
+      new gsettings convert files are installed.  When a new one is
+      installed, we notify that a reboot is required, to pick it up on
+      next user login.
+
+ -- Michael Terry <[e-mail]>  Thu, 06 Jan 2011 14:10:22 -0500
+
 gconf (2.32.1-2ubuntu1) natty; urgency=low
 
   * Resynchronize on Debian

=== modified file 'debian/gconf2.postinst'
--- debian/gconf2.postinst	2010-05-17 19:44:19 +0000
+++ debian/gconf2.postinst	2011-01-06 21:01:42 +0000
@@ -8,6 +8,32 @@
     kill -s HUP `pidof gconfd-2` >/dev/null 2>&1 || true
 }
 
+check_for_new_convert_files()
+{
+    # Check /usr/share/GConf/gsettings to see if there are any new files.
+    # We do this by keeping track of the files in that directory since last
+    # time we ran, stored in /usr/share/GConf/gsettings.dpkg-cache.
+    #
+    # If any new files exist, we notify that a reboot is a good idea.
+    # We don't worry about updated files, since gsettings-data-convert doesn't.
+
+    convertdir="/usr/share/GConf/gsettings"
+    if [ ! -d "$convertdir" ]; then
+        return 0
+    fi
+
+    cachefile="$convertdir.dpkg-cache"
+    newcachefile="$cachefile.new"
+    (cd /usr/share/GConf/gsettings; ls -1 * > "$newcachefile" 2>/dev/null)
+    if [ ! -e "$cachefile" ] || \
+       [ -n "$(comm -1 -3 $cachefile $newcachefile 2>/dev/null)" ]; then
+        if [ -x /usr/share/update-notifier/notify-reboot-required ]; then
+            /usr/share/update-notifier/notify-reboot-required
+        fi
+    fi
+    mv "$newcachefile" "$cachefile" || true # save for future runs
+}
+
 if [ "$1" = triggered ]; then
     for trigger in $2; do
         case $trigger in
@@ -20,6 +46,9 @@
             /usr/share/gconf/mandatory)
                 update-gconf-defaults --no-signal --mandatory
                 ;;
+            /usr/share/GConf/gsettings)
+                check_for_new_convert_files
+                ;;
         esac
     done
     signal_daemons
@@ -52,5 +81,6 @@
 gconf-schemas --register-all --no-signal
 update-gconf-defaults --no-signal
 update-gconf-defaults --no-signal --mandatory
+check_for_new_convert_files
 signal_daemons
 

=== modified file 'debian/gconf2.postrm'
--- debian/gconf2.postrm	2009-05-15 10:26:55 +0000
+++ debian/gconf2.postrm	2011-01-06 21:01:42 +0000
@@ -5,6 +5,7 @@
   if [ -d /var/lib/gconf ]; then
     find /var/lib/gconf -mindepth 2 -maxdepth 2 -exec rm -rf \{} \;
   fi
+  rm -f /usr/share/GConf/gsettings.dpkg-cache
 fi
 
 #DEBHELPER#

=== modified file 'debian/gconf2.triggers'
--- debian/gconf2.triggers	2010-05-17 19:44:19 +0000
+++ debian/gconf2.triggers	2011-01-06 21:01:42 +0000
@@ -1,3 +1,4 @@
 interest /usr/share/gconf/defaults
 interest /usr/share/gconf/mandatory
 interest /usr/share/gconf/schemas
+interest /usr/share/GConf/gsettings