r150: Initial Import

diff --git a/debian/changelog b/debian/changelog
index 6608522afd8241a73b391613617258b329d34d30..fa047f8a4985c0038778ad5c5fa81df5adaf031a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debhelper (1.2.14) unstable; urgency=low
+
+  * Really fixed #29762 this time. This also fixes #30025, which asked that
+    dh_makeshlibs come before dh_shlibdeps, so the files it generates can
+    also be used as a shlibs.local file, which will be used by dh_shlibdeps.
+
+ -- Joey Hess <joeyh@master.debian.org>  Thu, 29 Oct 1998 04:00:14 -0800
+
 debhelper (1.2.13) unstable; urgency=low
 
   * Spelling and typo fixes.

diff --git a/debian/control b/debian/control
index 8edb5aa9a7c144d2dc930f09fe27e7a276b91cd1..b98707802deb73ef1656dc185c1a7322e5421c01 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: debhelper
 Section: devel
 Priority: optional
 Maintainer: Joey Hess <joeyh@master.debian.org>
-Standards-Version: 2.5.0.0
+Standards-Version: 2.4.1.4
 
 Package: debhelper
 Architecture: all

diff --git a/examples/rules b/examples/rules
index 091a67a61ed44cc4c44e7ebffa1a485590c84843..89263a1a25d74eb4781541450cac48ddae6d7852 100755 (executable)
--- a/examples/rules
+++ b/examples/rules
@@ -59,9 +59,9 @@ binary-arch: build install
        dh_compress
        dh_fixperms
        dh_suidregister
+#      dh_makeshlibs
        dh_installdeb
        dh_shlibdeps
-#      dh_makeshlibs
        dh_gencontrol
        dh_md5sums
        dh_builddeb

diff --git a/examples/rules.multi b/examples/rules.multi
index c7426b2eb8f309a0df3b887b175a2ceeb202d2bd..6f01cc827a5ca4c4c139f0cc42d8ee83fb442d83 100755 (executable)
--- a/examples/rules.multi
+++ b/examples/rules.multi
@@ -83,9 +83,9 @@ binary-arch: build install
        dh_fixperms -a
        dh_suidregister -a
        dh_installdeb -a
-       dh_shlibdeps -a
 #      dh_makeshlibs -a
        dh_gencontrol -a
+       dh_shlibdeps -a
        dh_md5sums -a
        dh_builddeb -a