[Pkg-voip-commits] r9305 - in /mumble/trunk/debian: changelog rules

[pmatthaei at alioth.debian.org]

Author: pmatthaei
Date: Sat Oct  1 14:19:23 2011
New Revision: 9305

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9305
Log:
Revert: Adjust scripts/murmur.ini install path.

Modified:
    mumble/trunk/debian/changelog
    mumble/trunk/debian/rules

Modified: mumble/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/changelog?rev=9305&op=diff
==============================================================================
--- mumble/trunk/debian/changelog (original)
+++ mumble/trunk/debian/changelog Sat Oct  1 14:19:23 2011
@@ -9,7 +9,6 @@
   * New upstream git master snapshot from 01.10.2011.
     - Audio statistics do not need glx extension anymore.
       Closes: #612030
-    - Adjust scripts/murmur.ini install path.
   * Uploading to unstable.
   * Qt and mumble should use the same OpenSSL version now.
     Closes: #627871

Modified: mumble/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/rules?rev=9305&op=diff
==============================================================================
--- mumble/trunk/debian/rules (original)
+++ mumble/trunk/debian/rules Sat Oct  1 14:19:23 2011
@@ -82,7 +82,7 @@
 	install -m 0755 ./scripts/murmur.init $(CURDIR)/debian/mumble-server.init
 	install -m 0755 ./scripts/murmur.logrotate $(CURDIR)/debian/mumble-server.logrotate
 	install -m 0644 -D ./scripts/murmur.conf $(CURDIR)/debian/mumble-server/etc/dbus-1/system.d/mumble-server.conf
-	install -m 0644 -D ./scripts/murmur.ini $(CURDIR)/debian/mumble-server/etc/mumble-server.ini
+	install -m 0644 -D ./scripts/murmur.ini.system $(CURDIR)/debian/mumble-server/etc/mumble-server.ini
 ifeq ($(DEB_BUILD_ARCH), amd64)
 	install -m 0755 -d $(CURDIR)/debian/mumble/usr/lib32/mumble
 	cp -dp ./release-32/libmumble.so* $(CURDIR)/debian/mumble/usr/lib32/mumble/