r8665 - packages/trunk/chocolate-doom/debian

[Jon Dowland]

Author: jmtd-guest
Date: 2009-01-18 17:01:09 +0000 (Sun, 18 Jan 2009)
New Revision: 8665

Modified:
   packages/trunk/chocolate-doom/debian/compat
   packages/trunk/chocolate-doom/debian/rules
Log:
tidy up rules file; remove old manpage cruft

Modified: packages/trunk/chocolate-doom/debian/compat
===================================================================
--- packages/trunk/chocolate-doom/debian/compat	2009-01-18 16:58:16 UTC (rev 8664)
+++ packages/trunk/chocolate-doom/debian/compat	2009-01-18 17:01:09 UTC (rev 8665)
@@ -1 +1 @@
-5
+7

Modified: packages/trunk/chocolate-doom/debian/rules
===================================================================
--- packages/trunk/chocolate-doom/debian/rules	2009-01-18 16:58:16 UTC (rev 8664)
+++ packages/trunk/chocolate-doom/debian/rules	2009-01-18 17:01:09 UTC (rev 8665)
@@ -31,12 +31,11 @@
 	dh_testdir
 	$(MAKE)
 	touch build-stamp
-	cd man && $(MAKE)
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp 
+	rm -f build-stamp
 	
 	[ ! -f Makefile ] || $(MAKE) distclean
 	$(MAKE) -f /usr/share/quilt/quilt.make unpatch
@@ -45,25 +44,15 @@
 	find -name config.sub   -print0 | xargs -0 -r rm -f \;
 	find -name config.guess -print0 | xargs -0 -r rm -f \;
 	
-	-cd man && $(MAKE) clean
-	
-	rm -f data/chocolate-doom.png
 	dh_clean
 
-data/chocolate-doom.png: debian/base.sng
-	sng <debian/base.sng >data/chocolate-doom.png
-
-install: build data/chocolate-doom.png
+install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k 
 	dh_installdirs
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/chocolate-doom
-	install -p $(CURDIR)/debian/chocolate-setup.6 \
-		$(CURDIR)/debian/chocolate-server.6 \
-		$(CURDIR)/debian/chocolate-doom/usr/share/man/man6
 
-
 # Build architecture-independent files here.
 binary-indep: build install
 
@@ -71,10 +60,10 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs ChangeLog
+	dh_installchangelogs
 	dh_installdocs
 	dh_installmenu
-	dh_installman man/chocolate-doom.6
+	dh_installman
 	dh_strip
 	dh_compress
 	dh_fixperms
@@ -86,11 +75,4 @@
 
 binary: binary-indep binary-arch
 
-# remove non-free files from the upstream tarball
-# implemented for upstream version 1.0.0; to be reviewed with
-# each successive version
-dfsg:
-	rm data/chocolate-doom.png
-	rm data/chocolate-doom.ico
-
-.PHONY: build clean binary-indep binary-arch binary install 
+.PHONY: build clean binary-indep binary-arch binary install