diff -Nru debhelper-7.3.8/debian/changelog debhelper-7.3.8ubuntu1/debian/changelog --- debhelper-7.3.8/debian/changelog 2009-07-25 01:37:48.000000000 +0300 +++ debhelper-7.3.8ubuntu1/debian/changelog 2009-07-25 17:22:04.000000000 +0300 @@ -1,3 +1,14 @@ +debhelper (7.3.8ubuntu1) karmic; urgency=low + + * Merge with Debian unstable (LP: #404561). 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. + + -- أحمد المحمودي (Ahmed El-Mahmoudy) Sat, 25 Jul 2009 17:17:24 +0300 + debhelper (7.3.8) unstable; urgency=low * Fix t/override_target to use ./run. Closes: #538315 @@ -179,6 +190,19 @@ -- Joey Hess Wed, 10 Jun 2009 17:14:07 -0400 +debhelper (7.2.14ubuntu1) karmic; urgency=low + + * Merge with Debian unstable (lp: #379950). 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). + + -- Michael Bienia Sun, 24 May 2009 13:36:52 +0200 + debhelper (7.2.14) unstable; urgency=low * dh: Avoid writing log after override_dh_clean is run. Closes: #529228 @@ -233,6 +257,23 @@ -- Joey Hess Mon, 04 May 2009 14:46:53 -0400 +debhelper (7.2.8ubuntu1) karmic; urgency=low + + * 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. + + -- Martin Pitt Fri, 24 Apr 2009 19:22:46 +0200 + debhelper (7.2.8) unstable; urgency=low * dh_desktop: Now a deprecated no-op, since desktop-file-utils @@ -406,6 +447,42 @@ -- Joey Hess Fri, 27 Feb 2009 15:25:52 -0500 +debhelper (7.0.17ubuntu4) jaunty; urgency=low + + * dh_auto_install: add "--install-layout=deb" to setup.py install calls. + + -- Michael Bienia Mon, 09 Mar 2009 16:17:31 +0100 + +debhelper (7.0.17ubuntu3) jaunty; urgency=low + + * dh_installmodules: Install files to /etc/modprobe.d/*.conf, and move the + file from /etc/modprobe.d/* if it exists and is changed (otherwise + remove before upgrade). + + -- Scott James Remnant Thu, 05 Mar 2009 11:26:43 +0000 + +debhelper (7.0.17ubuntu2) jaunty; urgency=low + + * dh_installudev: Default priority is now 40 by default, and the target + directory is now /lib/udev/rules.d. Remove files from /etc/udev/rules.d + unless they are user modified; if modified and of default priority, + take care to rename. + + -- Scott James Remnant Tue, 06 Jan 2009 18:03:34 +0000 + +debhelper (7.0.17ubuntu1) jaunty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - 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. + * Stop discarding scrollkeeper-update output; this isn't needed now that + we use rarian-compat. + + -- Colin Watson Sun, 02 Nov 2008 21:54:56 +0000 + debhelper (7.0.17) unstable; urgency=low [ Per Olofsson ] diff -Nru debhelper-7.3.8/debian/control debhelper-7.3.8ubuntu1/debian/control --- debhelper-7.3.8/debian/control 2009-07-24 14:03:11.000000000 +0300 +++ debhelper-7.3.8ubuntu1/debian/control 2009-07-25 16:48:44.000000000 +0300 @@ -1,7 +1,8 @@ Source: debhelper Section: devel Priority: optional -Maintainer: Joey Hess +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Joey Hess Build-Depends: po4a (>= 0.24), man-db (>= 2.5.1), file (>= 3.23) Standards-Version: 3.8.2 Vcs-Git: git://git.debian.org/git/debhelper/debhelper.git diff -Nru debhelper-7.3.8/dh_installudev debhelper-7.3.8ubuntu1/dh_installudev --- debhelper-7.3.8/dh_installudev 2009-05-14 21:23:40.000000000 +0300 +++ debhelper-7.3.8ubuntu1/dh_installudev 2009-07-25 16:48:44.000000000 +0300 @@ -20,7 +20,7 @@ installing udev rules files. Files named debian/package.udev will be installed in -etc/udev/rules.d/ in the package build directory. +lib/udev/rules.d/ in the package build directory. Code is added to the preinst and postinst to handle the upgrade from the old udev rules file location. @@ -37,7 +37,8 @@ =item B<--priority=>I -Sets the priority string of the rules.d symlink. Default is z60. +Sets the priority string of the filename. Default is 40. +See /lib/udev/rules.d/README to identify the appropriate priority. =item B<-n>, B<--noscripts> @@ -55,11 +56,13 @@ init(); +my $default=0; if (! defined $dh{PRIORITY}) { - $dh{PRIORITY}="z60"; + $dh{PRIORITY}="40"; + $default=1; } if ($dh{PRIORITY}) { - $dh{PRIORITY}.="_"; + $dh{PRIORITY}.="-"; } foreach my $package (@{$dh{DOPACKAGES}}) { @@ -72,16 +75,29 @@ $filename=~s/\.udev$/.rules/; if ($rules_file) { - if (! -e "$tmp/etc/udev/rules.d") { - doit("install","-d","$tmp/etc/udev/rules.d"); + if (! -e "$tmp/lib/udev/rules.d") { + doit("install","-d","$tmp/lib/udev/rules.d"); } - doit("install","-m","0644",$rules_file,"$tmp/etc/udev/rules.d/$dh{PRIORITY}$filename"); + doit("install","-m","0644",$rules_file,"$tmp/lib/udev/rules.d/$dh{PRIORITY}$filename"); if (! $dh{NOSCRIPTS}) { my $old="/etc/udev/$filename"; my $rule="/etc/udev/rules.d/$dh{PRIORITY}$filename"; autoscript($package,"preinst","preinst-moveconffile","s!#OLD#!$old!g;s!#PACKAGE#!$package!g"); autoscript($package,"postinst","postinst-moveconffile","s!#OLD#!$old!g;s!#NEW#!$rule!g"); autoscript($package,"preinst","preinst-udev","s!#RULE#!$rule!g"); + + # Remove old rule from /etc, unless it's modified, + # in which case we leave it (or rename it) + if ($default) { + $old="/etc/udev/rules.d/50-$filename"; + } else { + $old="/etc/udev/rules.d/$dh{PRIORITY}$filename"; + } + autoscript($package,"preinst","preinst-moveconffile","s!#OLD#!$old!g;s!#NEW#!$rule!g;s!#PACKAGE#!$package!g"); + if ($default) { + autoscript($package,"postinst","postinst-moveconffile","s!#OLD#!$old!g;s!#NEW#!$rule!g"); + } + } } }