Merge branch 'master' of ssh://git.debian.org/git/debhelper/debhelper

[debhelper.git] / dh_installxfonts

diff --git a/dh_installxfonts b/dh_installxfonts
index fb7f7feea808ab4d4a31517c30c2c9edc09cd827..276f903c0240b4b17273f3687b9cd384c1270b69 100755 (executable)
--- a/dh_installxfonts
+++ b/dh_installxfonts
@@ -22,22 +22,24 @@ 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
 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 in your
+package build directory.

 
 

-Your package should should depend on xutils (>= 4.0.3) so that the
-update-fonts-* commands are available.
+Your package should depend on xfonts-utils so that the
+update-fonts-* commands are available. (This program adds that dependency to
+${misc:Depends}.)

 
 

-This programt automatically generates the postinst and postrm commands needed
-to register X fonts.  See L<dh_installdeb(1)> for an explanation of how this
-works.
+This program automatically generates the postinst and postrm commands needed
+to register X fonts. These commands are inserted into the maintainer
+scripts by dh_installdeb. See L<dh_installdeb(1)> for an explanation of how
+this works.

 
 =head1 NOTES
 
 See L<update-fonts-alias(8)>, L<update-fonts-scale(8)>, and
 L<update-fonts-dir(8)> for more information about X font installation.
 
 
 =head1 NOTES
 
 See L<update-fonts-alias(8)>, L<update-fonts-scale(8)>, and
 L<update-fonts-dir(8)> for more information about X font installation.
 

-See Debian policy, section 12.8.5. for details about doing fonts the Debian
+See Debian policy, section 11.8.5. for details about doing fonts the Debian

 way.
 
 =cut
 way.
 
 =cut


@@ -46,12 +48,14 @@ init();
 
 foreach my $package (@{$dh{DOPACKAGES}}) {
        my $tmp=tmpdir($package);
 
 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.
 
        # 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 
 
        if (@fontdirs) {
                # Figure out what commands the postinst and postrm will need 


@@ -61,21 +65,27 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                        # This must come before update-fonts-dir.
                        push @cmds, "update-fonts-scale $f"
                                if -f "$tmp/etc/X11/fonts/$f/$package.scale";
                        # 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-dir --x11r7-layout $f";

                        push @cmds, "update-fonts-alias $f"
                                if -f "$tmp/etc/X11/fonts/$f/$package.alias";
                }
 
                autoscript($package, "postinst", "postinst-xfonts",
                        push @cmds, "update-fonts-alias $f"
                                if -f "$tmp/etc/X11/fonts/$f/$package.alias";
                }
 
                autoscript($package, "postinst", "postinst-xfonts",

-                       "s:#CMDS#:".join("\n", map { "\t$_" } @cmds).":;");
+                       "s:#CMDS#:".join(";", @cmds).":;");

                autoscript($package, "postrm", "postrm-xfonts",
                autoscript($package, "postrm", "postrm-xfonts",

-                       "s:#CMDS#:".join("\n", @cmds).":;");
+                       "s:#CMDS#:".join(";", @cmds).":;");
+
+               addsubstvar($package, "misc:Depends", "xfonts-utils");
+       }
+       else {
+               # remove
+               addsubstvar($package, "misc:Depends", "xfonts-utils", "", 1);

        }
 }
 
 =head1 SEE ALSO
 
        }
 }
 
 =head1 SEE ALSO
 

-L<debhelper(1)>
+L<debhelper(7)>

 
 This program is a part of debhelper.
 
 
 This program is a part of debhelper.