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

[the-me-guest at alioth.debian.org]

Author: the-me-guest
Date: Wed Oct 22 17:06:51 2008
New Revision: 6325

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6325
Log:
* Do not use the "X$FOO" != "X" notation in mumble-server.{postinst,config}.
  This notation is just in the unquoted version needed.

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

Modified: mumble/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/changelog?rev=6325&op=diff
==============================================================================
--- mumble/trunk/debian/changelog (original)
+++ mumble/trunk/debian/changelog Wed Oct 22 17:06:51 2008
@@ -1,3 +1,10 @@
+mumble (1.1.6-4) UNRELEASED; urgency=low
+
+  * Do not use the "X$FOO" != "X" notation in mumble-server.{postinst,config}.
+    This notation is just in the unquoted version needed.
+
+ -- Patrick Matthäi <patrick.matthaei at web.de>  Wed, 22 Oct 2008 19:05:18 +0200
+
 mumble (1.1.6-3) unstable; urgency=low
 
   * Added 01-ftbfs_arm_qreal.dpatch. This patch fixes a FTBFS on arm{el} where

Modified: mumble/trunk/debian/mumble-server.config
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/mumble-server.config?rev=6325&op=diff
==============================================================================
--- mumble/trunk/debian/mumble-server.config (original)
+++ mumble/trunk/debian/mumble-server.config Wed Oct 22 17:06:51 2008
@@ -7,7 +7,7 @@
 if [ -f /etc/default/mumble-server ] ; then
 	MURMUR_DAEMON_START=0
 	. /etc/default/mumble-server
-	if [ "X$MURMUR_DAEMON_START" = "X1" ] ; then
+	if [ "$MURMUR_DAEMON_START" = "1" ] ; then
 		db_set mumble-server/start_daemon true
 	else
 		db_set mumble-server/start_daemon false

Modified: mumble/trunk/debian/mumble-server.postinst
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/mumble-server.postinst?rev=6325&op=diff
==============================================================================
--- mumble/trunk/debian/mumble-server.postinst (original)
+++ mumble/trunk/debian/mumble-server.postinst Wed Oct 22 17:06:51 2008
@@ -52,7 +52,7 @@
 		# Update /etc/mumble-server.ini based on config
 		if [ -f /etc/mumble-server.ini ] ; then
 			db_get mumble-server/emailfrom
-			if [ "X$RET" != "X" ] ; then
+			if [ "$RET" != "" ] ; then
 				if grep -E '^.*emailfrom[[:space:]]*=' /etc/mumble-server.ini > /dev/null; then
 					perl -pi -w -e "BEGIN { \$email = '$RET'; } s/^.*emailfrom\\s*=.*$/emailfrom = \$email/g" /etc/mumble-server.ini
 				else
@@ -70,7 +70,7 @@
 		# When set, clear it from config as it can't be queried and the user is
 		# likely to update it outside of debconf.
 		db_get mumble-server/password
-		if [ "X$RET" != "X" ] ; then
+		if [ "$RET" != "" ] ; then
 			echo $RET | su mumble-server -s /bin/sh -c "/usr/sbin/murmurd -ini /etc/mumble-server.ini -readsupw"
 			if [ $? = 0 ] ; then
 				db_set mumble-server/password ""