X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=dh_installudev;h=fa369a026d6286d3642adb8b3512394ed2c0bb24;hb=e2a6d4cec4a7ee952cf6a7f250d80f1d75a38f95;hp=0d38cf569bb87b3da3a237cb0facea8cbed5e219;hpb=cb472d35c35e560eb59e2b9b1cfe0111ee4b8ff1;p=debhelper.git

diff --git a/dh_installudev b/dh_installudev
index 0d38cf5..fa369a0 100755
--- a/dh_installudev
+++ b/dh_installudev
@@ -16,14 +16,21 @@ B<dh_installudev> [S<I<debhelper options>>] [B<-n>] [B<--name=>I<name>] [B<--pri
 
 =head1 DESCRIPTION
 
-dh_installudev is a debhelper program that is responsible for
-installing udev rules files.
+B<dh_installudev> is a debhelper program that is responsible for
+installing B<udev> rules files.
 
-Files named debian/package.udev will be installed in
-lib/udev/rules.d/ in the package build directory.
+Code is added to the F<preinst> and F<postinst> to handle the upgrade from the
+old B<udev> rules file location.
 
-Code is added to the preinst and postinst to handle the upgrade from the
-old udev rules file location.
+=head1 FILES
+
+=over 4
+
+=item debian/I<package>.udev
+
+Installed into F<lib/udev/rules.d/> in the package build directory.
+
+=back
 
 =head1 OPTIONS
 
@@ -31,17 +38,17 @@ old udev rules file location.
 
 =item B<--name=>I<name>
 
-When this parameter is used, dh_installudev looks for and
-installs files named debian/package.name.udev instead of the usual
-debian/package.udev.
+When this parameter is used, B<dh_installudev> looks for and
+installs files named debian/I<package>.I<name>.udev instead of the usual
+debian/I<package>.udev.
 
 =item B<--priority=>I<priority>
 
-Sets the priority string of the rules.d symlink. Default is 60.
+Sets the priority string of the F<rules.d> symlink. Default is 60.
 
 =item B<-n>, B<--noscripts>
 
-Do not modify postinst/postrm scripts.
+Do not modify F<preinst>/F<postinst> scripts.
 
 =back
 
@@ -82,6 +89,10 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 		$filename = "$package.udev";
 	}
 	$filename=~s/\.udev$/.rules/;
+	my $oldfilename=$filename;
+	if (defined $dh{NAME}) {
+		$filename="$dh{NAME}.rules";
+	}
 
 	if ($rules_file) {
 		if (! -e "$tmp/lib/udev/rules.d") {
@@ -93,7 +104,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
 			# Remove old rule from /etc, unless it's modified,
 			# in which case we rename it to match the new
 			# file in /lib, so it will override.
-			my $old="/etc/udev/rules.d/$old_priority$filename";
+			my $old="/etc/udev/rules.d/$old_priority$oldfilename";
 			$rule=~s/^\/lib/\/etc/;
 			autoscript($package,"preinst","preinst-moveconffile","s!#OLD#!$old!g;s!#NEW#!$rule!g;s!#PACKAGE#!$package!g");
 			autoscript($package,"postinst","postinst-moveconffile","s!#OLD#!$old!g;s!#NEW#!$rule!g");