summaryrefslogtreecommitdiff
path: root/dh_installxfonts
diff options
context:
space:
mode:
authorjoeyh <joeyh>2006-04-17 20:11:24 +0000
committerjoeyh <joeyh>2006-04-17 20:11:24 +0000
commitf859c23a77b93368b96630b4b0ff79f039b87a2f (patch)
tree674468aab89ef797b935c8e4c479f3708263f01f /dh_installxfonts
parent710a0ee980939fd6c9aacd121b41c9df7163e694 (diff)
r1905: * dh_installxfonts: pass --x11r7-layout to update-fonts-* commands to ensure
they use the right new directory. Closes: #362820 * dh_installxfonts: also, alias files have moved from /etc/X11/fonts/* to /etc/X11/fonts/X11R7/*, update call to update-fonts-alias and the man page accordingly; packages containing alias files will need to switch to the new directory on their own. * dh_installudev: correct documentation for --name. Closes: #363028 * Fix broken directory removal code.
Diffstat (limited to 'dh_installxfonts')
-rwxr-xr-xdh_installxfonts12
1 files changed, 6 insertions, 6 deletions
diff --git a/dh_installxfonts b/dh_installxfonts
index 2bcbe1f..9237988 100755
--- a/dh_installxfonts
+++ b/dh_installxfonts
@@ -22,8 +22,8 @@ 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 in your package
-build directory.
+install them into the correct location under etc/X11/fonts/X11R7 in your
+package build directory.
Your package should depend on xfonts-utils so that the
update-fonts-* commands are available. (This program adds that dependency to
@@ -62,10 +62,10 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
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"
+ push @cmds, "update-fonts-scale --x11r7-layout $f"
+ if -f "$tmp/etc/X11/fonts/X11R7/$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/$f/$package.alias";
}