Merge branch 'master' into buildsystems

diff --git a/dh_auto_install b/dh_auto_install
index 446470270a19bdd55415e3e9219aa597e678a175..abf8e107c2c9d156c9da0e07f4189031f7d1ab2c 100755 (executable)
--- a/dh_auto_install
+++ b/dh_auto_install
@@ -27,8 +27,7 @@ it is used.
 The files are installed into debian/<package>/ if there is only one binary
 package. In the multiple binary package case, the files are instead
 installed into debian/tmp/, and should be moved from there to the
-appropriate package build directory using L<dh_install(1)> or
-L<dh_movefiles(1)>.
+appropriate package build directory using L<dh_install(1)>.
 
 DESTDIR is used to tell make where to install the files. 
 If the Makefile was generated by MakeMaker from a Makefile.PL, it will

diff --git a/dh_install b/dh_install
index 5a3a7f583735166719b526606a1341d17d6d14c8..c83ec81bb24aef0c79f05ca9e6e0b6441271cd2f 100755 (executable)
--- a/dh_install
+++ b/dh_install
@@ -90,12 +90,6 @@ Makes all files to be installed be found under dir. If this is
 specified, it is akin to all the filenames having "dir/" prepended
 to them.
 
-To make dh_install behave like the old dh_movefiles, move your
-package.files file to package.install and call dh_install with
-"--sourcedir=debian/tmp" appended to the command. This will
-approximate dh_movefiles behaviour, except it will copy files instead
-of moving them.
-
 =item B<-Xitem>, B<--exclude=item>
 
 Exclude files that contain "item" anywhere in their filename from