r2001: * dh_installwm: If a path is not given, assume the file is in usr/bin, since

  usr/X11R6/bin now points to there.

diff --git a/debian/changelog b/debian/changelog
index 6a7054e36c9d24498c1feb8b8f95862589802ae4..340ec28cf1d368f74bd40a576986c2ca80bf4d01 100644 (file)
--- 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 ebe6d1e2f096e3db9386157cdfd95ec36ba8216e..488258b60a9535022655d02bf0d856141cfc60d9 100755 (executable)
--- 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]";
        }
 }