[dutch-svn] r108 - doc-linux-nl/trunk/debian

[thijs at alioth.debian.org]

Author: thijs
Date: 2007-07-25 20:43:17 +0000 (Wed, 25 Jul 2007)
New Revision: 108

Modified:
   doc-linux-nl/trunk/debian/changelog
   doc-linux-nl/trunk/debian/rules
Log:
more simplification


Modified: doc-linux-nl/trunk/debian/changelog
===================================================================
--- doc-linux-nl/trunk/debian/changelog	2007-07-25 20:43:01 UTC (rev 107)
+++ doc-linux-nl/trunk/debian/changelog	2007-07-25 20:43:17 UTC (rev 108)
@@ -1,8 +1,8 @@
 doc-linux-nl (20051127-3) UNRELEASED; urgency=low
 
-  *
+  * Packaging cleanups.
 
- -- Thijs Kinkhorst <thijs at debian.org>  Wed, 25 Jul 2007 21:58:18 +0200
+ -- Thijs Kinkhorst <thijs at debian.org>  Wed, 25 Jul 2007 22:38:53 +0200
 
 doc-linux-nl (20051127-2) unstable; urgency=low
 

Modified: doc-linux-nl/trunk/debian/rules
===================================================================
--- doc-linux-nl/trunk/debian/rules	2007-07-25 20:43:01 UTC (rev 107)
+++ doc-linux-nl/trunk/debian/rules	2007-07-25 20:43:17 UTC (rev 108)
@@ -12,19 +12,10 @@
 	dh_testdir
 	touch build
 
-# Clean $(DIRECTORIES)
-clean-dir:
+clean:
 	dh_testdir
-	rm -rf $(R)
-	rm -rf $(R2)
-	rm -rf $(R3)
-
-# Undoes the effect of `make -f rules build'.
-clean: clean-dir
-	dh_testdir
 	dh_clean
-	rm -f debian/files* debian/substvars core debian/*~ HOWTO/*~ 
-	rm -f build *~ debian/*.debhelper
+	rm -f build
 	rm -rf debian/manpage-build
 
 # Makes a binary package.
@@ -46,9 +37,6 @@
 	sh ../../../../../../creindex.sh && \
 	rm -rf *.sgml)
 
-	dh_installdocs -p doc-linux-nl-html -P$(R)
-	dh_installchangelogs -p doc-linux-nl-html -P$(R)
-
 #######################	   txt    ##############################
 
 	(cd $(R2)/usr/share/doc/HOWTO/nl-txt && \
@@ -57,9 +45,6 @@
 	rm -rf *.sgml && \
 	gzip -9 -r * )
 
-	dh_installdocs -p doc-linux-nl-text -P$(R2)
-	dh_installchangelogs -p doc-linux-nl-text -P$(R2)
-
 #######################	 manpages ##############################
 
 	mkdir debian/manpage-build
@@ -71,23 +56,15 @@
 	find MANPAGE/man-pages-$(MANVER)/man6 -wholename MANPAGE/man-pages-$(MANVER)/man6/.svn -prune -o -wholename MANPAGE/man-pages-$(MANVER)/man6/Makefile.in -prune -o -exec debian/mp-mv {} 6 \;
 	find MANPAGE/man-pages-$(MANVER)/man8 -wholename MANPAGE/man-pages-$(MANVER)/man8/.svn -prune -o -wholename MANPAGE/man-pages-$(MANVER)/man8/Makefile.in -prune -o -exec debian/mp-mv {} 8 \;
 	dh_installman debian/manpage-build/* -pmanpages-nl -P$(R3)
-	dh_installdocs -pmanpages-nl -P$(R3)
-	dh_installchangelogs -pmanpages-nl -P$(R3)
 
 #################################################################
 
-	dh_compress -pdoc-linux-nl-html -P$(R)
-	dh_compress -pdoc-linux-nl-text -P$(R2)
-	dh_compress -pmanpages-nl -P$(R3)
-	dh_installdeb -pdoc-linux-nl-html -P$(R)
-	dh_installdeb -pdoc-linux-nl-text -P$(R2)
-	dh_installdeb -pmanpages-nl -P$(R3)
-	dh_gencontrol -pdoc-linux-nl-html -P$(R)
-	dh_gencontrol -pdoc-linux-nl-text -P$(R2)
-	dh_gencontrol -pmanpages-nl -P$(R3)
-	dh_md5sums -pdoc-linux-nl-text -P$(R)
-	dh_md5sums -pdoc-linux-nl-text -P$(R2)
-	dh_md5sums -pmanpages-nl -P$(R3)
+	dh_installdocs
+	dh_installchangelogs
+	dh_compress
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
 	dh_builddeb
 
 binary:		binary-indep binary-arch