← Back to branch summary

~bzr/ubuntu/hardy/debhelper/builddeps-ppa

« back to all changes in this revision

Viewing changes to dh_installmodules

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2009-04-24 19:22:46 UTC
  • Revision ID: james.westby@ubuntu.com-20090424192246-ytzyl3azu8bosewc
Tags: 7.2.8ubuntu1
* Merge with Debian unstable. Remaining Ubuntu changes:
  - dh_installudev: Default priority is now 40 by default, the target
    directory is /lib/udev/rules.d, and rules use '-' as separator instead of
    '_'.  Remove files from /etc/udev/rules.d unless they are user modified;
    if modified and of default priority, take care to rename.
    This should eventually go to Debian as well, see Debian #491117.
  - dh_auto_install: add "--install-layout=deb" to setup.py install calls
    (new Python 2.6 policy).
* dh_installxfonts: Drop versioned dependency for xfonts-utils. This
  was only necessary for dapper backports, but since dapper desktop goes
  EOL in two months, and we haven't done dapper backports in ages, this is
  just an unnecessary delta.

Show diffs side-by-side

added added

removed removed

Lines of Context:
dh_installmodules
106
106
                if (! -e "$tmp/etc/modprobe.d") {
107
107
                        doit("install","-d","$tmp/etc/modprobe.d");
108
108
                }
109
 
                doit("install","-m","0644",$modprobe_file,"$tmp/etc/modprobe.d/".pkgfilename($package).".conf");
 
109
                my $old="/etc/modprobe.d/".pkgfilename($package);
 
110
                my $new=$old.".conf";
 
111
                doit("install","-m","0644",$modprobe_file,"$tmp/$new");
 
112
                autoscript($package,"preinst","preinst-moveconffile","s!#OLD#!$old!g;s!#PACKAGE#!$package!g");
 
113
                autoscript($package,"postinst","postinst-moveconffile","s!#OLD#!$old!g;s!#NEW#!$new!g");
110
114
        }
111
115
        
112
116
        if (! $dh{NOSCRIPTS}) {
113
 
                my $old="/etc/modprobe.d/".pkgfilename($package);
114
 
                my $new="/etc/modprobe.d/".pkgfilename($package).".conf";
115
 
 
116
 
                autoscript($package,"preinst","preinst-modules-preserve","s!#OLD#!$old!g;s!#NEW#!$new!g;s!#PACKAGE#!$package!g");
117
 
                autoscript($package,"postinst","postinst-modules-preserve","s!#OLD#!$old!g;s!#NEW#!$new!g;s!#PACKAGE#!$package!g");
118
 
 
119
117
                foreach my $kvers (find_kernel_modules("$tmp/lib/modules")) {
120
118
                        autoscript($package,"postinst","postinst-modules","s/#KVERS#/$kvers/g");
121
119
                        autoscript($package,"postrm","postrm-modules","s/#KVERS#/$kvers/g");