summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey>2000-06-26 21:31:48 +0000
committerjoey <joey>2000-06-26 21:31:48 +0000
commitdf1a9d2704b3052eaebbad1e9701fdc44cbeec8b (patch)
treee5f215d055095d11241bf881421eee0c3335c247
parent3ee57edb39dd43b944d74fc1a17e526080e3518a (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
-rw-r--r--debian/changelog10
-rwxr-xr-xdh_installmodules2
-rwxr-xr-xdh_movefiles10
3 files changed, 16 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index 1009129..369431e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+debhelper (2.0.99) unstable; urgency=low
+
+ * 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
+
+ -- Joey Hess <joeyh@debian.org> Mon, 26 Jun 2000 14:24:12 -0700
+
debhelper (2.0.98) unstable; urgency=low
* dh_installdebconf: Automatically merge localized template
diff --git a/dh_installmodules b/dh_installmodules
index dd75c72..b75c58f 100755
--- a/dh_installmodules
+++ b/dh_installmodules
@@ -27,8 +27,8 @@ foreach $PACKAGE (@{$dh{DOPACKAGES}}) {
if ($file) {
if (! -e "$TMP/etc/modutils") {
doit("install","-d","$TMP/etc/modutils");
- doit("install","-m","0644",$file,"$TMP/etc/modutils/$PACKAGE");
}
+ doit("install","-m","0644",$file,"$TMP/etc/modutils/$PACKAGE");
}
if (! $dh{NOSCRIPTS} &&
diff --git a/dh_movefiles b/dh_movefiles
index 9795b78..bf1fa66 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");
}
}