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

[pmatthaei at alioth.debian.org]

Author: pmatthaei
Date: Sun May  1 13:44:29 2011
New Revision: 8907

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8907
Log:
* Clean up debian/rules a bit.

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=8907&op=diff
==============================================================================
--- mumble/trunk/debian/changelog (original)
+++ mumble/trunk/debian/changelog Sun May  1 13:44:29 2011
@@ -11,8 +11,9 @@
   * Wrap build dependencies.
   * Add patch 01-fix-spelling-error.diff to fix an minor spelling error in
     the source code.
-
- -- Patrick Matthäi <pmatthaei at debian.org>  Sun, 01 May 2011 15:41:28 +0200
+  * Clean up debian/rules a bit.
+
+ -- Patrick Matthäi <pmatthaei at debian.org>  Sun, 01 May 2011 15:44:03 +0200
 
 mumble (1.2.3-91-g05d91c1-1) experimental; urgency=low
 

Modified: mumble/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/rules?rev=8907&op=diff
==============================================================================
--- mumble/trunk/debian/rules (original)
+++ mumble/trunk/debian/rules Sun May  1 13:44:29 2011
@@ -3,8 +3,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 export DEB_BUILD_HARDENING=1
-
-#QUILT include /usr/share/quilt/quilt.make
 
 MAKEFILE = $(firstword $(MAKEFILE_LIST))
 SOURCE_DIR = $(dir $(MAKEFILE))..
@@ -14,7 +12,7 @@
 export DH_OPTIONS
 
 configure: configure-stamp
-configure-stamp: #QUILT patch
+configure-stamp:
 	echo $(DEB_BUILD_ARCH)
 	dh_testdir
 	qmake-qt4 -recursive main.pro \
@@ -46,7 +44,7 @@
 	slice2html -I/usr/share/Ice-3.4.1/slice -I/usr/share/Ice-3.3.1/slice -I/usr/share/Ice/slice src/murmur/Murmur.ice --output-dir Ice
 	touch $@
 
-clean: #QUILT unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-arch-stamp build-indep-stamp configure-stamp
@@ -67,7 +65,6 @@
 	dh_prep
 	dh_installdirs -i
 	dh_install -i
-	# Install and rename web scripts
 	install -m 0755 -D ./scripts/weblist.pl $(CURDIR)/debian/mumble-server-web/usr/share/mumble-server-web/www/weblist.cgi
 
 install-arch:
@@ -76,10 +73,8 @@
 	dh_prep
 	dh_installdirs -s
 	dh_install -s
-	# Add Debian files.
 	install -m 0755 ./scripts/murmur.init $(CURDIR)/debian/mumble-server.init
 	install -m 0755 ./scripts/murmur.logrotate $(CURDIR)/debian/mumble-server.logrotate
-	# install mumble files that need to be renamed.
 	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.system $(CURDIR)/debian/mumble-server/etc/mumble-server.ini
 ifeq ($(DEB_BUILD_ARCH), amd64)