[Pkg-voip-commits] r5683 - in /mumble/trunk/debian: changelog control mumble-server.install mumble-server.postinst rules

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

Author: the-me-guest
Date: Thu May  8 20:20:28 2008
New Revision: 5683

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5683
Log:
Handle the configfiles about conffiles instead of ucf.
Removed useless depend on debconf, it will be added with
${misc:Depends}.

Modified:
    mumble/trunk/debian/changelog
    mumble/trunk/debian/control
    mumble/trunk/debian/mumble-server.install
    mumble/trunk/debian/mumble-server.postinst
    mumble/trunk/debian/rules

Modified: mumble/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/changelog?rev=5683&op=diff
==============================================================================
--- mumble/trunk/debian/changelog (original)
+++ mumble/trunk/debian/changelog Thu May  8 20:20:28 2008
@@ -1,3 +1,13 @@
+mumble (1.1.3-5) UNRELEASED; urgency=low
+
+  * Changed destination of /etc/mumble-server/mumble-server.ini to
+    /etc/mumble-server.ini.
+  * Removed debconf depend. It will be added with ${misc:Depends}.
+  * Handle /etc/mumble-server.ini and /etc/dbus-1/system.d/mumble-server.conf
+    about conffile instead of ucf.
+
+ -- Patrick Matthäi <patrick.matthaei at web.de>  Thu,  8 May 2008 22:13:13 +0100
+
 mumble (1.1.3-4) unstable; urgency=low
 
   [ Patrick Matthäi ]
@@ -7,8 +17,6 @@
   * Removed the sed hack from debian/rules. It is fixed in qmake now.
   * Removed some whitespaces at EOL and newlines at EOF.
   * Some clean target fixes.
-  * Changed destination of /etc/mumble-server/mumble-server.ini to
-	/etc/mumble-server.ini.
 
   [ Debian l10n ]
   * French translation from Steve Petruzzello <dlist at bluewin.ch>.

Modified: mumble/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/control?rev=5683&op=diff
==============================================================================
--- mumble/trunk/debian/control (original)
+++ mumble/trunk/debian/control Thu May  8 20:20:28 2008
@@ -26,7 +26,7 @@
 
 Package: mumble-server
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, dbus, debconf, ucf
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, dbus
 Recommends: mumble-server-web
 Suggests: mumble
 Description: Low latency VoIP server

Modified: mumble/trunk/debian/mumble-server.install
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/mumble-server.install?rev=5683&op=diff
==============================================================================
--- mumble/trunk/debian/mumble-server.install (original)
+++ mumble/trunk/debian/mumble-server.install Thu May  8 20:20:28 2008
@@ -1,4 +1,2 @@
 release/murmurd usr/sbin/
 scripts/murmur-wrapper usr/bin/
-scripts/murmur.ini.system usr/share/mumble-server/templates/
-scripts/murmur.conf usr/share/mumble-server/templates/

Modified: mumble/trunk/debian/mumble-server.postinst
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/mumble-server.postinst?rev=5683&op=diff
==============================================================================
--- mumble/trunk/debian/mumble-server.postinst (original)
+++ mumble/trunk/debian/mumble-server.postinst Thu May  8 20:20:28 2008
@@ -16,36 +16,6 @@
 #          <conflicting-package> <version>
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
-
-do_configuration() {
-	if [ -f ${CONF} ] ; then
-		# No configuration exists, just install the template one.
-		cp ${TEMPLATE} ${CONF_NEW}
-	fi
-	
-	if diff -q ${CONF} ${CONF_NEW} >/dev/null 2>&1; then
-		# New and old config are the same.
-		rm -f ${CONF_NEW}
-	else
-		if [ ! -f ${CONF} ] ; then
-			cp ${TEMPLATE} ${CONF}
-		else
-			cp ${CONF} ${CONF_OLD}
-			ucf --debconf-ok ${CONF_NEW} ${CONF}
-		fi
-	fi
-}
-
-CONF="/etc/mumble-server.ini"
-CONF_NEW="/etc/mumble-server.ini.new"
-CONF_OLD="/etc/mumble-server.ini.old"
-TEMPLATE="/usr/share/mumble-server/templates/murmur.ini.system"
-do_configuration;
-CONF="/etc/dbus-1/system.d/murmur.conf"
-CONF_NEW="/etc/dbus-1/system.d/murmur.conf.new"
-CONF_OLD="/etc/dbus-1/system.d/murmur.conf.old"
-TEMPLATE="/usr/share/mumble-server/templates/murmur.conf"
-do_configuration;
 
 case "$1" in
 	configure)

Modified: mumble/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/rules?rev=5683&op=diff
==============================================================================
--- mumble/trunk/debian/rules (original)
+++ mumble/trunk/debian/rules Thu May  8 20:20:28 2008
@@ -55,6 +55,8 @@
 	install -m 0644 -D ./icons/mumble.32x32.png $(CURDIR)/debian/mumble/usr/share/icons/hicolor/apps/32x32/mumble.png
 	install -m 0644 -D ./icons/mumble.48x48.png $(CURDIR)/debian/mumble/usr/share/icons/hicolor/apps/48x48/mumble.png
 	install -m 0644 -D ./icons/mumble.64x64.png $(CURDIR)/debian/mumble/usr/share/icons/hicolor/apps/64x64/mumble.png
+	install -D -m 0644 ./scripts/murmur.conf $(CURDIR)/debian/mumble-server/etc/dbus-1/system.d/mumble-server.conf
+	install -D -m 0644 ./scripts/murmur.ini.system $(CURDIR)/debian/mumble-server/etc/mumble-server.ini
 
 binary-common:
 	dh_testdir