summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoeyh <joeyh>2007-05-06 20:15:27 +0000
committerjoeyh <joeyh>2007-05-06 20:15:27 +0000
commit396b636fb84b827fdde1d571df975db4e587fbfd (patch)
treea75f78b96c184b33fff24742d927838e80dd82aa
parentb14e0a5d5cf0e215b2d7386cf857f7b8522b82fd (diff)
r2001: * dh_installwm: If a path is not given, assume the file is in usr/bin, since
usr/X11R6/bin now points to there.
-rw-r--r--debian/changelog7
-rwxr-xr-xdh_installwm4
2 files changed, 9 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 6a7054e3..340ec28c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debhelper (5.0.50) UNRELEASED; urgency=low
+
+ * dh_installwm: If a path is not given, assume the file is in usr/bin, since
+ usr/X11R6/bin now points to there.
+
+ -- Joey Hess <joeyh@debian.org> Sun, 06 May 2007 16:14:51 -0400
+
debhelper (5.0.49) unstable; urgency=low
* dh_installwm: Fix several stupid bugs, including:
diff --git a/dh_installwm b/dh_installwm
index ebe6d1e2..488258b6 100755
--- a/dh_installwm
+++ b/dh_installwm
@@ -66,9 +66,9 @@ if (! defined $dh{PRIORITY}) {
if (@ARGV) {
# This is here for backwards compatibility. If the filename doesn't
- # include a path, assume it's in /usr/X11R6/bin.
+ # include a path, assume it's in /usr/bin.
if ($ARGV[0] !~ m:/:) {
- $ARGV[0]="/usr/X11R6/bin/$ARGV[0]";
+ $ARGV[0]="/usr/bin/$ARGV[0]";
}
}