r621: This commit was manufactured by cvs2svn to create tag 'rel-2-0-22'.version_2.0.22

4 files changed, 78 insertions, 163 deletions

diff --git a/examples/rules b/examples/rules
index f62b8e5e..78cfed49 100755
--- a/examples/rules
+++ b/examples/rules
@@ -1,10 +1,12 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# This file is public domain software, originally written by Joey Hess. 
+# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+# This is the debhelper compatability version to use.
+export DH_COMPAT=1
+
 build: build-stamp
 build-stamp:
 	dh_testdir
@@ -17,7 +19,7 @@ build-stamp:
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp
+	rm -f build-stamp install-stamp
 
 	# Add here commands to clean up after the build process.
 	#-$(MAKE) clean
@@ -25,14 +27,17 @@ clean:
 
 	dh_clean
 
-install: build
+install: install-stamp
+install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
 
-	# Add here commands to install the package into debian/<packagename>
-	#$(MAKE) prefix=`pwd`/debian/`dh_listpackages`/usr install
+	# Add here commands to install the package into debian/tmp.
+	#$(MAKE) prefix=`pwd`/debian/tmp/usr install
+
+	touch install-stamp
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -40,36 +45,36 @@ binary-indep: build install
 
 # Build architecture-dependent files here.
 binary-arch: build install
+#	dh_testversion
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs
 	dh_installdocs
 	dh_installexamples
-#	dh_install
-#	dh_installmenu
-#	dh_installdebconf	
-#	dh_installlogrotate
+	dh_installmenu
 #	dh_installemacsen
-#	dh_installcatalogs
 #	dh_installpam
-#	dh_installmime
 #	dh_installinit
-#	dh_installcron
-#	dh_installinfo
+	dh_installcron
+	dh_installmanpages
+	dh_installinfo
 #	dh_undocumented
-	dh_installman
+	dh_installchangelogs
 	dh_link
 	dh_strip
 	dh_compress
 	dh_fixperms
-#	dh_perl
-#	dh_python
+	# You may want to make some executables suid here.
+	dh_suidregister
 #	dh_makeshlibs
 	dh_installdeb
+#	dh_perl
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
+source diff:
+	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
+
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install
diff --git a/examples/rules.indep b/examples/rules.indep
index c8524256..e8a2b5d5 100755
--- a/examples/rules.indep
+++ b/examples/rules.indep
@@ -1,12 +1,13 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper. 
-# This file is public domain software, originally written by Joey Hess.
-#
+# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
 # This version is for packages that are architecture independent.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+# This is the debhelper compatability version to use.
+export DH_COMPAT=1
+
 build: build-stamp
 build-stamp:
 	dh_testdir
@@ -19,7 +20,7 @@ build-stamp:
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp
+	rm -f build-stamp install-stamp
 
 	# Add here commands to clean up after the build process.
 	#-$(MAKE) clean
@@ -27,41 +28,41 @@ clean:
 
 	dh_clean
 
-install: build
+install: install-stamp
+install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
 
-	# Add here commands to install the package into debian/<packagename>.
-	#$(MAKE) prefix=`pwd`/debian/`dh_listpackages`/usr install
+	# Add here commands to install the package into debian/tmp.
+	#$(MAKE) prefix=`pwd`/debian/tmp/usr install
+
+	touch install-stamp
 
 # Build architecture-independent files here.
 binary-indep: build install
+#	dh_testversion
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs
 	dh_installdocs
 	dh_installexamples
-#	dh_installmenu
-#	dh_installdebconf
-#	dh_installlogrotate
+	dh_installmenu
 #	dh_installemacsen
-#	dh_installcatalogs
 #	dh_installpam
-#	dh_installmime
 #	dh_installinit
-#	dh_installcron
-#	dh_installman
-#	dh_installinfo
+	dh_installcron
+#	dh_installmanpages
+	dh_installinfo
 #	dh_undocumented
-	dh_installman
+	dh_installchangelogs
 	dh_link
 	dh_compress
 	dh_fixperms
-#	dh_perl
-#	dh_python
+	# You may want to make some executables suid here.
+	dh_suidregister
 	dh_installdeb
+#	dh_perl
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
@@ -70,5 +71,8 @@ binary-indep: build install
 binary-arch: build install
 # We have nothing to do by default.
 
+source diff:
+	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
+
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install
diff --git a/examples/rules.multi b/examples/rules.multi
index fe7c20a7..7329437a 100755
--- a/examples/rules.multi
+++ b/examples/rules.multi
@@ -1,7 +1,5 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper. 
-# This file is public domain software, originally written by Joey Hess.
-#
+# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
 # This version is for a hypothetical package that builds an
 # architecture-dependant package, as well as an architecture-independent
 # package.
@@ -9,6 +7,9 @@
 # Uncomment this to turn on verbose mode. 
 #export DH_VERBOSE=1
 
+# This is the debhelper compatability version to use.
+export DH_COMPAT=1
+
 build: build-stamp
 build-stamp:
 	dh_testdir
@@ -21,7 +22,7 @@ build-stamp:
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp 
+	rm -f build-stamp install-stamp
 
 	# Add here commands to clean up after the build process.
 	#-$(MAKE) clean
@@ -29,8 +30,8 @@ clean:
 
 	dh_clean
 
-install:
-install: build
+install: install-stamp
+install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
@@ -39,68 +40,68 @@ install: build
 	# Add here commands to install the package into debian/tmp.
 	#$(MAKE) prefix=`pwd`/debian/tmp/usr install
 
-	dh_install
+	dh_movefiles
+	touch install-stamp
 
 # Build architecture-independent files here.
 binary-indep: build install
+#	dh_testversion
 	dh_testdir -i
 	dh_testroot -i
-	dh_installchangelogs -i
 	dh_installdocs -i
 	dh_installexamples -i
-#	dh_installmenu -i
-#	dh_installdebconf -i
-#	dh_installlogrotate -i
+	dh_installmenu -i
 #	dh_installemacsen -i
-#	dh_installcatalogs -i
 #	dh_installpam -i
-#	dh_installmime -i
 #	dh_installinit -i
-#	dh_installcron -i
-#	dh_installinfo -i
-#	dh_undocumented -i
-	dh_installman -i
+	dh_installcron -i
+#	dh_installmanpages -i
+	dh_installinfo -i
+#	dh_undocumented
+	dh_installchangelogs -i
 	dh_link -i
 	dh_compress -i
 	dh_fixperms -i
-#	dh_perl -i
-#	dh_python -i
+	# You may want to make some executables suid here.
+	dh_suidregister -i
 	dh_installdeb -i
+#	dh_perl -i
 	dh_gencontrol -i
 	dh_md5sums -i
 	dh_builddeb -i
 
 # Build architecture-dependent files here.
 binary-arch: build install
+#	dh_testversion
 	dh_testdir -a
 	dh_testroot -a
-	dh_installchangelogs -a
 	dh_installdocs -a
 	dh_installexamples -a
 	dh_installmenu -a
-#	dh_installdebconf -a
-#	dh_installlogrotate -a
 #	dh_installemacsen -a
-#	dh_installcatalogs -a
 #	dh_installpam -a
-#	dh_installmime -a
 #	dh_installinit -a
-#	dh_installcron -a
-#	dh_installinfo -a
-#	dh_undocumented -a
-	dh_installman -a
+	dh_installcron -a
+	dh_installmanpages -a
+	dh_installinfo -a
+#	dh_undocumented
+	dh_installchangelogs -a
 	dh_strip -a
 	dh_link -a
 	dh_compress -a
 	dh_fixperms -a
-#	dh_perl -a
-#	dh_python -a
-#	dh_makeshlibs -a
+	# You may want to make some executables suid here.
+	dh_suidregister -a
 	dh_installdeb -a
+#	dh_makeshlibs -a
+#	dh_perl -a
 	dh_shlibdeps -a
 	dh_gencontrol -a
 	dh_md5sums -a
 	dh_builddeb -a
 
+source diff:
+	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
+
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install
diff --git a/examples/rules.multi2 b/examples/rules.multi2
deleted file mode 100755
index 12b2d9c5..00000000
--- a/examples/rules.multi2
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# This file is public domain software, originally written by Joey Hess.
-#
-# This version is for a multibinary package. It also allows you to build any
-# of the binary packages independantly, via binary-<package> targets.
-
-# Uncomment this to turn on verbose mode. 
-#export DH_VERBOSE=1
-
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-build: build-stamp
-build-stamp:
-	dh_testdir
-
-	# Add here commands to compile the package.
-	#$(MAKE)
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-
-	# Add here commands to clean up after the build process.
-	#-$(MAKE) clean
-	#-$(MAKE) distclean
-
-	dh_clean
-
-install: DH_OPTIONS=
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	# Add here commands to install the package into debian/tmp.
-	#$(MAKE) prefix=`pwd`/debian/tmp/usr install
-
-	dh_install
-
-# This single target is used to build all the packages, all at once, or
-# one at a time. So keep in mind: any options passed to commands here will
-# affect _all_ packages. Anything you want to only affect one package
-# should be put in another target, such as the install target.
-binary-common:
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_installexamples
-	dh_installmenu
-#	dh_installdebconf
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installcatalogs
-#	dh_installpam
-#	dh_installmime
-#	dh_installinit
-#	dh_installman
-#	dh_installcron
-#	dh_installinfo
-#	dh_undocumented
-	dh_strip
-	dh_link
-	dh_compress
-	dh_fixperms
-#	dh_perl
-#	dh_python
-#	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-# Build architecture independant packages using the common target.
-binary-indep: build install
-# (Uncomment this next line if you have such packages.)
-#	 $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture dependant packages using the common target.
-binary-arch: build install
-	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
-
-# Any other binary targets build just one binary package at a time.
-binary-%: build install
-	make -f debian/rules binary-common DH_OPTIONS=-p$*
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary-common binary install