[Cdd-commits] cdd/common/cdd/examples/debian rules,1.3,1.4

Andreas Tille debian-custom@lists.debian.org
Sat, 26 Jun 2004 22:03:23 +0000


Update of /cvsroot/cdd/cdd/common/cdd/examples/debian
In directory haydn:/tmp/cvs-serv5552/cdd/examples/debian

Modified Files:
	rules 
Log Message:
Preparation for next release.


Index: rules
===================================================================
RCS file: /cvsroot/cdd/cdd/common/cdd/examples/debian/rules,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- rules	23 Jun 2004 10:48:19 -0000	1.3
+++ rules	26 Jun 2004 22:03:20 -0000	1.4
@@ -28,7 +28,7 @@
 	rm -rf tmp
 	rm -f tasks/*~
 	[ -d menu ] && rm -f debian/$(cdd)-*.post{inst,rm}
-	rm -f debian/$(cdd)-common.{templates,config,install} debian/$(cdd)-apt.conf
+	rm -f debian/$(cdd)-common.{templates,config,install} debian/90$(cdd)-common
 	rm -rf debian/po
 
 	if [ -f debian/control ] ; then dh_clean ; fi
@@ -51,7 +51,6 @@
 	dh_testdir
 	dh_testroot
 	dh_installdocs
-	dh_install
 	dh_installexamples
 	dh_installmenu
 #	dh_installlogrotate
@@ -62,6 +61,9 @@
 	dh_installcron
 	dh_installman
 	cdd-install-helper
+	# dh_install must be called after cdd-install-helper because
+	# some files which have to be copied are created in this call
+	dh_install
 	dh_installdebconf
 #	dh_installinfo
 	dh_installchangelogs