r239: Initial Import

diff --git a/debian/changelog b/debian/changelog
index d8ced366faf4d3802408240d863c0cd05335c888..b9f9ba52934039057dc79319701da3266da34351 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+debhelper (2.0.14) unstable; urgency=low
+
+  * Moved /usr/lib/debhelper to /usr/share/debhelper for FHS compliance
+    (#41174). If you used Dh_lib or something in another package, be sure to
+    update your "use" line and declare an appropriate dependancy. (Closes:
+    #41174)
+  * dh_installxaw: Patch from Josip Rodin <joy@cibalia.gkvk.hr> to fix
+    multiple-stanza xaw file support. (Closes: #41173)
+
+ -- Joey Hess <joeyh@master.debian.org>  Mon, 12 Jul 1999 11:49:57 -0700
+
 debhelper (2.0.13) unstable; urgency=low
 
   * dh_fixperms: FHS fixes (#41058)

diff --git a/debian/rules b/debian/rules
index ef833d1c3d52a7f32e8774e37536aa5608386e5e..68d6eb0518580f2d480615a852cc487cd96dc2a8 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -40,13 +40,13 @@ binary-indep: build
        ./dh_testdir
        ./dh_testroot
        ./dh_clean -k
-       ./dh_installdirs usr/bin usr/lib/debhelper
+       ./dh_installdirs usr/bin usr/share/debhelper
 
-       echo -e "package Dh_Version;\n\$$version='$(VERSION)';" > debian/debhelper/usr/lib/debhelper/Dh_Version.pm
+       echo -e "package Dh_Version;\n\$$version='$(VERSION)';" > debian/debhelper/usr/share/debhelper/Dh_Version.pm
        find . -perm +111 -maxdepth 1 -type f -not -name "*.pl" \
                -exec install -p {} debian/debhelper/usr/bin \;
-       cp -a Dh_*.pm debian/debhelper/usr/lib/debhelper
-       cp -a autoscripts debian/debhelper/usr/lib/debhelper
+       cp -a Dh_*.pm debian/debhelper/usr/share/debhelper
+       cp -a autoscripts debian/debhelper/usr/share/debhelper
 
        ./dh_installdocs doc/*
        ./dh_installexamples examples/*

diff --git a/dh_clean b/dh_clean
index e87688def0fa117ad238707552b310d04d4c3622..8ba45d3a1a4f0995a9f761cc11fb9899aeb74457 100755 (executable)
--- a/dh_clean
+++ b/dh_clean
@@ -43,4 +43,4 @@ if (! $dh{D_FLAG}) {
                ) -exec rm -f {} ;"));
 }
 
-doit('rm', '-rf', 'debian/tmp') if -x 'debian/tmp';
+doit('rm', '-rf', 'debian/tmp') if -x 'debian/tmp' && ! compat(1);