r1917: * dh_installman: When --language is used, be smarter about stripping

* dh_installxfonts: /etc/X11/fonts/X11R7 is deprecated, back to looking in
  old location, and not passing --x11r7-layout to update-fonts-alias and
  update-fonts-scale (but still to update-fonts-dir). Closes: #366234

diff --git a/debian/changelog b/debian/changelog
index 9c76e9d384b660946b5d21723f517d9a87654f52..4ea269abb3d9db5532b5899f3ee3a228a9903553 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,13 @@
-debhelper (5.0.35) UNRELEASED; urgency=low
+debhelper (5.0.35) unstable; urgency=low
 
-  * dh_installman: When --language is used, be smarter about stripping 
+  * dh_installman: When --language is used, be smarter about stripping
     language codes from man page filenames. Only strip things that look like
     codes that match the specified languages. Closes: #366645
+  * dh_installxfonts: /etc/X11/fonts/X11R7 is deprecated, back to looking in
+    old location, and not passing --x11r7-layout to update-fonts-alias and
+    update-fonts-scale (but still to update-fonts-dir). Closes: #366234
 
- -- Joey Hess <joeyh@debian.org>  Wed, 10 May 2006 20:07:40 -0400
+ -- Joey Hess <joeyh@debian.org>  Wed, 10 May 2006 20:09:00 -0400
 
 debhelper (5.0.34) unstable; urgency=low
 

diff --git a/dh_installxfonts b/dh_installxfonts
index 655a5f352b6c9a0b3d89f813dd240c25a5101c58..d1ced88e0d2b2eead4958fb9fc1565ae8f800fd5 100755 (executable)
--- a/dh_installxfonts
+++ b/dh_installxfonts
@@ -22,7 +22,7 @@ and fonts.scale be rebuilt properly at install time.
 Before calling this program, you should have installed any X fonts provided
 by your package into the appropriate location in the package build
 directory, and if you have fonts.alias or fonts.scale files, you should
-install them into the correct location under etc/X11/fonts/X11R7 in your
+install them into the correct location under etc/X11/fonts in your
 package build directory.
 
 Your package should depend on xfonts-utils so that the
@@ -62,11 +62,11 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                my @cmds;
                foreach my $f (@fontdirs) {
                        # This must come before update-fonts-dir.
-                       push @cmds, "update-fonts-scale --x11r7-layout $f"
-                               if -f "$tmp/etc/X11/fonts/X11R7/$f/$package.scale";
+                       push @cmds, "update-fonts-scale $f"
+                               if -f "$tmp/etc/X11/fonts/$f/$package.scale";
                        push @cmds, "update-fonts-dir --x11r7-layout $f";
-                       push @cmds, "update-fonts-alias --x11r7-layout $f"
-                               if -f "$tmp/etc/X11/fonts/X11R7/$f/$package.alias";
+                       push @cmds, "update-fonts-alias $f"
+                               if -f "$tmp/etc/X11/fonts/$f/$package.alias";
                }
 
                autoscript($package, "postinst", "postinst-xfonts",