[SCM] Packaging for the OpenArena engine branch, master, updated. debian/0.8.8-2-6-g0548463

[Simon McVittie]

The following commit has been merged in the master branch:
commit c92f557bdd0b7e45806e50b46111582651f19af0
Author: Simon McVittie <smcv at debian.org>
Date:   Sun Apr 1 21:34:07 2012 +0100

    Fix upgrades of openarena-server from squeeze (Closes: #666769):
    
      - create /var/games/openarena-server if necessary
      - if /etc/default/openarena-server doesn't exist, assume we're upgrading
        from before the init script existed, and disable the init script
        by default

diff --git a/debian/changelog b/debian/changelog
index 2905581..deac0d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+openarena (0.8.8-3) UNRELEASED; urgency=low
+
+  * Fix upgrades of openarena-server from squeeze (Closes: #666769):
+    - create /var/games/openarena-server if necessary
+    - if /etc/default/openarena-server doesn't exist, assume we're upgrading
+      from before the init script existed, and disable the init script
+      by default
+
+ -- Simon McVittie <smcv at debian.org>  Sun, 01 Apr 2012 20:36:20 +0100
+
 openarena (0.8.8-2) unstable; urgency=low
 
   * Merge from experimental
diff --git a/debian/openarena-server.postinst b/debian/openarena-server.postinst
index 04b6a23..5a466d7 100644
--- a/debian/openarena-server.postinst
+++ b/debian/openarena-server.postinst
@@ -11,7 +11,8 @@ case "$1" in
 	--ingroup games --force-badname Debian-openarena
     fi
     install -d /var/games
-    install -d -o Debian-openarena -g games /var/games/openarena-server
+    install -d /var/games/openarena-server
+    chown Debian-openarena:games /var/games/openarena-server
   ;;
   abort-upgrade|abort-remove|abort-deconfigure)
   ;;
diff --git a/debian/openarena-server.preinst b/debian/openarena-server.preinst
index fd8bf09..dff5e29 100644
--- a/debian/openarena-server.preinst
+++ b/debian/openarena-server.preinst
@@ -5,12 +5,17 @@ set -e
 case "$1" in
   (upgrade)
     if dpkg --compare-versions "$2" lt 0.8.8; then
-      if grep '^START_DAEMON=1$' /etc/default/openarena-server; then
-        echo "Not disabling openarena-server init script (previously enabled in /etc/default/openarena-server)" >&2
+      def=/etc/default/openarena-server
+      home=/var/games/openarena-server
+      inhibit=$home/init-script-disabled-by-upgrade
+
+      if test -e $def && grep '^START_DAEMON=1$' $def; then
+        echo "Not disabling openarena-server init script (previously enabled in $def)" >&2
       else
-        echo "Disabling openarena-server init script (previously disabled in /etc/default/openarena-server)" >&2
-        echo "Remove /var/games/openarena-server/init-script-disabled-by-upgrade to restore normal behaviour."
-	touch /var/games/openarena-server/init-script-disabled-by-upgrade
+        echo "Disabling openarena-server init script (previously disabled in $def)" >&2
+        echo "Remove $inhibit to restore normal behaviour."
+	install -d $home
+	touch $inhibit
       fi
     fi
   ;;

-- 
Packaging for the OpenArena engine