r505: * Improved dh_installxfonts some more:

     - Better indenting of generated code.
     - Better ordering of generated code (minor fix).

diff --git a/autoscripts/postinst-xfonts b/autoscripts/postinst-xfonts
index 4c5ab1b8f0d7d0d332815db3ee41534711a76376..8821bc5f0603d15da5c20ba87c0c6fd28c6f115c 100644 (file)
--- a/autoscripts/postinst-xfonts
+++ b/autoscripts/postinst-xfonts
@@ -1,3 +1,3 @@
 if [ -x /usr/sbin/update-fonts-dir ]; then
-       #CMDS#
+#CMDS#
 fi

diff --git a/autoscripts/postrm-xfonts b/autoscripts/postrm-xfonts
index a9afcabecfc852ecd5df3ee016e20f46aa1f4b88..b5dd964ba996628813073dd84579e29c4107e0b4 100644 (file)
--- a/autoscripts/postrm-xfonts
+++ b/autoscripts/postrm-xfonts
@@ -1,3 +1,3 @@
 if [ "$1" != "upgrade" -a -x /usr/sbin/update-fonts-dir ]; then
-       #CMDS#
+#CMDS#
 fi

diff --git a/debian/changelog b/debian/changelog
index ebe4eef314a3f04e6098639d3401d7568d33d1d5..93653398d8f1e5a86bf4cb6a707de01eff81c5d9 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+debhelper (3.4.3) unstable; urgency=low
+
+  * Improved dh_installxfonts some more:
+    - Better indenting of generated code.
+    - Better ordering of generated code (minor fix).
+
+ -- Joey Hess <joeyh@debian.org>  Sat, 26 Jan 2002 23:09:59 -0500
+
 debhelper (3.4.2) unstable; urgency=low
 
   * dh_installman: more documentation about the .TH line. Closes: #129205

diff --git a/dh_installxfonts b/dh_installxfonts
index f8d9d4692853dc988882a99f7b5778ac0fdf5913..fb7f7feea808ab4d4a31517c30c2c9edc09cd827 100755 (executable)
--- a/dh_installxfonts
+++ b/dh_installxfonts
@@ -58,16 +58,16 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                # to call.
                my @cmds;
                foreach my $f (@fontdirs) {
+                       # This must come before update-fonts-dir.
+                       push @cmds, "update-fonts-scale $f"
+                               if -f "$tmp/etc/X11/fonts/$f/$package.scale";
                        push @cmds, "update-fonts-dir $f";
                        push @cmds, "update-fonts-alias $f"
                                if -f "$tmp/etc/X11/fonts/$f/$package.alias";
-                       # This must come _before_ mkfontdir, thus the unshift.
-                       unshift @cmds, "update-fonts-scale $f"
-                               if -f "$tmp/etc/X11/fonts/$f/$package.scale";
                }
 
                autoscript($package, "postinst", "postinst-xfonts",
-                       "s:#CMDS#:".join("\n", @cmds).":;");
+                       "s:#CMDS#:".join("\n", map { "\t$_" } @cmds).":;");
                autoscript($package, "postrm", "postrm-xfonts",
                        "s:#CMDS#:".join("\n", @cmds).":;");
        }