r568: * Fixed dh_python ordering in example rules files. Closes: #172283

   * Make python postinst fragment only run python if it is installed, useful
     for packages that include python modules but do not depend on python.

diff --git a/autoscripts/postinst-python b/autoscripts/postinst-python
index 2ecb99b2b8273cc00a9ca44f44960fabb6891645..6f1f9a5b885e9ebe9005470ccaef5067ef8a88a6 100644 (file)
--- a/autoscripts/postinst-python
+++ b/autoscripts/postinst-python
@@ -1,6 +1,8 @@
 PYTHON=#PYVER#
-DIRLIST="#DIRLIST#"
-for i in $DIRLIST ; do
-       $PYTHON -O /usr/lib/$PYTHON/compileall.py -q $i
-       $PYTHON /usr/lib/$PYTHON/compileall.py -q $i
-done
+if which $PYTHON >/dev/null 2>&1; then
+       DIRLIST="#DIRLIST#"
+       for i in $DIRLIST ; do
+               $PYTHON -O /usr/lib/$PYTHON/compileall.py -q $i
+               $PYTHON /usr/lib/$PYTHON/compileall.py -q $i
+       done
+fi

diff --git a/debian/changelog b/debian/changelog
index 54693a679cf754792759acd3abc4098bdce3143c..b267d9e33d9148bf1b96022bb049e50133754e41 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debhelper (4.1.27) unstable; urgency=low
+
+  * Fixed dh_python ordering in example rules files. Closes: #172283
+  * Make python postinst fragment only run python if it is installed, useful
+    for packages that include python modules but do not depend on python.
+
+ -- Joey Hess <joeyh@debian.org>  Mon,  9 Dec 2002 12:12:31 -0500
+
 debhelper (4.1.26) unstable; urgency=low
 
   * dh_builddeb: Reluctantly call dpkg-deb directly. dpkg cannot pass extra

diff --git a/examples/rules b/examples/rules
index 4f2b7aceead337c0611baa43b27b09cf4f78c289..aead2db168e9ca8884e25bd7339e8e29befb78c3 100755 (executable)
--- a/examples/rules
+++ b/examples/rules
@@ -61,10 +61,10 @@ binary-arch: build install
        dh_strip
        dh_compress
        dh_fixperms
-#      dh_makeshlibs
-       dh_installdeb
 #      dh_perl
 #      dh_python
+#      dh_makeshlibs
+       dh_installdeb
        dh_shlibdeps
        dh_gencontrol
        dh_md5sums

diff --git a/examples/rules.indep b/examples/rules.indep
index 50496f940a60c612b3b5b9afef94e0e3c4e5fb06..4ffa6da982ba3cad9121e7302848c41302c6a6df 100755 (executable)
--- a/examples/rules.indep
+++ b/examples/rules.indep
@@ -58,9 +58,9 @@ binary-indep: build install
        dh_link
        dh_compress
        dh_fixperms
-       dh_installdeb
 #      dh_perl
 #      dh_python
+       dh_installdeb
        dh_gencontrol
        dh_md5sums
        dh_builddeb

diff --git a/examples/rules.multi b/examples/rules.multi
index 17a0d348b499ad7722d68fd123db8a15991bd894..b41387b3141d968aef94eee7a6bc4470c68011d6 100755 (executable)
--- a/examples/rules.multi
+++ b/examples/rules.multi
@@ -62,9 +62,9 @@ binary-indep: build install
        dh_link -i
        dh_compress -i
        dh_fixperms -i
-       dh_installdeb -i
 #      dh_perl -i
 #      dh_python -i
+       dh_installdeb -i
        dh_gencontrol -i
        dh_md5sums -i
        dh_builddeb -i
@@ -91,10 +91,10 @@ binary-arch: build install
        dh_link -a
        dh_compress -a
        dh_fixperms -a
-#      dh_makeshlibs -a
-       dh_installdeb -a
 #      dh_perl -a
 #      dh_python -a
+#      dh_makeshlibs -a
+       dh_installdeb -a
        dh_shlibdeps -a
        dh_gencontrol -a
        dh_md5sums -a

diff --git a/examples/rules.multi2 b/examples/rules.multi2
index 36f921b4ea072eeac69eb75742409caf109e44a9..8c9f3a3fcbd86a8d3144e4273cd364fec8ce3152 100755 (executable)
--- a/examples/rules.multi2
+++ b/examples/rules.multi2
@@ -68,10 +68,10 @@ binary-common:
        dh_link
        dh_compress
        dh_fixperms
-#      dh_makeshlibs
-       dh_installdeb
 #      dh_perl
 #      dh_python
+#      dh_makeshlibs
+       dh_installdeb
        dh_shlibdeps
        dh_gencontrol
        dh_md5sums