← Back to branch summary

~ubuntu-branches/ubuntu/lucid/debhelper/lucid

« back to all changes in this revision

Viewing changes to dh_installxfonts

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2008-05-05 21:01:02 UTC
  • Revision ID: james.westby@ubuntu.com-20080505210102-ypjjnfbie7yoonum
Tags: 7.0.8ubuntu1
* Merge with Debian unstable. Remaining Ubuntu changes:
  - autoscripts/postinst-scrollkeeper: Do not show scrollkeeper-update
    output.
  - dh_installudev: Use priority 50 by default (instead of z60) and '-'
    separator (instead of '_').
  - dh_installxfonts: Use versioned dependency for xfonts-utils. This should
    be kept until dapper goes out of support, to avoid broken dapper
    backports.

Show diffs side-by-side

added added

removed removed

Lines of Context:
dh_installxfonts
52
52
        # Find all font directories in the package build directory.
53
53
        my @fontdirs;
54
54
        foreach my $parentdir ("$tmp/usr/X11R6/lib/X11/fonts/", "$tmp/usr/share/fonts/X11/") {
55
 
                opendir DIR, $parentdir || next;
 
55
                opendir(DIR, $parentdir) || next;
56
56
                @fontdirs = grep { -d "$parentdir/$_" && !/^\./ } (readdir DIR);
57
57
                closedir DIR;
58
58
        }