summaryrefslogtreecommitdiff
path: root/dh_installxfonts
diff options
context:
space:
mode:
authorjoeyh <joeyh>2006-04-13 08:59:31 +0000
committerjoeyh <joeyh>2006-04-13 08:59:31 +0000
commit5cb05036a7c2716d3622290567881fd02a1b995d (patch)
tree7d7219aa1f7ea6108dc7e342ddcf20c93f27cc30 /dh_installxfonts
parentf2fa43a9c942e163b377c84c32edc351942d916c (diff)
r1900: * dh_installxfonts: Random hack to deal with X font dirs moving to
/usr/share/fonts/X11/ -- look there for fonts as well as in the old location, although the old location probably won't be seen by X anymore. * dh_installxfonts: Generate misc:Depends on new xfonts-utils. * dh_compress: compress pcm fonts under usr/share/fonts/X11/ * dh_link: change example that used X11R6 directory.
Diffstat (limited to 'dh_installxfonts')
-rwxr-xr-xdh_installxfonts16
1 files changed, 9 insertions, 7 deletions
diff --git a/dh_installxfonts b/dh_installxfonts
index 010d460..2bcbe1f 100755
--- a/dh_installxfonts
+++ b/dh_installxfonts
@@ -25,7 +25,7 @@ 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.
-Your package should depend on xutils (>= 4.0.3) so that the
+Your package should depend on xfonts-utils so that the
update-fonts-* commands are available. (This program adds that dependency to
${misc:Depends}.)
@@ -47,12 +47,14 @@ init();
foreach my $package (@{$dh{DOPACKAGES}}) {
my $tmp=tmpdir($package);
- my $XFONTDIR="$tmp/usr/X11R6/lib/X11/fonts/";
# Find all font directories in the package build directory.
- opendir DIR, $XFONTDIR || next;
- my @fontdirs = grep { -d "$XFONTDIR/$_" && !/^\./ } (readdir DIR);
- closedir DIR;
+ my @fontdirs;
+ foreach my $parentdir ("$tmp/usr/X11R6/lib/X11/fonts/", "$tmp/usr/share/fonts/X11/") {
+ opendir DIR, $parentdir || next;
+ @fontdirs = grep { -d "$parentdir/$_" && !/^\./ } (readdir DIR);
+ closedir DIR;
+ }
if (@fontdirs) {
# Figure out what commands the postinst and postrm will need
@@ -72,11 +74,11 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
autoscript($package, "postrm", "postrm-xfonts",
"s:#CMDS#:".join(";", @cmds).":;");
- addsubstvar($package, "misc:Depends", "xutils", ">= 4.0.3");
+ addsubstvar($package, "misc:Depends", "xfonts-utils");
}
else {
# remove
- addsubstvar($package, "misc:Depends", "xutils", ">= 4.0.3", 1);
+ addsubstvar($package, "misc:Depends", "xfonts-utils", "", 1);
}
}