[Pkg-voip-commits] r8720 - in /mumble/trunk/debian: changelog mumble-server.postinst

[thorvald at alioth.debian.org]

Author: thorvald
Date: Sun Jan 23 02:27:31 2011
New Revision: 8720

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8720
Log:
Add fix from Felix Geyer to work around non-existant mumble-server.ini
on upgrades.

Modified:
    mumble/trunk/debian/changelog
    mumble/trunk/debian/mumble-server.postinst

Modified: mumble/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/changelog?rev=8720&op=diff
==============================================================================
--- mumble/trunk/debian/changelog (original)
+++ mumble/trunk/debian/changelog Sun Jan 23 02:27:31 2011
@@ -1,13 +1,15 @@
-mumble (1.2.3~rc1-54-g832f5aa-1) UNRELEASED; urgency=low
+mumble (1.2.3~rc2-1) UNRELEASED; urgency=low
 
   [ Thorvald Natvig ]
   * New upstream release.
   * Add dependency on Ice slice files when building.
+  * Add fix from Felix Geyer to work around non-existant mumble-server.ini
+    on upgrades.
 
   [ Patrick Matthäi ]
   * Merge 1.1.4-4+lenny2 and 1.2.2-6 changelog.
 
- -- Thorvald Natvig <thorvald at debian.org>  Thu, 20 Jan 2011 05:56:54 +0100
+ -- Thorvald Natvig <thorvald at debian.org>  Sun, 23 Jan 2011 03:22:41 +0100
 
 mumble (1.2.2-6) unstable; urgency=high
 

Modified: mumble/trunk/debian/mumble-server.postinst
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/mumble-server.postinst?rev=8720&op=diff
==============================================================================
--- mumble/trunk/debian/mumble-server.postinst (original)
+++ mumble/trunk/debian/mumble-server.postinst Sun Jan 23 02:27:31 2011
@@ -24,10 +24,12 @@
 		[ -d /var/lib/mumble-server ] || mkdir /var/lib/mumble-server
 		chmod 0750 /var/log/mumble-server
 		chmod 0750 /var/lib/mumble-server
-		chmod 0640 /etc/mumble-server.ini
 		chown mumble-server:adm /var/log/mumble-server
 		chown mumble-server:mumble-server /var/lib/mumble-server
-		chown root:mumble-server /etc/mumble-server.ini
+		if [ -f /etc/mumble-server.ini ]; then
+			chmod 0640 /etc/mumble-server.ini
+			chown root:mumble-server /etc/mumble-server.ini
+		fi
 		# Workaround for when this was in .dirs
 		[ -d /var/run/mumble-server ] && chown mumble-server:adm /var/run/mumble-server