diff options
author | joey <joey> | 2000-06-26 21:31:48 +0000 |
---|---|---|
committer | joey <joey> | 2000-06-26 21:31:48 +0000 |
commit | df1a9d2704b3052eaebbad1e9701fdc44cbeec8b (patch) | |
tree | e5f215d055095d11241bf881421eee0c3335c247 /dh_movefiles | |
parent | 3ee57edb39dd43b944d74fc1a17e526080e3518a (diff) |
r352: * dh_installmodules will now install modiles even if etc/modutils already
exists (wasn't because of a logic error). Closes: #66289
* dh_movefiles now uses debian/movelist, rather than just movelist. This
is to fix an unlikely edge case involving a symlinked debian directory.
Closes: #66278
Diffstat (limited to 'dh_movefiles')
-rwxr-xr-x | dh_movefiles | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/dh_movefiles b/dh_movefiles index 9795b785..bf1fa667 100755 --- a/dh_movefiles +++ b/dh_movefiles @@ -56,21 +56,21 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) { # Order the files. First all real files, then symlinks. # Putting symlinks last is a nice thing to do for library # packages and doesn't affect much of anything else. - doit("rm","-f","movelist"); + doit("rm","-f","debian/movelist"); foreach (@filelist) { $file=$_; $ret=1 if (! -e $file && ! -l $file); $file=~s:^$sourcedir/+::; - complex_doit("(cd $sourcedir >/dev/null ; find $file ! -type d -and ! -type l -print || true) >> movelist"); + complex_doit("(cd $sourcedir >/dev/null ; find $file ! -type d -and ! -type l -print || true) >> debian/movelist"); } foreach (@filelist) { $file=$_; $ret=1 if (! -e $file && ! -l $file); $file=~s:^$sourcedir/+::; - complex_doit("(cd $sourcedir >/dev/null ; find $file ! -type d -and -type l -print || true) >> movelist"); + complex_doit("(cd $sourcedir >/dev/null ; find $file ! -type d -and -type l -print || true) >> debian/movelist"); } - complex_doit("(cd $sourcedir >/dev/null ; tar --create --remove-files --files-from=../../movelist --file -) | (cd $TMP >/dev/null ;tar xpf -)"); - doit("rm","-f","movelist"); + complex_doit("(cd $sourcedir >/dev/null ; tar --create --remove-files --files-from=../movelist --file -) | (cd $TMP >/dev/null ;tar xpf -)"); + doit("rm","-f","debian/movelist"); } } |