[SCM] team based FPS game - packaging branch, debian, updated. debian/1.1.0-4.1-33-g855d6ce

[Simon McVittie]

The following commit has been merged in the debian branch:
commit b62c485f1d57545ace0eb53ad392d742cac2d99b
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Jul 17 12:32:11 2010 +0100

    Tidy up how cleaning and ChangeLog work

diff --git a/debian/control b/debian/control
index cefe732..402f306 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: contrib/games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Simon McVittie <smcv at debian.org>
-Build-Depends: debhelper (>= 5.0.0), libopenal-dev, libsdl1.2-dev, zip
+Build-Depends: debhelper (>= 7.0.50), libopenal-dev, libsdl1.2-dev, zip
 Standards-Version: 3.7.2.0
 Vcs-Git: git://git.debian.org/git/pkg-games/tremulous.git
 Vcs-Browser: http://git.debian.org/?p=pkg-games/tremulous.git
diff --git a/debian/rules b/debian/rules
index 123d8eb..3e97be6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,21 +28,9 @@ build-arch-stamp:
 	touch build-arch-stamp
 
 clean:
-	dh_testdir
-	dh_testroot
-
-	# I had to put this line before the rest. Otherwise, i got a strange error :
-	# /usr/bin/make distclean
-	# make[1]: *** debian/tremulous-server/etc/init.d: is a directory.
-	#
-	# and then it stopped
-	dh_clean
-
 	rm -f debian/*.pk3
 	rm -f build-arch-stamp
-	-$(MAKE) distclean
-	-rm -f changelog
-
+	dh clean
 
 install: install-indep install-arch
 
@@ -59,7 +47,6 @@ install-arch:
 	dh_clean -k -s
 	dh_installdirs -s
 
-	cp ChangeLog changelog
 	cp build/release-linux-$(Q3ARCH)/tremulous.$(Q3ARCH) build/release-linux-$(Q3ARCH)/tremulous
 	cp build/release-linux-$(Q3ARCH)/tremded.$(Q3ARCH) build/release-linux-$(Q3ARCH)/tremded
 
@@ -102,7 +89,7 @@ install-arch:
 binary-common:
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs
+	dh_installchangelogs ChangeLog
 	dh_installdocs
 	dh_installmenu
 	dh_installinit
diff --git a/debian/tremulous-server.docs b/debian/tremulous-server.docs
deleted file mode 100644
index 6d10dce..0000000
--- a/debian/tremulous-server.docs
+++ /dev/null
@@ -1 +0,0 @@
-changelog
diff --git a/debian/tremulous.docs b/debian/tremulous.docs
deleted file mode 100644
index 6d10dce..0000000
--- a/debian/tremulous.docs
+++ /dev/null
@@ -1 +0,0 @@
-changelog

-- 
team based FPS game - packaging