r518: * dh_movefiles has long been a sore point in debhelper. Inherited

     from debstd, its interface and implementation suck, and I have maintained
     it while never really deigning to use it. Now there is a remplacment:
     dh_install, which ...
     - copies files, doesn't move them. Closes: #75360, #82649
     - doesn't have that whole annoying debian/package.files vs. debian/files
       mess, as it uses debian/install.
     - supports copying empty subdirs. Closes: #133037
     - doesn't use tar, thus no error reproting problems. Closes: #112538
     - files are listed relative to the pwd, debian/tmp need not be used at
       all, so no globbing issues. Closes: #100404
     - supports -X. Closes: #116902
     - the whole concept of moving files out of a directory is gone, so this
       bug doesn't really apply. Closes: #120026
     - This is exactly what Bill Allombert asked for in #117383, even though I
       designed it seemingly independantly. Thank you Bill! Closes: #117383
   * Made debhelper's debian/rules a lot simpler by means of the above.
   * Updated example rules file to use dh_install. Also some reordering and
     other minor changes.
   * dh_movefiles is lightly deprecated, and when you run into its bugs and
     bad design, you are incouraged to just use dh_install instead.
   * dh_fixperms: in v4 only, make all files in bin/ dirs +x. Closes: #119039
   * dh_fixperms: in v4 only, make all files in etc/init.d executable (of
     course there's -X ..)
   * dh_link: in v4 only, finds existing, non-policy-conformant symlinks
     and corrects them. This has the side effect of making dh_link idempotent.
   * Added a -h/--help option. This seems very obvious, but it never occured to
     me before..
   * use v4 for building debhelper itself
   * v4 mode is done, you may now use it without fear of it changing.
     (This idea of this upload is to get v4 into woody so people won't run into
     many issues backporting from sarge to woody later on. Packages targeted
     for woody should continue to use whatever compatability level they are
     using.)

4 files changed, 31 insertions, 28 deletions

diff --git a/examples/rules b/examples/rules
index 1e57eab5..26c0481f 100755
--- a/examples/rules
+++ b/examples/rules
@@ -42,20 +42,21 @@ binary-indep: build install
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-#	dh_installdebconf	
+	dh_installchangelogs
 	dh_installdocs
 	dh_installexamples
-	dh_installmenu
+#	dh_install
+#	dh_installmenu
+#	dh_installdebconf	
 #	dh_installlogrotate
 #	dh_installemacsen
 #	dh_installpam
 #	dh_installmime
 #	dh_installinit
-	dh_installcron
-	dh_installman
-	dh_installinfo
+#	dh_installcron
+#	dh_installinfo
 #	dh_undocumented
-	dh_installchangelogs
+	dh_installman
 	dh_link
 	dh_strip
 	dh_compress
diff --git a/examples/rules.indep b/examples/rules.indep
index aa5a9701..6a01a3eb 100755
--- a/examples/rules.indep
+++ b/examples/rules.indep
@@ -40,20 +40,21 @@ install: build
 binary-indep: build install
 	dh_testdir
 	dh_testroot
-#	dh_installdebconf
+	dh_installchangelogs
 	dh_installdocs
 	dh_installexamples
-	dh_installmenu
+#	dh_installmenu
+#	dh_installdebconf
 #	dh_installlogrotate
 #	dh_installemacsen
 #	dh_installpam
 #	dh_installmime
 #	dh_installinit
-	dh_installcron
+#	dh_installcron
 #	dh_installman
-	dh_installinfo
+#	dh_installinfo
 #	dh_undocumented
-	dh_installchangelogs
+	dh_installman
 	dh_link
 	dh_compress
 	dh_fixperms
diff --git a/examples/rules.multi b/examples/rules.multi
index 8e1e8927..9e3a448b 100755
--- a/examples/rules.multi
+++ b/examples/rules.multi
@@ -39,26 +39,26 @@ install: build
 	# Add here commands to install the package into debian/tmp.
 	#$(MAKE) prefix=`pwd`/debian/tmp/usr install
 
-	dh_movefiles
+	dh_install
 
 # Build architecture-independent files here.
 binary-indep: build install
 	dh_testdir -i
 	dh_testroot -i
-#	dh_installdebconf -i
+	dh_installchangelogs -i
 	dh_installdocs -i
 	dh_installexamples -i
-	dh_installmenu -i
+#	dh_installmenu -i
+#	dh_installdebconf -i
 #	dh_installlogrotate -i
 #	dh_installemacsen -i
 #	dh_installpam -i
 #	dh_installmime -i
 #	dh_installinit -i
-	dh_installcron -i
-	dh_installman -i
-	dh_installinfo -i
+#	dh_installcron -i
+#	dh_installinfo -i
 #	dh_undocumented -i
-	dh_installchangelogs -i
+	dh_installman -i
 	dh_link -i
 	dh_compress -i
 	dh_fixperms -i
@@ -72,20 +72,20 @@ binary-indep: build install
 binary-arch: build install
 	dh_testdir -a
 	dh_testroot -a
-#	dh_installdebconf -a
+	dh_installchangelogs -a
 	dh_installdocs -a
 	dh_installexamples -a
 	dh_installmenu -a
+#	dh_installdebconf -a
 #	dh_installlogrotate -a
 #	dh_installemacsen -a
 #	dh_installpam -a
 #	dh_installmime -a
 #	dh_installinit -a
-	dh_installcron -a
-	dh_installman -a
-	dh_installinfo -a
+#	dh_installcron -a
+#	dh_installinfo -a
 #	dh_undocumented -a
-	dh_installchangelogs -a
+	dh_installman -a
 	dh_strip -a
 	dh_link -a
 	dh_compress -a
diff --git a/examples/rules.multi2 b/examples/rules.multi2
index 4434b0c0..edde0b8d 100755
--- a/examples/rules.multi2
+++ b/examples/rules.multi2
@@ -41,7 +41,7 @@ install: build
 	# Add here commands to install the package into debian/tmp.
 	#$(MAKE) prefix=`pwd`/debian/tmp/usr install
 
-	dh_movefiles
+	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
@@ -50,20 +50,21 @@ install: build
 binary-common:
 	dh_testdir
 	dh_testroot
-#	dh_installdebconf
+	dh_installchangelogs
 	dh_installdocs
 	dh_installexamples
 	dh_installmenu
+#	dh_installdebconf
 #	dh_installlogrotate
 #	dh_installemacsen
 #	dh_installpam
 #	dh_installmime
 #	dh_installinit
 #	dh_installman
-	dh_installcron
-	dh_installinfo
+#	dh_installcron
+#	dh_installinfo
 #	dh_undocumented
-	dh_installchangelogs
+	dh_installman
 	dh_strip
 	dh_link
 	dh_compress