[debhelper-devel] Ubuntu (new upstream) debhelper 9.20131227ubuntu1
Ubuntu Merge-o-Matic
mom at ubuntu.com
Wed Feb 19 16:13:13 UTC 2014
This e-mail has been sent due to an upload to Ubuntu of a new upstream
version which still contains Ubuntu changes. It contains the difference
between the Ubuntu version and the equivalent base version in Debian, note
that this difference may include the upstream changes.
-------------- next part --------------
Format: 1.8
Date: Wed, 19 Feb 2014 14:18:57 +0000
Source: debhelper
Binary: debhelper
Architecture: source
Version: 9.20131227ubuntu1
Distribution: trusty
Urgency: medium
Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
Changed-By: Dimitri John Ledkov <xnox at ubuntu.com>
Description:
debhelper - helper programs for debian/rules
Closes: 701233 717505 731723
Changes:
debhelper (9.20131227ubuntu1) trusty; urgency=medium
.
* Resynchronise with Debian. Remaining changes:
- Depend on dh-apparmor.
- dh_installinit, autoscripts/postinst-upstart-replace: Prefer upstart
jobs where they exist.
- autoscripts/preinst-upstart-compatibility: Handle upgrades from older
versions that created the /lib/init/upstart-job symlink.
- autoscripts/postinst-init*: Only call update-rc.d when there's no
upstart job.
- autoscripts/*-init*: Test for /etc/init/*.conf where necessary.
- dh_installinit: Add no-op --upstart-only option for compatibility.
- dh_installudev: Change default rules.d symlink priority to 40.
- dh_installchangelogs: Do not install upstream changelog in compat
level 7. This floods packages with huge upstream changelogs which
take precious CD space.
- preserve the change that adds versioned dependency on sysv-rc to
support precise->trusty upgrades.
.
debhelper (9.20131227) unstable; urgency=medium
.
[ Guillem Jover ]
* dh_shlibdeps: Use new dpkg-shlibdeps -l option instead of LD_LIBRARY_PATH
Closes: #717505
* Depend on dpkg-dev (>= 1.17.0), the version that introduced
dpkg-shlibdeps -l option.
.
debhelper (9.20131213) unstable; urgency=low
.
[ Joey Hess ]
* cmake: Configure with -DCMAKE_BUILD_TYPE=None
Closes: #701233
.
[ Andreas Beckmann ]
* dh_installdeb: Add support for dpkg-maintscript-helper commands
symlink_to_dir and dir_to_symlink that were added in dpkg 1.17.2.
Closes: #731723
Checksums-Sha1:
2da74239a5fdeb318550a3eca0f9c64887d2e8ba 1750 debhelper_9.20131227ubuntu1.dsc
22370faf737e9bc85779a187f11141af794ea6bf 481326 debhelper_9.20131227ubuntu1.tar.gz
Checksums-Sha256:
5d9123706956442c3f166c53bb8325e23d053fba1fa25cd6a6c5887986f77570 1750 debhelper_9.20131227ubuntu1.dsc
24ceafbc38441e87f08e70131f54639fbcf50da838f6dd1e27e37aba639dc940 481326 debhelper_9.20131227ubuntu1.tar.gz
Files:
8bf1be80ddd1260d22292eecb6120230 1750 devel optional debhelper_9.20131227ubuntu1.dsc
b618681284446a09ceac6cbd144f5584 481326 devel optional debhelper_9.20131227ubuntu1.tar.gz
Original-Maintainer: Debhelper Maintainers <debhelper-devel at lists.alioth.debian.org>
-------------- next part --------------
diff -pruN 9.20131227/autoscripts/postinst-init 9.20131227ubuntu1/autoscripts/postinst-init
--- 9.20131227/autoscripts/postinst-init 2013-09-03 18:44:37.000000000 +0000
+++ 9.20131227ubuntu1/autoscripts/postinst-init 2013-07-01 11:34:53.000000000 +0000
@@ -1,4 +1,6 @@
-if [ -x "/etc/init.d/#SCRIPT#" ]; then
- update-rc.d #SCRIPT# #INITPARMS# >/dev/null
+if [ -x "/etc/init.d/#SCRIPT#" ] || [ -e "/etc/init/#SCRIPT#.conf" ]; then
+ if [ ! -e "/etc/init/#SCRIPT#.conf" ]; then
+ update-rc.d #SCRIPT# #INITPARMS# >/dev/null
+ fi
invoke-rc.d #SCRIPT# start || #ERROR_HANDLER#
fi
diff -pruN 9.20131227/autoscripts/postinst-init-nostart 9.20131227ubuntu1/autoscripts/postinst-init-nostart
--- 9.20131227/autoscripts/postinst-init-nostart 2013-09-03 18:44:37.000000000 +0000
+++ 9.20131227ubuntu1/autoscripts/postinst-init-nostart 2013-07-01 11:34:53.000000000 +0000
@@ -1,3 +1,5 @@
if [ -x "/etc/init.d/#SCRIPT#" ]; then
- update-rc.d #SCRIPT# #INITPARMS# >/dev/null || #ERROR_HANDLER#
+ if [ ! -e "/etc/init/#SCRIPT#.conf" ]; then
+ update-rc.d #SCRIPT# #INITPARMS# >/dev/null
+ fi
fi
diff -pruN 9.20131227/autoscripts/postinst-init-restart 9.20131227ubuntu1/autoscripts/postinst-init-restart
--- 9.20131227/autoscripts/postinst-init-restart 2013-09-03 18:44:37.000000000 +0000
+++ 9.20131227ubuntu1/autoscripts/postinst-init-restart 2013-07-01 11:34:53.000000000 +0000
@@ -1,5 +1,7 @@
-if [ -x "/etc/init.d/#SCRIPT#" ]; then
- update-rc.d #SCRIPT# #INITPARMS# >/dev/null
+if [ -x "/etc/init.d/#SCRIPT#" ] || [ -e "/etc/init/#SCRIPT#.conf" ]; then
+ if [ ! -e "/etc/init/#SCRIPT#.conf" ]; then
+ update-rc.d #SCRIPT# #INITPARMS# >/dev/null
+ fi
if [ -n "$2" ]; then
_dh_action=restart
else
diff -pruN 9.20131227/autoscripts/postinst-upstart-replace 9.20131227ubuntu1/autoscripts/postinst-upstart-replace
--- 9.20131227/autoscripts/postinst-upstart-replace 1970-01-01 00:00:00.000000000 +0000
+++ 9.20131227ubuntu1/autoscripts/postinst-upstart-replace 2013-07-01 11:34:53.000000000 +0000
@@ -0,0 +1 @@
+update-rc.d -f #SCRIPT# remove >/dev/null || #ERROR_HANDLER#
diff -pruN 9.20131227/autoscripts/preinst-upstart-compatibility 9.20131227ubuntu1/autoscripts/preinst-upstart-compatibility
--- 9.20131227/autoscripts/preinst-upstart-compatibility 1970-01-01 00:00:00.000000000 +0000
+++ 9.20131227ubuntu1/autoscripts/preinst-upstart-compatibility 2013-07-01 11:34:53.000000000 +0000
@@ -0,0 +1,7 @@
+if [ "$1" = install ] || [ "$1" = upgrade ]; then
+ if [ -e "#OLD#" ] && [ -L "#OLD#" ] \
+ && [ $(readlink -f "#OLD#") = /lib/init/upstart-job ]
+ then
+ rm -f "#OLD#"
+ fi
+fi
diff -pruN 9.20131227/autoscripts/prerm-init 9.20131227ubuntu1/autoscripts/prerm-init
--- 9.20131227/autoscripts/prerm-init 2013-09-03 18:44:37.000000000 +0000
+++ 9.20131227ubuntu1/autoscripts/prerm-init 2013-07-01 11:34:53.000000000 +0000
@@ -1,3 +1,3 @@
-if [ -x "/etc/init.d/#SCRIPT#" ]; then
+if [ -x "/etc/init.d/#SCRIPT#" ] || [ -e "/etc/init/#SCRIPT#.conf" ]; then
invoke-rc.d #SCRIPT# stop || #ERROR_HANDLER#
fi
diff -pruN 9.20131227/autoscripts/prerm-init-norestart 9.20131227ubuntu1/autoscripts/prerm-init-norestart
--- 9.20131227/autoscripts/prerm-init-norestart 2013-09-03 18:44:37.000000000 +0000
+++ 9.20131227ubuntu1/autoscripts/prerm-init-norestart 2013-07-01 11:34:53.000000000 +0000
@@ -1,3 +1,4 @@
-if [ -x "/etc/init.d/#SCRIPT#" ] && [ "$1" = remove ]; then
+if ([ -x "/etc/init.d/#SCRIPT#" ] || [ -e "/etc/init/#SCRIPT#.conf" ]) && \
+ [ "$1" = remove ]; then
invoke-rc.d #SCRIPT# stop || #ERROR_HANDLER#
fi
diff -pruN 9.20131227/debian/changelog 9.20131227ubuntu1/debian/changelog
--- 9.20131227/debian/changelog 2013-12-28 01:53:40.000000000 +0000
+++ 9.20131227ubuntu1/debian/changelog 2014-02-19 14:18:57.000000000 +0000
@@ -1,3 +1,24 @@
+debhelper (9.20131227ubuntu1) trusty; urgency=medium
+
+ * Resynchronise with Debian. Remaining changes:
+ - Depend on dh-apparmor.
+ - dh_installinit, autoscripts/postinst-upstart-replace: Prefer upstart
+ jobs where they exist.
+ - autoscripts/preinst-upstart-compatibility: Handle upgrades from older
+ versions that created the /lib/init/upstart-job symlink.
+ - autoscripts/postinst-init*: Only call update-rc.d when there's no
+ upstart job.
+ - autoscripts/*-init*: Test for /etc/init/*.conf where necessary.
+ - dh_installinit: Add no-op --upstart-only option for compatibility.
+ - dh_installudev: Change default rules.d symlink priority to 40.
+ - dh_installchangelogs: Do not install upstream changelog in compat
+ level 7. This floods packages with huge upstream changelogs which
+ take precious CD space.
+ - preserve the change that adds versioned dependency on sysv-rc to
+ support precise->trusty upgrades.
+
+ -- Dimitri John Ledkov <xnox at ubuntu.com> Wed, 19 Feb 2014 14:18:57 +0000
+
debhelper (9.20131227) unstable; urgency=medium
[ Guillem Jover ]
@@ -21,6 +42,34 @@ debhelper (9.20131213) unstable; urgency
-- Joey Hess <joeyh at debian.org> Fri, 13 Dec 2013 14:46:26 -0400
+debhelper (9.20131127ubuntu2) trusty; urgency=low
+
+ * Revert 9.20131110
+ * Additional changes:
+ - preserve the change that adds versioned dependency on sysv-rc to
+ support precise->trusty upgrades.
+
+ -- Dimitri John Ledkov <xnox at ubuntu.com> Mon, 09 Dec 2013 17:13:25 +0000
+
+debhelper (9.20131127ubuntu1) trusty; urgency=low
+
+ * Resynchronise with Debian. Remaining changes:
+ - Depend on dh-apparmor.
+ - dh_installinit, autoscripts/postinst-upstart-replace: Prefer upstart
+ jobs where they exist.
+ - autoscripts/preinst-upstart-compatibility: Handle upgrades from older
+ versions that created the /lib/init/upstart-job symlink.
+ - autoscripts/postinst-init*: Only call update-rc.d when there's no
+ upstart job.
+ - autoscripts/*-init*: Test for /etc/init/*.conf where necessary.
+ - dh_installinit: Add no-op --upstart-only option for compatibility.
+ - dh_installudev: Change default rules.d symlink priority to 40.
+ - dh_installchangelogs: Do not install upstream changelog in compat
+ level 7. This floods packages with huge upstream changelogs which
+ take precious CD space.
+
+ -- Dmitrijs Ledkovs <xnox at ubuntu.com> Mon, 09 Dec 2013 12:06:22 +0000
+
debhelper (9.20131127) unstable; urgency=low
* dh_compress: Exclude several more compressed file formats.
@@ -65,6 +114,25 @@ debhelper (9.20131104) unstable; urgency
-- Joey Hess <joeyh at debian.org> Mon, 04 Nov 2013 15:34:21 -0400
+debhelper (9.20130921ubuntu1) trusty; urgency=low
+
+ * Resynchronise with Debian. Remaining changes:
+ - Depend on dh-apparmor.
+ - dh_installinit, autoscripts/postinst-upstart-replace: Prefer upstart
+ jobs where they exist.
+ - autoscripts/preinst-upstart-compatibility: Handle upgrades from older
+ versions that created the /lib/init/upstart-job symlink.
+ - autoscripts/postinst-init*: Only call update-rc.d when there's no
+ upstart job.
+ - autoscripts/*-init*: Test for /etc/init/*.conf where necessary.
+ - dh_installinit: Add no-op --upstart-only option for compatibility.
+ - dh_installudev: Change default rules.d symlink priority to 40.
+ - dh_installchangelogs: Do not install upstream changelog in compat
+ level 7. This floods packages with huge upstream changelogs which
+ take precious CD space.
+
+ -- Colin Watson <cjwatson at ubuntu.com> Mon, 21 Oct 2013 09:28:05 +0100
+
debhelper (9.20130921) unstable; urgency=low
* dh: Call dh_installxfonts after dh_link, so that it will
@@ -95,6 +163,25 @@ debhelper (9.20130720) unstable; urgency
-- Joey Hess <joeyh at debian.org> Tue, 20 Aug 2013 12:46:25 -0400
+debhelper (9.20130630ubuntu1) saucy; urgency=low
+
+ * Resynchronise with Debian. Remaining changes:
+ - Depend on dh-apparmor.
+ - dh_installinit, autoscripts/postinst-upstart-replace: Prefer upstart
+ jobs where they exist.
+ - autoscripts/preinst-upstart-compatibility: Handle upgrades from older
+ versions that created the /lib/init/upstart-job symlink.
+ - autoscripts/postinst-init*: Only call update-rc.d when there's no
+ upstart job.
+ - autoscripts/*-init*: Test for /etc/init/*.conf where necessary.
+ - dh_installinit: Add no-op --upstart-only option for compatibility.
+ - dh_installudev: Change default rules.d symlink priority to 40.
+ - dh_installchangelogs: Do not install upstream changelog in compat
+ level 7. This floods packages with huge upstream changelogs which
+ take precious CD space.
+
+ -- Colin Watson <cjwatson at ubuntu.com> Mon, 01 Jul 2013 11:20:37 +0100
+
debhelper (9.20130630) unstable; urgency=low
* perl_build: Use -- long option names, for compatibility with
@@ -103,6 +190,25 @@ debhelper (9.20130630) unstable; urgency
-- Joey Hess <joeyh at debian.org> Sun, 30 Jun 2013 14:20:51 -0400
+debhelper (9.20130626ubuntu1) saucy; urgency=low
+
+ * Resynchronise with Debian. Remaining changes:
+ - Depend on dh-apparmor.
+ - dh_installinit, autoscripts/postinst-upstart-replace: Prefer upstart
+ jobs where they exist.
+ - autoscripts/preinst-upstart-compatibility: Handle upgrades from older
+ versions that created the /lib/init/upstart-job symlink.
+ - autoscripts/postinst-init*: Only call update-rc.d when there's no
+ upstart job.
+ - autoscripts/*-init*: Test for /etc/init/*.conf where necessary.
+ - dh_installinit: Add no-op --upstart-only option for compatibility.
+ - dh_installudev: Change default rules.d symlink priority to 40.
+ - dh_installchangelogs: Do not install upstream changelog in compat
+ level 7. This floods packages with huge upstream changelogs which
+ take precious CD space.
+
+ -- Colin Watson <cjwatson at ubuntu.com> Thu, 27 Jun 2013 12:59:50 +0100
+
debhelper (9.20130626) unstable; urgency=low
* dh_strip: Run readelf in C locale. Closes: #714187
@@ -126,6 +232,25 @@ debhelper (9.20130605) unstable; urgency
-- Joey Hess <joeyh at debian.org> Wed, 05 Jun 2013 12:28:51 -0400
+debhelper (9.20130604ubuntu1) saucy; urgency=low
+
+ * Resynchronise with Debian. Remaining changes:
+ - Depend on dh-apparmor.
+ - dh_installinit, autoscripts/postinst-upstart-replace: Prefer upstart
+ jobs where they exist.
+ - autoscripts/preinst-upstart-compatibility: Handle upgrades from older
+ versions that created the /lib/init/upstart-job symlink.
+ - autoscripts/postinst-init*: Only call update-rc.d when there's no
+ upstart job.
+ - autoscripts/*-init*: Test for /etc/init/*.conf where necessary.
+ - dh_installinit: Add no-op --upstart-only option for compatibility.
+ - dh_installudev: Change default rules.d symlink priority to 40.
+ - dh_installchangelogs: Do not install upstream changelog in compat
+ level 7. This floods packages with huge upstream changelogs which
+ take precious CD space.
+
+ -- Colin Watson <cjwatson at ubuntu.com> Wed, 05 Jun 2013 11:00:43 +0100
+
debhelper (9.20130604) unstable; urgency=low
* dh_installchangelogs: No longer automatically converts html changelogs.
@@ -142,6 +267,25 @@ debhelper (9.20130604) unstable; urgency
-- Joey Hess <joeyh at debian.org> Tue, 04 Jun 2013 11:27:29 -0400
+debhelper (9.20130518ubuntu1) saucy; urgency=low
+
+ * Resynchronise with Debian. Remaining changes:
+ - Depend on dh-apparmor.
+ - dh_installinit, autoscripts/postinst-upstart-replace: Prefer upstart
+ jobs where they exist.
+ - autoscripts/preinst-upstart-compatibility: Handle upgrades from older
+ versions that created the /lib/init/upstart-job symlink.
+ - autoscripts/postinst-init*: Only call update-rc.d when there's no
+ upstart job.
+ - autoscripts/*-init*: Test for /etc/init/*.conf where necessary.
+ - dh_installinit: Add no-op --upstart-only option for compatibility.
+ - dh_installudev: Change default rules.d symlink priority to 40.
+ - dh_installchangelogs: Do not install upstream changelog in compat
+ level 7. This floods packages with huge upstream changelogs which
+ take precious CD space.
+
+ -- Colin Watson <cjwatson at ubuntu.com> Tue, 04 Jun 2013 11:46:28 +0100
+
debhelper (9.20130518) unstable; urgency=low
* dh_installchangelogs: Write the changelog entry used for a binNMU,
@@ -233,6 +377,44 @@ debhelper (9.20130504) unstable; urgency
-- Joey Hess <joeyh at debian.org> Sat, 04 May 2013 23:32:27 -0400
+debhelper (9.20120909ubuntu3) saucy; urgency=low
+
+ * Now that we no longer create /lib/init/upstart-job symlinks, fix the
+ init-related autoscript fragments to also test for /etc/init/*.conf
+ where necessary (LP: #1183807).
+
+ -- Colin Watson <cjwatson at ubuntu.com> Fri, 24 May 2013 15:46:20 +0100
+
+debhelper (9.20120909ubuntu2) saucy; urgency=low
+
+ * Align upstart job handling with upstream debhelper: install both init
+ scripts and upstart jobs, and rely on the policy layer in invoke-rc.d
+ and our handling of update-rc.d to give the right behavior.
+ * Drops preinst-removeconffile, introduces preinst-upstart-compatibility
+ in its place.
+
+ -- Steve Langasek <steve.langasek at ubuntu.com> Sat, 18 May 2013 18:20:03 -0500
+
+debhelper (9.20120909ubuntu1) raring; urgency=low
+
+ * Merge from Debian unstable, remaining changes:
+ - Depend on dh-apparmor.
+ - dh_installinit: Add --upstart-only and --onlyscripts-upstart modes.
+ - continue to use /lib/init/upstart-job symlinks in Ubuntu, since
+ insserv is not yet usable with upstart.
+ - Add autoscripts for above: postinst-upstart-replace,
+ preinst-removeconffile.
+ - autoscripts/postinst-init, autoscripts/postinst-init-restart: Only
+ call update-rc.d when there's no upstart job.
+ - autoscripts/postinst-init-nostart: also handle the upstart case;
+ otherwise we call update-rc.d to add, and again to remove!
+ - dh_installudev: Change default init.d symlink priority to 40.
+ - dh_installchangelogs: Do not install upstream changelog in compat
+ level 7. This floods packages with huge upstream changelogs which
+ take precious CD space.
+
+ -- Adam Conrad <adconrad at ubuntu.com> Wed, 07 Nov 2012 13:12:10 -0700
+
debhelper (9.20120909) unstable; urgency=low
* autoscript() can now be passed a perl sub to run to s/// lines of
@@ -255,6 +437,29 @@ debhelper (9.20120830) unstable; urgency
-- Joey Hess <joeyh at debian.org> Thu, 30 Aug 2012 11:04:10 -0400
+debhelper (9.20120608ubuntu1) quantal; urgency=low
+
+ * Merge from Debian unstable, remaining changes:
+ - Depend on dh-apparmor.
+ - dh_installinit: Add --upstart-only and --onlyscripts-upstart modes.
+ - continue to use /lib/init/upstart-job symlinks in Ubuntu, since
+ insserv is not yet usable with upstart.
+ - Add autoscripts for above: postinst-upstart-replace,
+ preinst-removeconffile.
+ - autoscripts/postinst-init, autoscripts/postinst-init-restart: Only
+ call update-rc.d when there's no upstart job.
+ - autoscripts/postinst-init-nostart: also handle the upstart case;
+ otherwise we call update-rc.d to add, and again to remove!
+ - dh_installudev: Change default init.d symlink priority to 40.
+ - dh_installchangelogs: Do not install upstream changelog in compat
+ level 7. This floods packages with huge upstream changelogs which
+ take precious CD space.
+ * Dropped changes, superseded in Debian:
+ - Mark debhelper Multi-Arch: foreign, so it's recognized as satisfying
+ cross-dependencies and cross-build-dependencies.
+
+ -- Adam Conrad <adconrad at ubuntu.com> Tue, 19 Jun 2012 14:25:04 -0600
+
debhelper (9.20120608) unstable; urgency=low
* dh: When there's an -indep override target without -arch, or vice versa,
@@ -305,6 +510,39 @@ debhelper (9.20120509) unstable; urgency
-- Joey Hess <joeyh at debian.org> Wed, 09 May 2012 12:59:15 -0400
+debhelper (9.20120419ubuntu2) quantal; urgency=low
+
+ * dh_installinit: drop the --onlyscripts-upstart option, which was only
+ used temporarily for compatibility with some packages in karmic.
+
+ -- Steve Langasek <steve.langasek at ubuntu.com> Sun, 29 Apr 2012 09:58:05 -0700
+
+debhelper (9.20120419ubuntu1) quantal; urgency=low
+
+ * Merge from Debian unstable, remaining changes:
+ - Depend on dh-apparmor.
+ - Mark debhelper Multi-Arch: foreign, so it's recognized as satisfying
+ cross-dependencies and cross-build-dependencies.
+ - dh_installinit: Add --upstart-only and --onlyscripts-upstart modes.
+ - continue to use /lib/init/upstart-job symlinks in Ubuntu, since
+ insserv is not yet usable with upstart.
+ - Add autoscripts for above: postinst-upstart-replace,
+ preinst-removeconffile.
+ - autoscripts/postinst-init, autoscripts/postinst-init-restart: Only
+ call update-rc.d when there's no upstart job.
+ - dh_installudev: Change default init.d symlink priority to 40.
+ - dh_installchangelogs: Do not install upstream changelog in compat
+ level 7. This floods packages with huge upstream changelogs which
+ take precious CD space.
+ * Dropped changes, superseded in Debian:
+ - autoscripts postinst-upstart, postinst-upstart-restart, prerm-upstart,
+ prerm-upstart-norestart dropped, the logic has merged into the main
+ autoscripts.
+ * autoscripts/postinst-init-nostart: also handle the upstart case;
+ otherwise we call update-rc.d to add, and again to remove!
+
+ -- Steve Langasek <steve.langasek at ubuntu.com> Sun, 29 Apr 2012 07:46:42 +0000
+
debhelper (9.20120419) unstable; urgency=low
* Fix compat level checking for cmake. Closes: #669181
@@ -372,6 +610,40 @@ debhelper (9.20120311) unstable; urgency
-- Joey Hess <joeyh at debian.org> Sun, 11 Mar 2012 18:28:33 -0400
+debhelper (9.20120115ubuntu3) precise; urgency=low
+
+ * remove dh_apparmor and corresponding autoscripts and adjust debian/control
+ to Depends on dh-apparmor. This can be dropped once all packages that use
+ dh_apparmor Build-Depends on dh-apparmor.
+
+ -- Jamie Strandboge <jamie at ubuntu.com> Fri, 02 Mar 2012 08:13:33 -0600
+
+debhelper (9.20120115ubuntu2) precise; urgency=low
+
+ * Make dh_apparmor executable again.
+
+ -- Colin Watson <cjwatson at ubuntu.com> Tue, 24 Jan 2012 00:12:27 +0000
+
+debhelper (9.20120115ubuntu1) precise; urgency=low
+
+ * Resynchronise with Debian. Remaining changes:
+ - Mark debhelper Multi-Arch: foreign, so it's recognized as satisfying
+ cross-dependencies and cross-build-dependencies.
+ - dh_installinit: Add --upstart-only and --onlyscripts-upstart modes.
+ - Add various autoscripts for above: postinst-upstart,
+ postinst-upstart-replace, postinst-upstart-restart, prerm-upstart,
+ prerm-upstart-norestart, preinst-removeconffile.
+ - autoscripts/postinst-init, autoscripts/postinst-init-restart: Only
+ call update-rc.d when there's no upstart job, which will let us get
+ rid of the separate postinst-upstart{,-restart} scripts.
+ - dh_installudev: Change default init.d symlink priority to 40.
+ - dh_installchangelogs: Do not install upstream changelog in compat
+ level 7. This floods packages with huge upstream changelogs which
+ take precious CD space.
+ - Add dh_apparmor and autoscripts.
+
+ -- Colin Watson <cjwatson at ubuntu.com> Mon, 23 Jan 2012 13:00:43 +0000
+
debhelper (9.20120115) unstable; urgency=low
* Finalized v9 mode, which is the new recommended default.
@@ -433,6 +705,29 @@ debhelper (8.9.10) unstable; urgency=low
-- Joey Hess <joeyh at debian.org> Wed, 16 Nov 2011 11:54:59 -0400
+debhelper (8.9.9ubuntu1) precise; urgency=low
+
+ * Merge from Debian testing, remaining changes:
+ - mark debhelper Multi-Arch: foreign, so it's recognized as satisfying
+ cross-dependencies and cross-build-dependencies.
+ - dh_installinit: Add --upstart-only and --onlyscripts-upstart modes.
+ - Add various autoscripts for above: postinst-upstart,
+ postinst-upstart-replace, postinst-upstart-restart,
+ prerm-upstart, prerm-upstart-norestart, preinst-removeconffile.
+ - autoscripts/postinst-init, autoscripts/postinst-init-restart: only
+ call update-rc.d when there's no upstart job, which will let us get
+ rid of the separate postinst-upstart{,-restart} scripts.
+ - dh_installudev: Change default init.d symlink priority to 40.
+ - dh_installchangelogs: Do not install upstream changelog in compat level
+ 7. This floods packages with huge upstream changelogs which take
+ precious CD space.
+ - add dh_apparmor and autoscripts
+ * Dropped changes:
+ - debian/rules: set executable bit for dh_apparmor: fix this in the
+ source tarball instead, like it's set for all other scripts.
+
+ -- Steve Langasek <steve.langasek at ubuntu.com> Wed, 16 Nov 2011 16:24:58 -0800
+
debhelper (8.9.9) unstable; urgency=low
* dh_auto_build: Use target architecture (not host architecture)
@@ -441,6 +736,34 @@ debhelper (8.9.9) unstable; urgency=low
-- Joey Hess <joeyh at debian.org> Fri, 04 Nov 2011 17:01:58 -0400
+debhelper (8.9.8ubuntu2) precise; urgency=low
+
+ * autoscripts/postinst-init, autoscripts/postinst-init-restart: only call
+ update-rc.d when there's no upstart job, letting us get rid of the
+ separate postinst-upstart{,-restart} scripts.
+ * mark debhelper Multi-Arch: foreign, so it's recognized as satisfying
+ cross-dependencies and cross-build-dependencies.
+
+ -- Steve Langasek <steve.langasek at ubuntu.com> Sat, 05 Nov 2011 00:41:42 -0400
+
+debhelper (8.9.8ubuntu1) precise; urgency=low
+
+ * Merge with Debian; remaining Ubuntu changes:
+ - dh_installinit: Add --upstart-only and --onlyscripts-upstart modes.
+ - Add various autoscripts for above: postinst-upstart,
+ postinst-upstart-replace, postinst-upstart-restart,
+ prerm-upstart, prerm-upstart-norestart, preinst-removeconffile.
+ - dh_installudev: Change default init.d symlink priority to 40.
+ - dh_installchangelogs: Do not install upstream changelog in compat level
+ 7. This floods packages with huge upstream changelogs which take
+ precious CD space.
+ - add dh_apparmor and autoscripts
+ - debian/rules: set executable bit for dh_apparmor before actually running
+ dh build, that is in order to get the manpage built for dh_apparmor.
+ - dh_installinit: drop redundant definition of -O.
+
+ -- Martin Pitt <martin.pitt at ubuntu.com> Tue, 11 Oct 2011 06:36:38 +0200
+
debhelper (8.9.8) unstable; urgency=low
* dh_fixperms: Operate on .ali files throughout /usr/lib, including
@@ -546,6 +869,26 @@ debhelper (8.9.1) unstable; urgency=low
-- Joey Hess <joeyh at debian.org> Sun, 17 Jul 2011 16:31:27 -0400
+debhelper (8.9.0ubuntu1) oneiric; urgency=low
+
+ * Merge with Debian (LP: #801884); remaining changes:
+ - dh_installinit: Add --upstart-only and --onlyscripts-upstart modes.
+ - Add various autoscripts for above: postinst-upstart,
+ postinst-upstart-replace, postinst-upstart-restart,
+ prerm-upstart, prerm-upstart-norestart, preinst-removeconffile.
+ - dh_installudev: Change default init.d symlink priority to 40.
+ - dh_installchangelogs: Do not install upstream changelog in compat level
+ 7. This floods packages with huge upstream changelogs which take
+ precious CD space.
+ - add dh_apparmor and autoscripts
+ - debian/rules: set executable bit for dh_apparmor before actually running
+ dh build, that is in order to get the manpage built for dh_apparmor.
+ - dh_installinit: drop redundant definition of -O.
+ - debian/control: dpkg-dev dependency needs to be on 1.16.0~ubuntu4 for
+ multiarch, not just 1.16.0~.
+
+ -- Ø£Øمد المØمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org> Sat, 02 Jul 2011 00:04:09 +0200
+
debhelper (8.9.0) unstable; urgency=low
* dh: In v9, any standard rules file targets, including build-arch,
@@ -568,6 +911,32 @@ debhelper (8.9.0) unstable; urgency=low
-- Joey Hess <joeyh at debian.org> Fri, 24 Jun 2011 14:28:52 -0400
+debhelper (8.1.6ubuntu2) oneiric; urgency=low
+
+ * dh_installinit: drop redundant definition of -O.
+ * debian/control: dpkg-dev dependency needs to be on 1.16.0~ubuntu4 for
+ multiarch, not just 1.16.0~.
+
+ -- Steve Langasek <steve.langasek at ubuntu.com> Fri, 20 May 2011 17:49:44 -0700
+
+debhelper (8.1.6ubuntu1) oneiric; urgency=low
+
+ * Merge with Debian (LP: #773932); remaining changes:
+ - dh_installinit: Add --upstart-only and --onlyscripts-upstart modes.
+ - Add various autoscripts for above: postinst-upstart,
+ postinst-upstart-replace, postinst-upstart-restart,
+ prerm-upstart, prerm-upstart-norestart, preinst-removeconffile.
+ - dh_installudev: Change default init.d symlink priority to 40.
+ - dh_installchangelogs: Do not install upstream changelog in compat level
+ 7. This floods packages with huge upstream changelogs which take
+ precious CD space.
+ - add dh_apparmor and autoscripts
+ - debian/rules: override build target to set executable bit for
+ dh_apparmor before actually running dh build, that is in order to get
+ the manpage built for dh_apparmor.
+
+ -- Ø£Øمد المØمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org> Thu, 28 Apr 2011 21:02:28 +0200
+
debhelper (8.1.6) unstable; urgency=low
* dh_ucf: Fix missing space before ']'s in postrm autoscript.
@@ -623,6 +992,60 @@ debhelper (8.1.3) unstable; urgency=low
-- Joey Hess <joeyh at debian.org> Tue, 05 Apr 2011 13:09:43 -0400
+debhelper (8.1.2ubuntu4) natty; urgency=low
+
+ * debhelper.pod: v9 info was added in the wrong place by mistake; move it
+ to where it belongs so the manpage reads sensibly again.
+
+ -- Steve Langasek <steve.langasek at ubuntu.com> Mon, 21 Mar 2011 15:59:12 -0700
+
+debhelper (8.1.2ubuntu3) natty; urgency=low
+
+ * Revert the patch for env variable expansion based on feedback from Joey
+ Hess. It appears this patch is not as far along the path to upstream
+ inclusion as I thought it was; sorry for the misunderstanding, Joey.
+
+ -- Steve Langasek <steve.langasek at ubuntu.com> Tue, 15 Mar 2011 13:12:50 -0700
+
+debhelper (8.1.2ubuntu2) natty; urgency=low
+
+ * multiarch support. FFe LP: #733501.
+ * merge changes from upstream git:
+ - Started work on Debhelper v9. It is still experimental, and more
+ changes may be added to that mode.
+ - Support multiarch in v9. Thanks, Steve Langasek. Closes: #617761
+ - dh_auto_configure: Support multiarch in v9 by passing multiarch
+ directories to --libdir and --libexecdir.
+ - dh_makeshlibs: Detect packages using multiarch directories and
+ make ${misc:Pre-Depends} expand to multiarch-support.
+ - Depend on dpkg-dev (>= 1.16.0) for multiarch support. Note to
+ backporters: If you remove that dependency, debhelper will fall back
+ to not doing multiarch stuff in v9 mode, which is probably what you
+ want.
+ * Add Daniel Silverstone's patch to give us env variable expansions in
+ .install/.link files, needed in order to let us use DEB_HOST_MULTIARCH
+ without cumbersome .in files everywhere. Closes: #614731.
+
+ -- Steve Langasek <steve.langasek at ubuntu.com> Mon, 14 Mar 2011 20:20:18 -0700
+
+debhelper (8.1.2ubuntu1) natty; urgency=low
+
+ * Merge with Debian (LP: #719150); remaining changes:
+ - dh_installinit: Add --upstart-only and --onlyscripts-upstart modes.
+ - Add various autoscripts for above: postinst-upstart,
+ postinst-upstart-replace, postinst-upstart-restart,
+ prerm-upstart, prerm-upstart-norestart, preinst-removeconffile.
+ - dh_installudev: Change default init.d symlink priority to 40.
+ - dh_installchangelogs: Do not install upstream changelog in compat level
+ 7. This floods packages with huge upstream changelogs which take
+ precious CD space.
+ - add dh_apparmor and autoscripts
+ - debian/rules: override build target to set executable bit for
+ dh_apparmor before actually running dh build, that is in order to get
+ the manpage built for dh_apparmor.
+
+ -- Ø£Øمد المØمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org> Tue, 15 Feb 2011 06:46:24 +0200
+
debhelper (8.1.2) unstable; urgency=low
* Fix logging at end of an override target that never actually runs
@@ -630,6 +1053,27 @@ debhelper (8.1.2) unstable; urgency=low
-- Joey Hess <joeyh at debian.org> Mon, 14 Feb 2011 14:22:17 -0400
+debhelper (8.1.1ubuntu1) natty; urgency=low
+
+ * Merge with Debian (LP: #716844); remaining changes:
+ - dh_installinit: Add --upstart-only and --onlyscripts-upstart modes.
+ - Add various autoscripts for above: postinst-upstart,
+ postinst-upstart-replace, postinst-upstart-restart,
+ prerm-upstart, prerm-upstart-norestart, preinst-removeconffile.
+ - dh_installudev: Change default init.d symlink priority to 40.
+ - dh_installchangelogs: Do not install upstream changelog in compat level
+ 7. This floods packages with huge upstream changelogs which take
+ precious CD space.
+ - add dh_apparmor and autoscripts
+ - debian/rules: override build target to set executable bit for
+ dh_apparmor before actually running dh build, that is in order to get
+ the manpage built for dh_apparmor.
+ * Dropped changes that got fixed upstream:
+ - dh_strip, dh_makeshlibs: use triplet-objdump, triplet-objcopy and
+ triplet-strip from cross-binutils when cross-compiling; Debian #412118.
+
+ -- Ø£Øمد المØمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org> Fri, 11 Feb 2011 06:38:43 +0200
+
debhelper (8.1.1) unstable; urgency=low
* dh_strip, dh_makeshlibs: use triplet-objdump, triplet-objcopy and
@@ -643,6 +1087,26 @@ debhelper (8.1.1) unstable; urgency=low
-- Joey Hess <joeyh at debian.org> Thu, 10 Feb 2011 19:58:34 -0400
+debhelper (8.1.0ubuntu1) natty; urgency=low
+
+ * Merge with Debian (LP: #714705); remaining changes:
+ - dh_installinit: Add --upstart-only and --onlyscripts-upstart modes.
+ - Add various autoscripts for above: postinst-upstart,
+ postinst-upstart-replace, postinst-upstart-restart,
+ prerm-upstart, prerm-upstart-norestart, preinst-removeconffile.
+ - dh_installudev: Change default init.d symlink priority to 40.
+ - dh_installchangelogs: Do not install upstream changelog in compat level
+ 7. This floods packages with huge upstream changelogs which take
+ precious CD space.
+ - dh_strip, dh_makeshlibs: use triplet-objdump, triplet-objcopy and
+ triplet-strip from cross-binutils when cross-compiling; Debian #412118.
+ - add dh_apparmor and autoscripts
+ - debian/rules: override build target to set executable bit for
+ dh_apparmor before actually running dh build, that is in order to get
+ the manpage built for dh_apparmor.
+
+ -- Ø£Øمد المØمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org> Mon, 07 Feb 2011 17:16:49 +0200
+
debhelper (8.1.0) unstable; urgency=low
[ Joey Hess ]
@@ -690,6 +1154,35 @@ debhelper (8.1.0) unstable; urgency=low
-- Joey Hess <joeyh at debian.org> Sat, 05 Feb 2011 12:00:04 -0400
+debhelper (8.0.0ubuntu2) natty; urgency=low
+
+ * autoscripts postinst-upstart, prerm-upstart, prerm-upstart-norestart
+ need to use invoke-rc.d instead of calling start/stop directly, so that
+ they're well-behaved in chroots and other places policy-rc.d may be used.
+ LP: #690640.
+
+ -- Steve Langasek <steve.langasek at ubuntu.com> Sun, 23 Jan 2011 12:38:00 -0800
+
+debhelper (8.0.0ubuntu1) maverick; urgency=low
+
+ * Merge with Debian (LP: #614787); remaining changes:
+ - dh_installinit: Add --upstart-only and --onlyscripts-upstart modes.
+ - Add various autoscripts for above: postinst-upstart,
+ postinst-upstart-replace, postinst-upstart-restart,
+ prerm-upstart, prerm-upstart-norestart, preinst-removeconffile.
+ - dh_installudev: Change default init.d symlink priority to 40.
+ - dh_installchangelogs: Do not install upstream changelog in compat level
+ 7. This floods packages with huge upstream changelogs which take
+ precious CD space.
+ - dh_strip, dh_makeshlibs: use triplet-objdump, triplet-objcopy and
+ triplet-strip from cross-binutils when cross-compiling; Debian #412118.
+ - add dh_apparmor and autoscripts
+ * debian/rules: override build target to set executable bit for dh_apparmor
+ before actually running dh build, that is in order to get the manpage
+ built for dh_apparmor.
+
+ -- Ø£Øمد المØمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org> Tue, 10 Aug 2010 12:45:25 +0300
+
debhelper (8.0.0) unstable; urgency=low
[ Carsten Hey ]
@@ -751,6 +1244,55 @@ debhelper (7.9.1) unstable; urgency=low
-- Joey Hess <joeyh at debian.org> Wed, 16 Jun 2010 13:44:48 -0400
+debhelper (7.4.20ubuntu6) maverick; urgency=low
+
+ * autoscripts/postinst-apparmor: don't 'echo' to stdout. As nice as it
+ looks, it doesn't play well with debconf and isn't translated. Thanks
+ to dhcp3 for pointing this out.
+
+ -- Jamie Strandboge <jamie at ubuntu.com> Fri, 06 Aug 2010 17:11:13 -0500
+
+debhelper (7.4.20ubuntu5) maverick; urgency=low
+
+ * autoscripts/postinst-apparmor:
+ - tweak logic slightly to be more efficient and add some comments
+ - chmod 644 the local include file
+ * dh_apparmor: add note about using -p
+
+ -- Jamie Strandboge <jamie at ubuntu.com> Fri, 06 Aug 2010 12:04:08 -0500
+
+debhelper (7.4.20ubuntu4) maverick; urgency=low
+
+ * add dh_apparmor and autoscripts
+
+ -- Jamie Strandboge <jamie at ubuntu.com> Fri, 06 Aug 2010 08:32:41 -0500
+
+debhelper (7.4.20ubuntu3) maverick; urgency=low
+
+ * dh_strip, dh_makeshlibs: use triplet-objdump, triplet-objcopy and
+ triplet-strip from cross-binutils when cross-compiling; Debian #412118.
+
+ -- Loïc Minier <loic.minier at ubuntu.com> Tue, 03 Aug 2010 16:36:12 -0400
+
+debhelper (7.4.20ubuntu2) maverick; urgency=low
+
+ * dh_installchangelogs: Do not install upstream changelog in compat level 7.
+ This floods packages with huge upstream changelogs which take precious CD
+ space.
+
+ -- Martin Pitt <martin.pitt at ubuntu.com> Sun, 01 Aug 2010 21:07:12 +0200
+
+debhelper (7.4.20ubuntu1) maverick; urgency=low
+
+ * Merge with Debian (LP: #583352); remaining changes:
+ - dh_installinit: Add --upstart-only and --onlyscripts-upstart modes.
+ - Add various autoscripts for above: postinst-upstart,
+ postinst-upstart-replace, postinst-upstart-restart,
+ prerm-upstart, prerm-upstart-norestart, preinst-removeconffile.
+ - dh_installudev: Change default init.d symlink priority to 40.
+
+ -- Ø£Øمد المØمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org> Thu, 20 May 2010 14:37:56 +0300
+
debhelper (7.4.20) unstable; urgency=low
* Drop one more call to dpkg-architecture. Closes: #580837
@@ -762,6 +1304,21 @@ debhelper (7.4.20) unstable; urgency=low
-- Joey Hess <joeyh at debian.org> Wed, 12 May 2010 20:06:02 -0400
+debhelper (7.4.19ubuntu1) maverick; urgency=low
+
+ * Merge with Debian; remaining changes:
+ - dh_installinit: Add --upstart-only and --onlyscripts-upstart modes.
+ - Add various autoscripts for above: postinst-upstart,
+ postinst-upstart-replace, postinst-upstart-restart,
+ prerm-upstart, prerm-upstart-norestart, preinst-removeconffile.
+ - dh_installudev: Change default init.d symlink priority to 40.
+ * dh_installudev: Drop conffile migration code, it was only needed until
+ lucid.
+ * dh_gconf: Temporarily lower generated gconf dependency to a version which
+ we actually have.
+
+ -- Martin Pitt <martin.pitt at ubuntu.com> Mon, 03 May 2010 11:22:01 +0200
+
debhelper (7.4.19) unstable; urgency=low
* Memoize architecture comparisons in samearch, and avoid calling
@@ -808,6 +1365,18 @@ debhelper (7.4.16) unstable; urgency=low
-- Joey Hess <joeyh at debian.org> Tue, 06 Apr 2010 22:06:50 -0400
+debhelper (7.4.15ubuntu1) lucid; urgency=low
+
+ * Resynchronise with Debian. Remaining changes:
+ - dh_installinit: Add --upstart-only and --onlyscripts-upstart modes.
+ - Add various autoscripts for above: postinst-upstart,
+ postinst-upstart-replace, postinst-upstart-restart,
+ prerm-upstart, prerm-upstart-norestart, preinst-removeconffile.
+ - dh_installudev: Handle conffile migration from old Ubuntu defaults
+ (needed until after the next LTS release).
+
+ -- Colin Watson <cjwatson at ubuntu.com> Mon, 22 Feb 2010 12:46:04 +0000
+
debhelper (7.4.15) unstable; urgency=low
* The fix for #563557 caused some new trouble involving makefile
@@ -823,6 +1392,18 @@ debhelper (7.4.14) unstable; urgency=low
-- Joey Hess <joeyh at debian.org> Tue, 16 Feb 2010 14:47:10 -0500
+debhelper (7.4.13ubuntu1) lucid; urgency=low
+
+ * Resynchronise with Debian. Remaining changes:
+ - dh_installinit: Add --upstart-only and --onlyscripts-upstart modes.
+ - Add various autoscripts for above: postinst-upstart,
+ postinst-upstart-replace, postinst-upstart-restart,
+ prerm-upstart, prerm-upstart-norestart, preinst-removeconffile.
+ - dh_installudev: Handle conffile migration from old Ubuntu defaults
+ (needed until after the next LTS release).
+
+ -- Colin Watson <cjwatson at ubuntu.com> Thu, 11 Feb 2010 19:02:31 +0000
+
debhelper (7.4.13) unstable; urgency=low
* dh_compress: Avoid compressing images in /usr/share/info. Closes: #567586
@@ -848,6 +1429,18 @@ debhelper (7.4.12) unstable; urgency=low
-- Joey Hess <joeyh at debian.org> Sat, 30 Jan 2010 20:23:02 -0500
+debhelper (7.4.11ubuntu1) lucid; urgency=low
+
+ * Merge with Debian; remaining changes:
+ - dh_installinit: Add --upstart-only and --onlyscripts-upstart modes.
+ - Add various autoscripts for above: postinst-upstart,
+ postinst-upstart-replace, postinst-upstart-restart,
+ prerm-upstart, prerm-upstart-norestart, preinst-removeconffile.
+ - dh_installudev: Handle conffile migration from old Ubuntu defaults
+ (needed until after the next LTS release).
+
+ -- Matthias Klose <doko at ubuntu.com> Thu, 28 Jan 2010 10:44:11 +0100
+
debhelper (7.4.11) unstable; urgency=low
* dh(1): Minor rewording of documentation of override commands.
@@ -864,6 +1457,22 @@ debhelper (7.4.11) unstable; urgency=low
-- Joey Hess <joeyh at debian.org> Thu, 31 Dec 2009 11:32:34 -0500
+debhelper (7.4.10ubuntu1) lucid; urgency=low
+
+ [ Ø£Øمد المØمودي (Ahmed El-Mahmoudy) ]
+ * Merge with Debian unstable (LP: #485956). Remaining Ubuntu changes:
+ - dh_installinit: Add --upstart-only and --onlyscripts-upstart modes.
+ - Add various autoscripts for above: postinst-upstart,
+ postinst-upstart-replace, postinst-upstart-restart,
+ prerm-upstart, prerm-upstart-norestart, preinst-removeconffile.
+ - dh_installudev: Handle conffile migration from old Ubuntu defaults
+ (needed until after the next LTS release).
+
+ [ Daniel Holbach ]
+ * Port merge from 7.4.7 to 7.4.10.
+
+ -- Ø£Øمد المØمودي (Ahmed El-Mahmoudy) <aelmahmoudy at users.sourceforge.net> Wed, 16 Dec 2009 09:01:54 +0100
+
debhelper (7.4.10) unstable; urgency=low
* Add --parallel option that can be used to enable parallel building
@@ -951,6 +1560,25 @@ debhelper (7.4.4) unstable; urgency=low
-- Joey Hess <joeyh at debian.org> Wed, 18 Nov 2009 14:44:21 -0500
+debhelper (7.4.3ubuntu2) lucid; urgency=low
+
+ * dh_installinit: Fix merge error which caused init.d-autoscripts to be
+ run for upstartified packages. (LP: #470326)
+
+ -- Martin Pitt <martin.pitt at ubuntu.com> Mon, 02 Nov 2009 13:01:48 +0100
+
+debhelper (7.4.3ubuntu1) lucid; urgency=low
+
+ * Merge with Debian unstable. Remaining Ubuntu changes:
+ - dh_installinit: Add --upstart-only and --onlyscripts-upstart modes.
+ - Add various autoscripts for above: postinst-upstart,
+ postinst-upstart-replace, postinst-upstart-restart,
+ prerm-upstart, prerm-upstart-norestart, preinst-removeconffile.
+ - dh_installudev: Handle conffile migration from old Ubuntu defaults
+ (needed until after the next LTS release).
+
+ -- Martin Pitt <martin.pitt at ubuntu.com> Fri, 30 Oct 2009 14:11:17 +0100
+
debhelper (7.4.3) unstable; urgency=low
[ Valery Perrin ]
@@ -1032,6 +1660,54 @@ debhelper (7.3.16) unstable; urgency=low
-- Joey Hess <joeyh at debian.org> Wed, 26 Aug 2009 17:10:53 -0400
+debhelper (7.3.15ubuntu3) karmic; urgency=low
+
+ * dh_installinit:
+ - Create the upstart-job symlink even when --upstart-only is called,
+ since this simplifies implementation of...
+ - --restart-after-upgrade: we can't use the upstart 'restart' command here
+ because this will give wrong behavior if we're adding a new job to an
+ existing package; instead just use the standard invoke-rc.d snippet,
+ which (combined with the above) will at least give us compatibility
+ with policy-rc.d for preventing stopped jobs from starting on upgrade.
+ (N.B.: prerm scripts could also safely reuse the invoke-rc.d handling
+ instead of calling 'stop' directly, but leaving this alone for now
+ because the current behavior is only minorly buggy.)
+ - Drop unnecessary UPSTART_ONLY check; --upstart-only should never be set
+ without having an upstart job so this is redundant.
+ - postinst-reboot-required is never the right snippet to include here.
+ - Merge in the final changes to the upstartification as accepted into
+ debhelper upstream, dropping the --onlyscripts-upstart option from
+ the documentation but mapping it to --onlyscripts for compatibility in
+ karmic.
+ * autoscript/postinst-upstart: typo fix.
+
+ -- Steve Langasek <steve.langasek at ubuntu.com> Wed, 30 Sep 2009 13:57:14 -0700
+
+debhelper (7.3.15ubuntu2) karmic; urgency=low
+
+ FFE LP: #427356.
+
+ * dh_installinit: handle upstart job files in preference over init
+ scripts, supplying appropriate maintainer scripts to stop, start or
+ restart the jobs over upgrades.
+ - currently unlike init scripts, these accept failures because Upstart
+ considers "start when already running" failure.
+ * dh_installinit: --upstart-only will not include maintainer script code
+ to replace an init script with an upstart job, otherwise a compatibilty
+ symlink to /lib/init/upstart-job is left in its place
+
+ -- Scott James Remnant <scott at ubuntu.com> Tue, 15 Sep 2009 03:32:13 +0100
+
+debhelper (7.3.15ubuntu1) karmic; urgency=low
+
+ * Resynchronise with Debian. Remaining changes:
+ - dh_installudev: Default priority is now 40 by default.
+ - dh_installudev: Handle conffile migration from old Ubuntu defaults
+ (needed until after the next LTS release).
+
+ -- Colin Watson <cjwatson at ubuntu.com> Tue, 25 Aug 2009 11:10:18 +0100
+
debhelper (7.3.15) unstable; urgency=low
* dh_installudev: Install rules files into new location
@@ -1106,6 +1782,17 @@ debhelper (7.3.9) unstable; urgency=low
-- Joey Hess <joeyh at debian.org> Sat, 01 Aug 2009 15:59:07 -0400
+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) <aelmahmoudy at users.sourceforge.net> Sat, 25 Jul 2009 17:17:24 +0300
+
debhelper (7.3.8) unstable; urgency=low
* Fix t/override_target to use ./run. Closes: #538315
diff -pruN 9.20131227/debian/control 9.20131227ubuntu1/debian/control
--- 9.20131227/debian/control 2013-12-28 01:56:22.000000000 +0000
+++ 9.20131227ubuntu1/debian/control 2014-02-19 14:17:30.000000000 +0000
@@ -1,7 +1,8 @@
Source: debhelper
Section: devel
Priority: optional
-Maintainer: Debhelper Maintainers <debhelper-devel at lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
+XSBC-Original-Maintainer: Debhelper Maintainers <debhelper-devel at lists.alioth.debian.org>
Uploaders: Joey Hess <joeyh at debian.org>
Build-Depends: po4a (>= 0.24)
Standards-Version: 3.9.5
@@ -11,7 +12,7 @@ Homepage: http://kitenet.net/~joey/code/
Package: debhelper
Architecture: all
-Depends: ${perl:Depends}, ${misc:Depends}, file (>= 3.23), dpkg (>= 1.16.2), dpkg-dev (>= 1.17.0), binutils, po-debconf, man-db (>= 2.5.1-1)
+Depends: ${perl:Depends}, ${misc:Depends}, file (>= 3.23), dpkg (>= 1.16.2), dpkg-dev (>= 1.17.0), binutils, po-debconf, man-db (>= 2.5.1-1), dh-apparmor
Suggests: dh-make
Conflicts: dpkg-cross (<< 1.18), python-support (<< 0.5.3), python-central (<< 0.5.6), automake (<< 1.11.2)
Multi-Arch: foreign
diff -pruN 9.20131227/dh_installchangelogs 9.20131227ubuntu1/dh_installchangelogs
--- 9.20131227/dh_installchangelogs 2013-11-10 19:11:15.000000000 +0000
+++ 9.20131227ubuntu1/dh_installchangelogs 2013-12-09 12:01:00.000000000 +0000
@@ -18,9 +18,7 @@ B<dh_installchangelogs> [S<I<debhelper o
B<dh_installchangelogs> is a debhelper program that is responsible for
installing changelogs into package build directories.
-An upstream F<changelog> file may be specified as an option. If none is
-specified, it looks for files with names that seem likely to be changelogs.
-(In compatibility level 7 and above.)
+An upstream F<changelog> file may be specified as an option.
If there is an upstream F<changelog> file, it will be be installed as
F<usr/share/doc/package/changelog> in the package build directory.
@@ -139,21 +137,6 @@ my $upstream=shift;
my $upstream_text=$upstream;
my $upstream_html;
if (! defined $upstream) {
- if (! isnative($dh{MAINPACKAGE}) && !compat(6)) {
- foreach my $dir (qw{. doc docs}) {
- my @files=sort glob("$dir/*");
- foreach my $name (qw{changelog changes changelog.txt changes.txt history history.txt changelog.md}) {
- my @matches=grep {
- lc basename($_) eq $name && -s $_ && ! excludefile($_)
- } @files;
- if (@matches) {
- $upstream=shift @matches;
- $upstream_text=$upstream;
- last;
- }
- }
- }
- }
if (isnative($dh{MAINPACKAGE})) {
$changelog_name='changelog';
}
diff -pruN 9.20131227/dh_installinit 9.20131227ubuntu1/dh_installinit
--- 9.20131227/dh_installinit 2013-11-10 19:23:13.000000000 +0000
+++ 9.20131227ubuntu1/dh_installinit 2013-12-09 17:09:53.000000000 +0000
@@ -129,6 +129,10 @@ preference to the files it normally inst
This parameter is deprecated, use the B<--name> parameter instead. This
parameter is incompatible with the use of upstart jobs.
+=item B<--upstart-only>
+
+Deprecated option, ignored for compatibility.
+
=item B<--error-handler=>I<function>
Call the named shell I<function> if running the init script fails. The
@@ -153,6 +157,7 @@ init(options => {
"init-script=s" => \$dh{INIT_SCRIPT},
"update-rcd-params=s", => \$dh{U_PARAMS},
"remove-d" => \$dh{D_FLAG},
+ "upstart-only" => \$dh{UPSTART_ONLY},
});
# PROMISE: DH NOOP WITHOUT service tmpfile default upstart init init.d
@@ -234,6 +239,12 @@ foreach my $package (@{$dh{DOPACKAGES}})
my $init=pkgfile($package,$scriptsrc) || pkgfile($package,"init") ||
pkgfile($package,"init.d");
+ if ($job ne '' || ($dh{ONLYSCRIPTS} && -e "$tmp/etc/init/$jobfile.conf")) {
+ # minimal version of invoke-rc.d that supports upstart jobs
+ # directly
+ addsubstvar($package, "misc:Depends", "sysv-rc (>= 2.88dsf-24) | file-rc (>= 0.8.16)");
+ }
+
if ($init ne '' && ! $dh{ONLYSCRIPTS}) {
if (! -d "$tmp/etc/init.d") {
doit("install","-d","$tmp/etc/init.d");
@@ -289,34 +300,42 @@ foreach my $package (@{$dh{DOPACKAGES}})
# update-rc.d, and restart (or
# start if new install) script
autoscript($package,"postinst", "postinst-init-restart",
- "s/#SCRIPT#/$script/;s/#INITPARMS#/$params/;s/#ERROR_HANDLER#/$dh{ERROR_HANDLER}/");
+ "s/#SCRIPT#/$script/g;s/#INITPARMS#/$params/;s/#ERROR_HANDLER#/$dh{ERROR_HANDLER}/");
}
else {
# update-rc.d, and start script
autoscript($package,"postinst", "postinst-init",
- "s/#SCRIPT#/$script/;s/#INITPARMS#/$params/;s/#ERROR_HANDLER#/$dh{ERROR_HANDLER}/");
+ "s/#SCRIPT#/$script/g;s/#INITPARMS#/$params/;s/#ERROR_HANDLER#/$dh{ERROR_HANDLER}/");
}
if ($dh{R_FLAG} || $dh{RESTART_AFTER_UPGRADE}) {
# stops script only on remove
autoscript($package,"prerm","prerm-init-norestart",
- "s/#SCRIPT#/$script/;s/#INITPARMS#/$params/;s/#ERROR_HANDLER#/$dh{ERROR_HANDLER}/");
+ "s/#SCRIPT#/$script/g;s/#INITPARMS#/$params/;s/#ERROR_HANDLER#/$dh{ERROR_HANDLER}/");
}
else {
# always stops script
autoscript($package,"prerm","prerm-init",
- "s/#SCRIPT#/$script/;s/#INITPARMS#/$params/;s/#ERROR_HANDLER#/$dh{ERROR_HANDLER}/");
+ "s/#SCRIPT#/$script/g;s/#INITPARMS#/$params/;s/#ERROR_HANDLER#/$dh{ERROR_HANDLER}/");
}
}
else {
# just update-rc.d
autoscript($package,"postinst", "postinst-init-nostart",
- "s/#SCRIPT#/$script/;s/#INITPARMS#/$params/;s/#ERROR_HANDLER#/$dh{ERROR_HANDLER}/");
+ "s/#SCRIPT#/$script/g;s/#INITPARMS#/$params/;s/#ERROR_HANDLER#/$dh{ERROR_HANDLER}/");
}
- # removes rc.d links
- autoscript($package,"postrm","postrm-init",
- "s/#SCRIPT#/$script/;s/#INITPARMS#/$params/;s/#ERROR_HANDLER#/$dh{ERROR_HANDLER}/");
+ if ($job ne '') {
+ $script=$jobfile;
+ autoscript($package,"preinst", "preinst-upstart-compatibility",
+ "s!#OLD#!/etc/init.d/$script!g;s!#PACKAGE#!$package!g");
+ autoscript($package,"postinst", "postinst-upstart-replace",
+ "s/#SCRIPT#/$script/g;s/#ERROR_HANDLER#/$dh{ERROR_HANDLER}/");
+ } else {
+ # removes rc.d links
+ autoscript($package,"postrm","postrm-init",
+ "s/#SCRIPT#/$script/g;s/#INITPARMS#/$params/;s/#ERROR_HANDLER#/$dh{ERROR_HANDLER}/");
+ }
}
}
}
@@ -335,4 +354,6 @@ Steve Langasek <steve.langasek at canonical
Michael Stapelberg <stapelberg at debian.org>
+Scott James Remnant <scott at canonical.com>
+
=cut
diff -pruN 9.20131227/dh_installudev 9.20131227ubuntu1/dh_installudev
--- 9.20131227/dh_installudev 2013-12-15 17:09:53.000000000 +0000
+++ 9.20131227ubuntu1/dh_installudev 2014-02-19 14:17:56.000000000 +0000
@@ -44,7 +44,7 @@ debian/I<package>.udev.
=item B<--priority=>I<priority>
-Sets the priority the file. Default is 60.
+Sets the priority the file. Default is 40.
=item B<-n>, B<--noscripts>
@@ -73,7 +73,7 @@ if (defined $dh{PRIORITY}) {
}
if (! defined $dh{PRIORITY}) {
- $dh{PRIORITY}="60";
+ $dh{PRIORITY}="40";
$old_priority="z60";
}
if ($dh{PRIORITY}) {
diff -pruN 9.20131227/.gitattributes 9.20131227ubuntu1/.gitattributes
--- 9.20131227/.gitattributes 2013-09-03 18:44:37.000000000 +0000
+++ 9.20131227ubuntu1/.gitattributes 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-debian/changelog merge=dpkg-mergechangelogs
diff -pruN 9.20131227/man/po4a/po/debhelper.pot 9.20131227ubuntu1/man/po4a/po/debhelper.pot
--- 9.20131227/man/po4a/po/debhelper.pot 2013-12-28 01:53:55.000000000 +0000
+++ 9.20131227ubuntu1/man/po4a/po/debhelper.pot 2014-02-19 14:18:16.000000000 +0000
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2013-12-27 21:53-0400\n"
+"POT-Creation-Date: 2014-02-19 14:18+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -374,7 +374,7 @@ msgid "Do not modify F<postinst>, F<post
msgstr ""
#. type: =item
-#: debhelper.pod:185 dh_compress:52 dh_install:81 dh_installchangelogs:71 dh_installdocs:80 dh_installexamples:41 dh_link:62 dh_makeshlibs:81 dh_md5sums:37 dh_shlibdeps:30 dh_strip:39
+#: debhelper.pod:185 dh_compress:52 dh_install:81 dh_installchangelogs:69 dh_installdocs:80 dh_installexamples:41 dh_link:62 dh_makeshlibs:81 dh_md5sums:37 dh_shlibdeps:30 dh_strip:39
msgid "B<-X>I<item>, B<--exclude=>I<item>"
msgstr ""
@@ -945,7 +945,7 @@ msgid ""
msgstr ""
#. type: =head1
-#: debhelper.pod:553 dh_auto_test:45 dh_installcatalogs:59 dh_installdocs:121 dh_installemacsen:72 dh_installexamples:53 dh_installinit:140 dh_installman:82 dh_installmodules:54 dh_installudev:55 dh_installwm:54 dh_installxfonts:37 dh_movefiles:64 dh_strip:68 dh_usrlocal:49
+#: debhelper.pod:553 dh_auto_test:45 dh_installcatalogs:59 dh_installdocs:121 dh_installemacsen:72 dh_installexamples:53 dh_installinit:144 dh_installman:82 dh_installmodules:54 dh_installudev:55 dh_installwm:54 dh_installxfonts:37 dh_movefiles:64 dh_strip:68 dh_usrlocal:49
msgid "NOTES"
msgstr ""
@@ -1192,7 +1192,7 @@ msgid ""
msgstr ""
#. type: =head1
-#: debhelper.pod:683 dh:969 dh_auto_build:47 dh_auto_clean:50 dh_auto_configure:52 dh_auto_install:92 dh_auto_test:63 dh_bugfiles:124 dh_builddeb:124 dh_clean:142 dh_compress:210 dh_desktop:31 dh_fixperms:127 dh_gconf:101 dh_gencontrol:82 dh_icons:71 dh_install:260 dh_installcatalogs:122 dh_installchangelogs:241 dh_installcron:79 dh_installdeb:142 dh_installdebconf:128 dh_installdirs:88 dh_installdocs:334 dh_installemacsen:141 dh_installexamples:108 dh_installifupdown:71 dh_installinfo:77 dh_installinit:324 dh_installlogcheck:80 dh_installlogrotate:52 dh_installman:263 dh_installmanpages:197 dh_installmenu:89 dh_installmime:63 dh_installmodules:115 dh_installpam:61 dh_installppp:67 dh_installudev:117 dh_installwm:110 dh_installxfonts:89 dh_link:228 dh_lintian:59 dh_listpackages:30 dh_makeshlibs:258 dh_md5sums:90 dh_movefiles:170 dh_perl:148 dh_prep:60 dh_scrollkeeper:28 dh_shlibdeps:152 dh_strip:242 dh_suidregister:117 dh_testdir:53 dh_testroot:27 dh_undocumented:28 dh_usrlocal:116
+#: debhelper.pod:683 dh:969 dh_auto_build:47 dh_auto_clean:50 dh_auto_configure:52 dh_auto_install:92 dh_auto_test:63 dh_bugfiles:124 dh_builddeb:124 dh_clean:142 dh_compress:210 dh_desktop:31 dh_fixperms:127 dh_gconf:101 dh_gencontrol:82 dh_icons:71 dh_install:260 dh_installcatalogs:122 dh_installchangelogs:224 dh_installcron:79 dh_installdeb:142 dh_installdebconf:128 dh_installdirs:88 dh_installdocs:334 dh_installemacsen:141 dh_installexamples:108 dh_installifupdown:71 dh_installinfo:77 dh_installinit:343 dh_installlogcheck:80 dh_installlogrotate:52 dh_installman:263 dh_installmanpages:197 dh_installmenu:89 dh_installmime:63 dh_installmodules:115 dh_installpam:61 dh_installppp:67 dh_installudev:117 dh_installwm:110 dh_installxfonts:89 dh_link:228 dh_lintian:59 dh_listpackages:30 dh_makeshlibs:258 dh_md5sums:90 dh_movefiles:170 dh_perl:148 dh_prep:60 dh_scrollkeeper:28 dh_shlibdeps:152 dh_strip:242 dh_suidregister:117 dh_testdir:53 dh_testroot:27 dh_undocumented:28 dh_usrlocal:116
msgid "SEE ALSO"
msgstr ""
@@ -1217,12 +1217,12 @@ msgid "Debhelper web site."
msgstr ""
#. type: =head1
-#: debhelper.pod:697 dh:975 dh_auto_build:53 dh_auto_clean:56 dh_auto_configure:58 dh_auto_install:98 dh_auto_test:69 dh_bugfiles:132 dh_builddeb:130 dh_clean:148 dh_compress:216 dh_desktop:37 dh_fixperms:133 dh_gconf:107 dh_gencontrol:88 dh_icons:77 dh_install:266 dh_installcatalogs:128 dh_installchangelogs:247 dh_installcron:85 dh_installdeb:148 dh_installdebconf:134 dh_installdirs:94 dh_installdocs:340 dh_installemacsen:148 dh_installexamples:114 dh_installifupdown:77 dh_installinfo:83 dh_installlogcheck:86 dh_installlogrotate:58 dh_installman:269 dh_installmanpages:203 dh_installmenu:97 dh_installmime:69 dh_installmodules:121 dh_installpam:67 dh_installppp:73 dh_installudev:123 dh_installwm:116 dh_installxfonts:95 dh_link:234 dh_lintian:67 dh_listpackages:36 dh_makeshlibs:264 dh_md5sums:96 dh_movefiles:176 dh_perl:154 dh_prep:66 dh_scrollkeeper:34 dh_shlibdeps:158 dh_strip:248 dh_suidregister:123 dh_testdir:59 dh_testroot:33 dh_undocumented:34 dh_usrlocal:122
+#: debhelper.pod:697 dh:975 dh_auto_build:53 dh_auto_clean:56 dh_auto_configure:58 dh_auto_install:98 dh_auto_test:69 dh_bugfiles:132 dh_builddeb:130 dh_clean:148 dh_compress:216 dh_desktop:37 dh_fixperms:133 dh_gconf:107 dh_gencontrol:88 dh_icons:77 dh_install:266 dh_installcatalogs:128 dh_installchangelogs:230 dh_installcron:85 dh_installdeb:148 dh_installdebconf:134 dh_installdirs:94 dh_installdocs:340 dh_installemacsen:148 dh_installexamples:114 dh_installifupdown:77 dh_installinfo:83 dh_installlogcheck:86 dh_installlogrotate:58 dh_installman:269 dh_installmanpages:203 dh_installmenu:97 dh_installmime:69 dh_installmodules:121 dh_installpam:67 dh_installppp:73 dh_installudev:123 dh_installwm:116 dh_installxfonts:95 dh_link:234 dh_lintian:67 dh_listpackages:36 dh_makeshlibs:264 dh_md5sums:96 dh_movefiles:176 dh_perl:154 dh_prep:66 dh_scrollkeeper:34 dh_shlibdeps:158 dh_strip:248 dh_suidregister:123 dh_testdir:59 dh_testroot:33 dh_undocumented:34 dh_usrlocal:122
msgid "AUTHOR"
msgstr ""
#. type: textblock
-#: debhelper.pod:699 dh:977 dh_auto_build:55 dh_auto_clean:58 dh_auto_configure:60 dh_auto_install:100 dh_auto_test:71 dh_builddeb:132 dh_clean:150 dh_compress:218 dh_fixperms:135 dh_gencontrol:90 dh_install:268 dh_installchangelogs:249 dh_installcron:87 dh_installdeb:150 dh_installdebconf:136 dh_installdirs:96 dh_installdocs:342 dh_installemacsen:150 dh_installexamples:116 dh_installifupdown:79 dh_installinfo:85 dh_installinit:332 dh_installlogrotate:60 dh_installman:271 dh_installmanpages:205 dh_installmenu:99 dh_installmime:71 dh_installmodules:123 dh_installpam:69 dh_installppp:75 dh_installudev:125 dh_installwm:118 dh_installxfonts:97 dh_link:236 dh_listpackages:38 dh_makeshlibs:266 dh_md5sums:98 dh_movefiles:178 dh_prep:68 dh_shlibdeps:160 dh_strip:250 dh_suidregister:125 dh_testdir:61 dh_testroot:35 dh_undocumented:36
+#: debhelper.pod:699 dh:977 dh_auto_build:55 dh_auto_clean:58 dh_auto_configure:60 dh_auto_install:100 dh_auto_test:71 dh_builddeb:132 dh_clean:150 dh_compress:218 dh_fixperms:135 dh_gencontrol:90 dh_install:268 dh_installchangelogs:232 dh_installcron:87 dh_installdeb:150 dh_installdebconf:136 dh_installdirs:96 dh_installdocs:342 dh_installemacsen:150 dh_installexamples:116 dh_installifupdown:79 dh_installinfo:85 dh_installinit:351 dh_installlogrotate:60 dh_installman:271 dh_installmanpages:205 dh_installmenu:99 dh_installmime:71 dh_installmodules:123 dh_installpam:69 dh_installppp:75 dh_installudev:125 dh_installwm:118 dh_installxfonts:97 dh_link:236 dh_listpackages:38 dh_makeshlibs:266 dh_md5sums:98 dh_movefiles:178 dh_prep:68 dh_shlibdeps:160 dh_strip:250 dh_suidregister:125 dh_testdir:61 dh_testroot:35 dh_undocumented:36
msgid "Joey Hess <joeyh at debian.org>"
msgstr ""
@@ -1280,7 +1280,7 @@ msgid ""
msgstr ""
#. type: =head1
-#: dh:41 dh_auto_build:28 dh_auto_clean:30 dh_auto_configure:31 dh_auto_install:43 dh_auto_test:31 dh_bugfiles:50 dh_builddeb:24 dh_clean:41 dh_compress:48 dh_fixperms:31 dh_gconf:39 dh_gencontrol:26 dh_icons:30 dh_install:59 dh_installcatalogs:49 dh_installchangelogs:59 dh_installcron:40 dh_installdebconf:61 dh_installdirs:31 dh_installdocs:71 dh_installemacsen:53 dh_installexamples:32 dh_installifupdown:39 dh_installinfo:31 dh_installinit:59 dh_installlogcheck:42 dh_installlogrotate:22 dh_installman:61 dh_installmanpages:40 dh_installmenu:41 dh_installmodules:38 dh_installpam:31 dh_installppp:35 dh_installudev:35 dh_installwm:34 dh_link:53 dh_makeshlibs:43 dh_md5sums:28 dh_movefiles:38 dh_perl:31 dh_prep:26 dh_shlibdeps:26 dh_strip:35 dh_testdir:23 dh_usrlocal:39
+#: dh:41 dh_auto_build:28 dh_auto_clean:30 dh_auto_configure:31 dh_auto_install:43 dh_auto_test:31 dh_bugfiles:50 dh_builddeb:24 dh_clean:41 dh_compress:48 dh_fixperms:31 dh_gconf:39 dh_gencontrol:26 dh_icons:30 dh_install:59 dh_installcatalogs:49 dh_installchangelogs:57 dh_installcron:40 dh_installdebconf:61 dh_installdirs:31 dh_installdocs:71 dh_installemacsen:53 dh_installexamples:32 dh_installifupdown:39 dh_installinfo:31 dh_installinit:59 dh_installlogcheck:42 dh_installlogrotate:22 dh_installman:61 dh_installmanpages:40 dh_installmenu:41 dh_installmodules:38 dh_installpam:31 dh_installppp:35 dh_installudev:35 dh_installwm:34 dh_link:53 dh_makeshlibs:43 dh_md5sums:28 dh_movefiles:38 dh_perl:31 dh_prep:26 dh_shlibdeps:26 dh_strip:35 dh_testdir:23 dh_usrlocal:39
msgid "OPTIONS"
msgstr ""
@@ -1746,12 +1746,12 @@ msgid ""
msgstr ""
#. type: textblock
-#: dh:971 dh_auto_build:49 dh_auto_clean:52 dh_auto_configure:54 dh_auto_install:94 dh_auto_test:65 dh_builddeb:126 dh_clean:144 dh_compress:212 dh_fixperms:129 dh_gconf:103 dh_gencontrol:84 dh_install:262 dh_installcatalogs:124 dh_installchangelogs:243 dh_installcron:81 dh_installdeb:144 dh_installdebconf:130 dh_installdirs:90 dh_installdocs:336 dh_installexamples:110 dh_installifupdown:73 dh_installinfo:79 dh_installinit:326 dh_installlogcheck:82 dh_installlogrotate:54 dh_installman:265 dh_installmanpages:199 dh_installmime:65 dh_installmodules:117 dh_installpam:63 dh_installppp:69 dh_installudev:119 dh_installwm:112 dh_installxfonts:91 dh_link:230 dh_listpackages:32 dh_makeshlibs:260 dh_md5sums:92 dh_movefiles:172 dh_perl:150 dh_prep:62 dh_strip:244 dh_suidregister:119 dh_testdir:55 dh_testroot:29 dh_undocumented:30 dh_usrlocal:118
+#: dh:971 dh_auto_build:49 dh_auto_clean:52 dh_auto_configure:54 dh_auto_install:94 dh_auto_test:65 dh_builddeb:126 dh_clean:144 dh_compress:212 dh_fixperms:129 dh_gconf:103 dh_gencontrol:84 dh_install:262 dh_installcatalogs:124 dh_installchangelogs:226 dh_installcron:81 dh_installdeb:144 dh_installdebconf:130 dh_installdirs:90 dh_installdocs:336 dh_installexamples:110 dh_installifupdown:73 dh_installinfo:79 dh_installinit:345 dh_installlogcheck:82 dh_installlogrotate:54 dh_installman:265 dh_installmanpages:199 dh_installmime:65 dh_installmodules:117 dh_installpam:63 dh_installppp:69 dh_installudev:119 dh_installwm:112 dh_installxfonts:91 dh_link:230 dh_listpackages:32 dh_makeshlibs:260 dh_md5sums:92 dh_movefiles:172 dh_perl:150 dh_prep:62 dh_strip:244 dh_suidregister:119 dh_testdir:55 dh_testroot:29 dh_undocumented:30 dh_usrlocal:118
msgid "L<debhelper(7)>"
msgstr ""
#. type: textblock
-#: dh:973 dh_auto_build:51 dh_auto_clean:54 dh_auto_configure:56 dh_auto_install:96 dh_auto_test:67 dh_bugfiles:130 dh_builddeb:128 dh_clean:146 dh_compress:214 dh_desktop:35 dh_fixperms:131 dh_gconf:105 dh_gencontrol:86 dh_icons:75 dh_install:264 dh_installchangelogs:245 dh_installcron:83 dh_installdeb:146 dh_installdebconf:132 dh_installdirs:92 dh_installdocs:338 dh_installemacsen:146 dh_installexamples:112 dh_installifupdown:75 dh_installinfo:81 dh_installinit:328 dh_installlogrotate:56 dh_installman:267 dh_installmanpages:201 dh_installmenu:95 dh_installmime:67 dh_installmodules:119 dh_installpam:65 dh_installppp:71 dh_installudev:121 dh_installwm:114 dh_installxfonts:93 dh_link:232 dh_lintian:63 dh_listpackages:34 dh_makeshlibs:262 dh_md5sums:94 dh_movefiles:174 dh_perl:152 dh_prep:64 dh_scrollkeeper:32 dh_shlibdeps:156 dh_strip:246 dh_suidregister:121 dh_testdir:57 dh_testroot:31 dh_undocumented:32 dh_usrlocal:120
+#: dh:973 dh_auto_build:51 dh_auto_clean:54 dh_auto_configure:56 dh_auto_install:96 dh_auto_test:67 dh_bugfiles:130 dh_builddeb:128 dh_clean:146 dh_compress:214 dh_desktop:35 dh_fixperms:131 dh_gconf:105 dh_gencontrol:86 dh_icons:75 dh_install:264 dh_installchangelogs:228 dh_installcron:83 dh_installdeb:146 dh_installdebconf:132 dh_installdirs:92 dh_installdocs:338 dh_installemacsen:146 dh_installexamples:112 dh_installifupdown:75 dh_installinfo:81 dh_installinit:347 dh_installlogrotate:56 dh_installman:267 dh_installmanpages:201 dh_installmenu:95 dh_installmime:67 dh_installmodules:119 dh_installpam:65 dh_installppp:71 dh_installudev:121 dh_installwm:114 dh_installxfonts:93 dh_link:232 dh_lintian:63 dh_listpackages:34 dh_makeshlibs:262 dh_md5sums:94 dh_movefiles:174 dh_perl:152 dh_prep:64 dh_scrollkeeper:32 dh_shlibdeps:156 dh_strip:246 dh_suidregister:121 dh_testdir:57 dh_testroot:31 dh_undocumented:32 dh_usrlocal:120
msgid "This program is a part of debhelper."
msgstr ""
@@ -2036,7 +2036,7 @@ msgid ""
msgstr ""
#. type: =head1
-#: dh_bugfiles:22 dh_clean:31 dh_compress:31 dh_gconf:23 dh_install:38 dh_installcatalogs:35 dh_installchangelogs:35 dh_installcron:21 dh_installdeb:22 dh_installdebconf:34 dh_installdirs:21 dh_installdocs:21 dh_installemacsen:27 dh_installexamples:22 dh_installifupdown:22 dh_installinfo:21 dh_installinit:27 dh_installlogcheck:21 dh_installman:51 dh_installmenu:25 dh_installmime:21 dh_installmodules:28 dh_installpam:21 dh_installppp:21 dh_installudev:25 dh_installwm:24 dh_link:41 dh_lintian:21 dh_makeshlibs:29 dh_movefiles:26
+#: dh_bugfiles:22 dh_clean:31 dh_compress:31 dh_gconf:23 dh_install:38 dh_installcatalogs:35 dh_installchangelogs:33 dh_installcron:21 dh_installdeb:22 dh_installdebconf:34 dh_installdirs:21 dh_installdocs:21 dh_installemacsen:27 dh_installexamples:22 dh_installifupdown:22 dh_installinfo:21 dh_installinit:27 dh_installlogcheck:21 dh_installman:51 dh_installmenu:25 dh_installmime:21 dh_installmodules:28 dh_installpam:21 dh_installppp:21 dh_installudev:25 dh_installwm:24 dh_link:41 dh_lintian:21 dh_makeshlibs:29 dh_movefiles:26
msgid "FILES"
msgstr ""
@@ -2222,7 +2222,7 @@ msgid "Can list other files to be remove
msgstr ""
#. type: =item
-#: dh_clean:45 dh_installchangelogs:63
+#: dh_clean:45 dh_installchangelogs:61
msgid "B<-k>, B<--keep>"
msgstr ""
@@ -2834,7 +2834,7 @@ msgid "Do not modify F<postinst>/F<postr
msgstr ""
#. type: textblock
-#: dh_installcatalogs:61 dh_installdocs:127 dh_installemacsen:74 dh_installinit:142 dh_installmodules:56 dh_installudev:57 dh_installwm:56 dh_usrlocal:51
+#: dh_installcatalogs:61 dh_installdocs:127 dh_installemacsen:74 dh_installinit:146 dh_installmodules:56 dh_installudev:57 dh_installwm:56 dh_usrlocal:51
msgid ""
"Note that this command is not idempotent. L<dh_prep(1)> should be called "
"between invocations of this command. Otherwise, it may cause multiple "
@@ -2872,21 +2872,18 @@ msgstr ""
#. type: textblock
#: dh_installchangelogs:21
-msgid ""
-"An upstream F<changelog> file may be specified as an option. If none is "
-"specified, it looks for files with names that seem likely to be changelogs. "
-"(In compatibility level 7 and above.)"
+msgid "An upstream F<changelog> file may be specified as an option."
msgstr ""
#. type: textblock
-#: dh_installchangelogs:25
+#: dh_installchangelogs:23
msgid ""
"If there is an upstream F<changelog> file, it will be be installed as "
"F<usr/share/doc/package/changelog> in the package build directory."
msgstr ""
#. type: textblock
-#: dh_installchangelogs:28
+#: dh_installchangelogs:26
msgid ""
"If the upstream changelog is is a F<html> file (determined by file "
"extension), it will be installed as F<usr/share/doc/package/changelog.html> "
@@ -2897,41 +2894,41 @@ msgid ""
msgstr ""
#. type: =item
-#: dh_installchangelogs:39
+#: dh_installchangelogs:37
msgid "F<debian/changelog>"
msgstr ""
#. type: =item
-#: dh_installchangelogs:41
+#: dh_installchangelogs:39
msgid "F<debian/NEWS>"
msgstr ""
#. type: =item
-#: dh_installchangelogs:43
+#: dh_installchangelogs:41
msgid "debian/I<package>.changelog"
msgstr ""
#. type: =item
-#: dh_installchangelogs:45
+#: dh_installchangelogs:43
msgid "debian/I<package>.NEWS"
msgstr ""
#. type: textblock
-#: dh_installchangelogs:47
+#: dh_installchangelogs:45
msgid ""
"Automatically installed into usr/share/doc/I<package>/ in the package build "
"directory."
msgstr ""
#. type: textblock
-#: dh_installchangelogs:50
+#: dh_installchangelogs:48
msgid ""
"Use the package specific name if I<package> needs a different F<NEWS> or "
"F<changelog> file."
msgstr ""
#. type: textblock
-#: dh_installchangelogs:53
+#: dh_installchangelogs:51
msgid ""
"The F<changelog> file is installed with a name of changelog for native "
"packages, and F<changelog.Debian> for non-native packages. The F<NEWS> file "
@@ -2939,7 +2936,7 @@ msgid ""
msgstr ""
#. type: textblock
-#: dh_installchangelogs:65
+#: dh_installchangelogs:63
msgid ""
"Keep the original name of the upstream changelog. This will be accomplished "
"by installing the upstream changelog as F<changelog>, and making a symlink "
@@ -2949,19 +2946,19 @@ msgid ""
msgstr ""
#. type: textblock
-#: dh_installchangelogs:73
+#: dh_installchangelogs:71
msgid ""
"Exclude upstream F<changelog> files that contain I<item> anywhere in their "
"filename from being installed."
msgstr ""
#. type: =item
-#: dh_installchangelogs:76
+#: dh_installchangelogs:74
msgid "I<upstream>"
msgstr ""
#. type: textblock
-#: dh_installchangelogs:78
+#: dh_installchangelogs:76
msgid "Install this file as the upstream changelog."
msgstr ""
@@ -3928,11 +3925,21 @@ msgstr ""
#. type: =item
#: dh_installinit:132
-msgid "B<--error-handler=>I<function>"
+msgid "B<--upstart-only>"
msgstr ""
#. type: textblock
#: dh_installinit:134
+msgid "Deprecated option, ignored for compatibility."
+msgstr ""
+
+#. type: =item
+#: dh_installinit:136
+msgid "B<--error-handler=>I<function>"
+msgstr ""
+
+#. type: textblock
+#: dh_installinit:138
msgid ""
"Call the named shell I<function> if running the init script fails. The "
"function should be provided in the F<prerm> and F<postinst> scripts, before "
@@ -3940,21 +3947,26 @@ msgid ""
msgstr ""
#. type: =head1
-#: dh_installinit:330
+#: dh_installinit:349
msgid "AUTHORS"
msgstr ""
#. type: textblock
-#: dh_installinit:334
+#: dh_installinit:353
msgid "Steve Langasek <steve.langasek at canonical.com>"
msgstr ""
#. type: textblock
-#: dh_installinit:336
+#: dh_installinit:355
msgid "Michael Stapelberg <stapelberg at debian.org>"
msgstr ""
#. type: textblock
+#: dh_installinit:357
+msgid "Scott James Remnant <scott at canonical.com>"
+msgstr ""
+
+#. type: textblock
#: dh_installlogcheck:5
msgid "dh_installlogcheck - install logcheck rulefiles into etc/logcheck/"
msgstr ""
@@ -4527,7 +4539,7 @@ msgstr ""
#. type: textblock
#: dh_installudev:47
-msgid "Sets the priority the file. Default is 60."
+msgid "Sets the priority the file. Default is 40."
msgstr ""
#. type: textblock
diff -pruN 9.20131227/man/po4a/po/de.po 9.20131227ubuntu1/man/po4a/po/de.po
--- 9.20131227/man/po4a/po/de.po 2013-12-28 01:53:55.000000000 +0000
+++ 9.20131227ubuntu1/man/po4a/po/de.po 2014-02-19 14:18:16.000000000 +0000
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debhelper 9.20120909\n"
"Report-Msgid-Bugs-To: debhelper at packages.debian.org\n"
-"POT-Creation-Date: 2013-12-27 21:53-0400\n"
+"POT-Creation-Date: 2014-02-19 14:18+0000\n"
"PO-Revision-Date: 2012-10-22 22:00+0100\n"
"Last-Translator: Chris Leick <c.leick at vollbio.de>\n"
"Language-Team: German <debian-l10n-german at lists.debian.org>\n"
@@ -525,7 +525,7 @@ msgid "Do not modify F<postinst>, F<post
msgstr "verändert keine F<postinst>-, F<postrm>- etc. Skripte"
#. type: =item
-#: debhelper.pod:185 dh_compress:52 dh_install:81 dh_installchangelogs:71
+#: debhelper.pod:185 dh_compress:52 dh_install:81 dh_installchangelogs:69
#: dh_installdocs:80 dh_installexamples:41 dh_link:62 dh_makeshlibs:81
#: dh_md5sums:37 dh_shlibdeps:30 dh_strip:39
msgid "B<-X>I<item>, B<--exclude=>I<item>"
@@ -1265,7 +1265,7 @@ msgstr ""
#. type: =head1
#: debhelper.pod:553 dh_auto_test:45 dh_installcatalogs:59 dh_installdocs:121
-#: dh_installemacsen:72 dh_installexamples:53 dh_installinit:140
+#: dh_installemacsen:72 dh_installexamples:53 dh_installinit:144
#: dh_installman:82 dh_installmodules:54 dh_installudev:55 dh_installwm:54
#: dh_installxfonts:37 dh_movefiles:64 dh_strip:68 dh_usrlocal:49
msgid "NOTES"
@@ -1612,10 +1612,10 @@ msgstr ""
#: dh_auto_configure:52 dh_auto_install:92 dh_auto_test:63 dh_bugfiles:124
#: dh_builddeb:124 dh_clean:142 dh_compress:210 dh_desktop:31 dh_fixperms:127
#: dh_gconf:101 dh_gencontrol:82 dh_icons:71 dh_install:260
-#: dh_installcatalogs:122 dh_installchangelogs:241 dh_installcron:79
+#: dh_installcatalogs:122 dh_installchangelogs:224 dh_installcron:79
#: dh_installdeb:142 dh_installdebconf:128 dh_installdirs:88
#: dh_installdocs:334 dh_installemacsen:141 dh_installexamples:108
-#: dh_installifupdown:71 dh_installinfo:77 dh_installinit:324
+#: dh_installifupdown:71 dh_installinfo:77 dh_installinit:343
#: dh_installlogcheck:80 dh_installlogrotate:52 dh_installman:263
#: dh_installmanpages:197 dh_installmenu:89 dh_installmime:63
#: dh_installmodules:115 dh_installpam:61 dh_installppp:67 dh_installudev:117
@@ -1654,7 +1654,7 @@ msgstr "Debhelper-Website"
#: dh_auto_configure:58 dh_auto_install:98 dh_auto_test:69 dh_bugfiles:132
#: dh_builddeb:130 dh_clean:148 dh_compress:216 dh_desktop:37 dh_fixperms:133
#: dh_gconf:107 dh_gencontrol:88 dh_icons:77 dh_install:266
-#: dh_installcatalogs:128 dh_installchangelogs:247 dh_installcron:85
+#: dh_installcatalogs:128 dh_installchangelogs:230 dh_installcron:85
#: dh_installdeb:148 dh_installdebconf:134 dh_installdirs:94
#: dh_installdocs:340 dh_installemacsen:148 dh_installexamples:114
#: dh_installifupdown:77 dh_installinfo:83 dh_installlogcheck:86
@@ -1672,10 +1672,10 @@ msgstr "AUTOR"
#: debhelper.pod:699 dh:977 dh_auto_build:55 dh_auto_clean:58
#: dh_auto_configure:60 dh_auto_install:100 dh_auto_test:71 dh_builddeb:132
#: dh_clean:150 dh_compress:218 dh_fixperms:135 dh_gencontrol:90
-#: dh_install:268 dh_installchangelogs:249 dh_installcron:87 dh_installdeb:150
+#: dh_install:268 dh_installchangelogs:232 dh_installcron:87 dh_installdeb:150
#: dh_installdebconf:136 dh_installdirs:96 dh_installdocs:342
#: dh_installemacsen:150 dh_installexamples:116 dh_installifupdown:79
-#: dh_installinfo:85 dh_installinit:332 dh_installlogrotate:60
+#: dh_installinfo:85 dh_installinit:351 dh_installlogrotate:60
#: dh_installman:271 dh_installmanpages:205 dh_installmenu:99
#: dh_installmime:71 dh_installmodules:123 dh_installpam:69 dh_installppp:75
#: dh_installudev:125 dh_installwm:118 dh_installxfonts:97 dh_link:236
@@ -1772,7 +1772,7 @@ msgstr ""
#: dh:41 dh_auto_build:28 dh_auto_clean:30 dh_auto_configure:31
#: dh_auto_install:43 dh_auto_test:31 dh_bugfiles:50 dh_builddeb:24
#: dh_clean:41 dh_compress:48 dh_fixperms:31 dh_gconf:39 dh_gencontrol:26
-#: dh_icons:30 dh_install:59 dh_installcatalogs:49 dh_installchangelogs:59
+#: dh_icons:30 dh_install:59 dh_installcatalogs:49 dh_installchangelogs:57
#: dh_installcron:40 dh_installdebconf:61 dh_installdirs:31 dh_installdocs:71
#: dh_installemacsen:53 dh_installexamples:32 dh_installifupdown:39
#: dh_installinfo:31 dh_installinit:59 dh_installlogcheck:42
@@ -2405,10 +2405,10 @@ msgstr ""
#: dh:971 dh_auto_build:49 dh_auto_clean:52 dh_auto_configure:54
#: dh_auto_install:94 dh_auto_test:65 dh_builddeb:126 dh_clean:144
#: dh_compress:212 dh_fixperms:129 dh_gconf:103 dh_gencontrol:84
-#: dh_install:262 dh_installcatalogs:124 dh_installchangelogs:243
+#: dh_install:262 dh_installcatalogs:124 dh_installchangelogs:226
#: dh_installcron:81 dh_installdeb:144 dh_installdebconf:130 dh_installdirs:90
#: dh_installdocs:336 dh_installexamples:110 dh_installifupdown:73
-#: dh_installinfo:79 dh_installinit:326 dh_installlogcheck:82
+#: dh_installinfo:79 dh_installinit:345 dh_installlogcheck:82
#: dh_installlogrotate:54 dh_installman:265 dh_installmanpages:199
#: dh_installmime:65 dh_installmodules:117 dh_installpam:63 dh_installppp:69
#: dh_installudev:119 dh_installwm:112 dh_installxfonts:91 dh_link:230
@@ -2422,10 +2422,10 @@ msgstr "L<debhelper(7)>"
#: dh:973 dh_auto_build:51 dh_auto_clean:54 dh_auto_configure:56
#: dh_auto_install:96 dh_auto_test:67 dh_bugfiles:130 dh_builddeb:128
#: dh_clean:146 dh_compress:214 dh_desktop:35 dh_fixperms:131 dh_gconf:105
-#: dh_gencontrol:86 dh_icons:75 dh_install:264 dh_installchangelogs:245
+#: dh_gencontrol:86 dh_icons:75 dh_install:264 dh_installchangelogs:228
#: dh_installcron:83 dh_installdeb:146 dh_installdebconf:132 dh_installdirs:92
#: dh_installdocs:338 dh_installemacsen:146 dh_installexamples:112
-#: dh_installifupdown:75 dh_installinfo:81 dh_installinit:328
+#: dh_installifupdown:75 dh_installinfo:81 dh_installinit:347
#: dh_installlogrotate:56 dh_installman:267 dh_installmanpages:201
#: dh_installmenu:95 dh_installmime:67 dh_installmodules:119 dh_installpam:65
#: dh_installppp:71 dh_installudev:121 dh_installwm:114 dh_installxfonts:93
@@ -2825,7 +2825,7 @@ msgstr ""
#. type: =head1
#: dh_bugfiles:22 dh_clean:31 dh_compress:31 dh_gconf:23 dh_install:38
-#: dh_installcatalogs:35 dh_installchangelogs:35 dh_installcron:21
+#: dh_installcatalogs:35 dh_installchangelogs:33 dh_installcron:21
#: dh_installdeb:22 dh_installdebconf:34 dh_installdirs:21 dh_installdocs:21
#: dh_installemacsen:27 dh_installexamples:22 dh_installifupdown:22
#: dh_installinfo:21 dh_installinit:27 dh_installlogcheck:21 dh_installman:51
@@ -3064,7 +3064,7 @@ msgid "Can list other files to be remove
msgstr "kann weitere Dateien auflisten, die zu entfernen sind."
#. type: =item
-#: dh_clean:45 dh_installchangelogs:63
+#: dh_clean:45 dh_installchangelogs:61
msgid "B<-k>, B<--keep>"
msgstr "B<-k>, B<--keep>"
@@ -3866,7 +3866,7 @@ msgstr "ändert keine F<postinst>-/F<pos
#. type: textblock
#: dh_installcatalogs:61 dh_installdocs:127 dh_installemacsen:74
-#: dh_installinit:142 dh_installmodules:56 dh_installudev:57 dh_installwm:56
+#: dh_installinit:146 dh_installmodules:56 dh_installudev:57 dh_installwm:56
#: dh_usrlocal:51
msgid ""
"Note that this command is not idempotent. L<dh_prep(1)> should be called "
@@ -3916,18 +3916,11 @@ msgstr ""
#. type: textblock
#: dh_installchangelogs:21
-msgid ""
-"An upstream F<changelog> file may be specified as an option. If none is "
-"specified, it looks for files with names that seem likely to be changelogs. "
-"(In compatibility level 7 and above.)"
+msgid "An upstream F<changelog> file may be specified as an option."
msgstr ""
-"Optional könnte eine F<changelog>-Datei der Originalautoren angegeben "
-"werden. Falls keine angegeben wurde, sucht es nach Dateien mit Namen, die "
-"wahrscheinlich Änderungsdateien sein könnten (auf Kompatibilitätsstufe 7 und "
-"darüber)."
#. type: textblock
-#: dh_installchangelogs:25
+#: dh_installchangelogs:23
#, fuzzy
#| msgid ""
#| "Automatically installed into usr/share/doc/I<package>/ in the package "
@@ -3940,7 +3933,7 @@ msgstr ""
"installiert."
#. type: textblock
-#: dh_installchangelogs:28
+#: dh_installchangelogs:26
msgid ""
"If the upstream changelog is is a F<html> file (determined by file "
"extension), it will be installed as F<usr/share/doc/package/changelog.html> "
@@ -3951,27 +3944,27 @@ msgid ""
msgstr ""
#. type: =item
-#: dh_installchangelogs:39
+#: dh_installchangelogs:37
msgid "F<debian/changelog>"
msgstr "F<debian/changelog>"
#. type: =item
-#: dh_installchangelogs:41
+#: dh_installchangelogs:39
msgid "F<debian/NEWS>"
msgstr "F<debian/NEWS>"
#. type: =item
-#: dh_installchangelogs:43
+#: dh_installchangelogs:41
msgid "debian/I<package>.changelog"
msgstr "debian/I<Paket>.changelog"
#. type: =item
-#: dh_installchangelogs:45
+#: dh_installchangelogs:43
msgid "debian/I<package>.NEWS"
msgstr "debian/I<Paket>.NEWS"
#. type: textblock
-#: dh_installchangelogs:47
+#: dh_installchangelogs:45
msgid ""
"Automatically installed into usr/share/doc/I<package>/ in the package build "
"directory."
@@ -3980,7 +3973,7 @@ msgstr ""
"installiert."
#. type: textblock
-#: dh_installchangelogs:50
+#: dh_installchangelogs:48
msgid ""
"Use the package specific name if I<package> needs a different F<NEWS> or "
"F<changelog> file."
@@ -3989,7 +3982,7 @@ msgstr ""
"oder F<changelog>-Datei benötigt."
#. type: textblock
-#: dh_installchangelogs:53
+#: dh_installchangelogs:51
msgid ""
"The F<changelog> file is installed with a name of changelog for native "
"packages, and F<changelog.Debian> for non-native packages. The F<NEWS> file "
@@ -4000,7 +3993,7 @@ msgstr ""
"Datei F<NEWS> wird immer mit dem Namen F<NEWS.Debian> installiert."
#. type: textblock
-#: dh_installchangelogs:65
+#: dh_installchangelogs:63
msgid ""
"Keep the original name of the upstream changelog. This will be accomplished "
"by installing the upstream changelog as F<changelog>, and making a symlink "
@@ -4017,7 +4010,7 @@ msgstr ""
"F<changelog> bezieht."
#. type: textblock
-#: dh_installchangelogs:73
+#: dh_installchangelogs:71
msgid ""
"Exclude upstream F<changelog> files that contain I<item> anywhere in their "
"filename from being installed."
@@ -4026,12 +4019,12 @@ msgstr ""
"die irgendwo in ihrem Dateinamen I<Element> enthalten."
#. type: =item
-#: dh_installchangelogs:76
+#: dh_installchangelogs:74
msgid "I<upstream>"
msgstr "I<Originalautoren>"
#. type: textblock
-#: dh_installchangelogs:78
+#: dh_installchangelogs:76
msgid "Install this file as the upstream changelog."
msgstr "installiert diese Datei als Änderungsprotokoll der Originalautoren."
@@ -5246,11 +5239,23 @@ msgstr ""
#. type: =item
#: dh_installinit:132
+#, fuzzy
+#| msgid "B<--no-start>"
+msgid "B<--upstart-only>"
+msgstr "B<--no-start>"
+
+#. type: textblock
+#: dh_installinit:134
+msgid "Deprecated option, ignored for compatibility."
+msgstr ""
+
+#. type: =item
+#: dh_installinit:136
msgid "B<--error-handler=>I<function>"
msgstr "B<--error-handler=>I<Funktion>"
#. type: textblock
-#: dh_installinit:134
+#: dh_installinit:138
msgid ""
"Call the named shell I<function> if running the init script fails. The "
"function should be provided in the F<prerm> and F<postinst> scripts, before "
@@ -5261,21 +5266,26 @@ msgstr ""
"F<postinst>-Skripten vor der Markierung B<#DEBHELPER#> bereitgestellt werden."
#. type: =head1
-#: dh_installinit:330
+#: dh_installinit:349
msgid "AUTHORS"
msgstr "AUTOREN"
#. type: textblock
-#: dh_installinit:334
+#: dh_installinit:353
msgid "Steve Langasek <steve.langasek at canonical.com>"
msgstr "Steve Langasek <steve.langasek at canonical.com>"
#. type: textblock
-#: dh_installinit:336
+#: dh_installinit:355
msgid "Michael Stapelberg <stapelberg at debian.org>"
msgstr "Michael Stapelberg <stapelberg at debian.org>"
#. type: textblock
+#: dh_installinit:357
+msgid "Scott James Remnant <scott at canonical.com>"
+msgstr ""
+
+#. type: textblock
#: dh_installlogcheck:5
msgid "dh_installlogcheck - install logcheck rulefiles into etc/logcheck/"
msgstr ""
@@ -5991,7 +6001,7 @@ msgstr "B<--priority=>I<Priorität>"
#: dh_installudev:47
#, fuzzy
#| msgid "Sets the priority number of a F<site-start.d> file. Default is 50."
-msgid "Sets the priority the file. Default is 60."
+msgid "Sets the priority the file. Default is 40."
msgstr ""
"setzt die Prioritätsnummer einer F<site-start.d>-Datei. Vorgabe ist 50."
@@ -7559,12 +7569,24 @@ msgstr "Debian-Richtlinie, Version 2.2"
msgid "Andrew Stribblehill <ads at debian.org>"
msgstr "Andrew Stribblehill <ads at debian.org>"
-#~ msgid "Sets the priority string of the F<rules.d> symlink. Default is 60."
+#, fuzzy
+#~| msgid "Sets the priority string of the F<rules.d> symlink. Default is 60."
+#~ msgid "Sets the priority string of the F<rules.d> symlink. Default is 40."
#~ msgstr ""
#~ "setzt die Prioritätszeichenkette des symbolischen F<rules.d>-Verweises. "
#~ "Vorgabe ist 60."
#~ msgid ""
+#~ "An upstream F<changelog> file may be specified as an option. If none is "
+#~ "specified, it looks for files with names that seem likely to be "
+#~ "changelogs. (In compatibility level 7 and above.)"
+#~ msgstr ""
+#~ "Optional könnte eine F<changelog>-Datei der Originalautoren angegeben "
+#~ "werden. Falls keine angegeben wurde, sucht es nach Dateien mit Namen, die "
+#~ "wahrscheinlich Änderungsdateien sein könnten (auf Kompatibilitätsstufe 7 "
+#~ "und darüber)."
+
+#~ msgid ""
#~ "dh_python - calculates Python dependencies and adds postinst and prerm "
#~ "Python scripts (deprecated)"
#~ msgstr ""
diff -pruN 9.20131227/man/po4a/po/es.po 9.20131227ubuntu1/man/po4a/po/es.po
--- 9.20131227/man/po4a/po/es.po 2013-12-28 01:53:55.000000000 +0000
+++ 9.20131227ubuntu1/man/po4a/po/es.po 2014-02-19 14:18:16.000000000 +0000
@@ -31,7 +31,7 @@ msgid ""
msgstr ""
"Project-Id-Version: debhelper 9.20120609\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-27 21:53-0400\n"
+"POT-Creation-Date: 2014-02-19 14:18+0000\n"
"PO-Revision-Date: 2012-08-20 11:17+0200\n"
"Last-Translator: Omar Campagne <ocampagne at gmail.com>\n"
"Language-Team: Debian l10n Spanish <debian-l10n-spanish at lists.debian.org>\n"
@@ -592,7 +592,7 @@ msgstr "No modifica los scripts F<postin
# type: =item
#. type: =item
-#: debhelper.pod:185 dh_compress:52 dh_install:81 dh_installchangelogs:71
+#: debhelper.pod:185 dh_compress:52 dh_install:81 dh_installchangelogs:69
#: dh_installdocs:80 dh_installexamples:41 dh_link:62 dh_makeshlibs:81
#: dh_md5sums:37 dh_shlibdeps:30 dh_strip:39
msgid "B<-X>I<item>, B<--exclude=>I<item>"
@@ -1369,7 +1369,7 @@ msgstr ""
# type: =head1
#. type: =head1
#: debhelper.pod:553 dh_auto_test:45 dh_installcatalogs:59 dh_installdocs:121
-#: dh_installemacsen:72 dh_installexamples:53 dh_installinit:140
+#: dh_installemacsen:72 dh_installexamples:53 dh_installinit:144
#: dh_installman:82 dh_installmodules:54 dh_installudev:55 dh_installwm:54
#: dh_installxfonts:37 dh_movefiles:64 dh_strip:68 dh_usrlocal:49
msgid "NOTES"
@@ -1739,10 +1739,10 @@ msgstr ""
#: dh_auto_configure:52 dh_auto_install:92 dh_auto_test:63 dh_bugfiles:124
#: dh_builddeb:124 dh_clean:142 dh_compress:210 dh_desktop:31 dh_fixperms:127
#: dh_gconf:101 dh_gencontrol:82 dh_icons:71 dh_install:260
-#: dh_installcatalogs:122 dh_installchangelogs:241 dh_installcron:79
+#: dh_installcatalogs:122 dh_installchangelogs:224 dh_installcron:79
#: dh_installdeb:142 dh_installdebconf:128 dh_installdirs:88
#: dh_installdocs:334 dh_installemacsen:141 dh_installexamples:108
-#: dh_installifupdown:71 dh_installinfo:77 dh_installinit:324
+#: dh_installifupdown:71 dh_installinfo:77 dh_installinit:343
#: dh_installlogcheck:80 dh_installlogrotate:52 dh_installman:263
#: dh_installmanpages:197 dh_installmenu:89 dh_installmime:63
#: dh_installmodules:115 dh_installpam:61 dh_installppp:67 dh_installudev:117
@@ -1784,7 +1784,7 @@ msgstr "Sitio web de Debhelper."
#: dh_auto_configure:58 dh_auto_install:98 dh_auto_test:69 dh_bugfiles:132
#: dh_builddeb:130 dh_clean:148 dh_compress:216 dh_desktop:37 dh_fixperms:133
#: dh_gconf:107 dh_gencontrol:88 dh_icons:77 dh_install:266
-#: dh_installcatalogs:128 dh_installchangelogs:247 dh_installcron:85
+#: dh_installcatalogs:128 dh_installchangelogs:230 dh_installcron:85
#: dh_installdeb:148 dh_installdebconf:134 dh_installdirs:94
#: dh_installdocs:340 dh_installemacsen:148 dh_installexamples:114
#: dh_installifupdown:77 dh_installinfo:83 dh_installlogcheck:86
@@ -1803,10 +1803,10 @@ msgstr "AUTOR"
#: debhelper.pod:699 dh:977 dh_auto_build:55 dh_auto_clean:58
#: dh_auto_configure:60 dh_auto_install:100 dh_auto_test:71 dh_builddeb:132
#: dh_clean:150 dh_compress:218 dh_fixperms:135 dh_gencontrol:90
-#: dh_install:268 dh_installchangelogs:249 dh_installcron:87 dh_installdeb:150
+#: dh_install:268 dh_installchangelogs:232 dh_installcron:87 dh_installdeb:150
#: dh_installdebconf:136 dh_installdirs:96 dh_installdocs:342
#: dh_installemacsen:150 dh_installexamples:116 dh_installifupdown:79
-#: dh_installinfo:85 dh_installinit:332 dh_installlogrotate:60
+#: dh_installinfo:85 dh_installinit:351 dh_installlogrotate:60
#: dh_installman:271 dh_installmanpages:205 dh_installmenu:99
#: dh_installmime:71 dh_installmodules:123 dh_installpam:69 dh_installppp:75
#: dh_installudev:125 dh_installwm:118 dh_installxfonts:97 dh_link:236
@@ -1904,7 +1904,7 @@ msgstr ""
#: dh:41 dh_auto_build:28 dh_auto_clean:30 dh_auto_configure:31
#: dh_auto_install:43 dh_auto_test:31 dh_bugfiles:50 dh_builddeb:24
#: dh_clean:41 dh_compress:48 dh_fixperms:31 dh_gconf:39 dh_gencontrol:26
-#: dh_icons:30 dh_install:59 dh_installcatalogs:49 dh_installchangelogs:59
+#: dh_icons:30 dh_install:59 dh_installcatalogs:49 dh_installchangelogs:57
#: dh_installcron:40 dh_installdebconf:61 dh_installdirs:31 dh_installdocs:71
#: dh_installemacsen:53 dh_installexamples:32 dh_installifupdown:39
#: dh_installinfo:31 dh_installinit:59 dh_installlogcheck:42
@@ -2542,10 +2542,10 @@ msgstr ""
#: dh:971 dh_auto_build:49 dh_auto_clean:52 dh_auto_configure:54
#: dh_auto_install:94 dh_auto_test:65 dh_builddeb:126 dh_clean:144
#: dh_compress:212 dh_fixperms:129 dh_gconf:103 dh_gencontrol:84
-#: dh_install:262 dh_installcatalogs:124 dh_installchangelogs:243
+#: dh_install:262 dh_installcatalogs:124 dh_installchangelogs:226
#: dh_installcron:81 dh_installdeb:144 dh_installdebconf:130 dh_installdirs:90
#: dh_installdocs:336 dh_installexamples:110 dh_installifupdown:73
-#: dh_installinfo:79 dh_installinit:326 dh_installlogcheck:82
+#: dh_installinfo:79 dh_installinit:345 dh_installlogcheck:82
#: dh_installlogrotate:54 dh_installman:265 dh_installmanpages:199
#: dh_installmime:65 dh_installmodules:117 dh_installpam:63 dh_installppp:69
#: dh_installudev:119 dh_installwm:112 dh_installxfonts:91 dh_link:230
@@ -2560,10 +2560,10 @@ msgstr "L<debhelper(7)>"
#: dh:973 dh_auto_build:51 dh_auto_clean:54 dh_auto_configure:56
#: dh_auto_install:96 dh_auto_test:67 dh_bugfiles:130 dh_builddeb:128
#: dh_clean:146 dh_compress:214 dh_desktop:35 dh_fixperms:131 dh_gconf:105
-#: dh_gencontrol:86 dh_icons:75 dh_install:264 dh_installchangelogs:245
+#: dh_gencontrol:86 dh_icons:75 dh_install:264 dh_installchangelogs:228
#: dh_installcron:83 dh_installdeb:146 dh_installdebconf:132 dh_installdirs:92
#: dh_installdocs:338 dh_installemacsen:146 dh_installexamples:112
-#: dh_installifupdown:75 dh_installinfo:81 dh_installinit:328
+#: dh_installifupdown:75 dh_installinfo:81 dh_installinit:347
#: dh_installlogrotate:56 dh_installman:267 dh_installmanpages:201
#: dh_installmenu:95 dh_installmime:67 dh_installmodules:119 dh_installpam:65
#: dh_installppp:71 dh_installudev:121 dh_installwm:114 dh_installxfonts:93
@@ -2971,7 +2971,7 @@ msgstr ""
#. type: =head1
#: dh_bugfiles:22 dh_clean:31 dh_compress:31 dh_gconf:23 dh_install:38
-#: dh_installcatalogs:35 dh_installchangelogs:35 dh_installcron:21
+#: dh_installcatalogs:35 dh_installchangelogs:33 dh_installcron:21
#: dh_installdeb:22 dh_installdebconf:34 dh_installdirs:21 dh_installdocs:21
#: dh_installemacsen:27 dh_installexamples:22 dh_installifupdown:22
#: dh_installinfo:21 dh_installinit:27 dh_installlogcheck:21 dh_installman:51
@@ -3224,7 +3224,7 @@ msgstr "Puede listar otros ficheros que
# type: =item
#. type: =item
-#: dh_clean:45 dh_installchangelogs:63
+#: dh_clean:45 dh_installchangelogs:61
msgid "B<-k>, B<--keep>"
msgstr "B<-k>, B<--keep>"
@@ -4110,7 +4110,7 @@ msgstr "No modifica los scripts F<postin
# type: textblock
#. type: textblock
#: dh_installcatalogs:61 dh_installdocs:127 dh_installemacsen:74
-#: dh_installinit:142 dh_installmodules:56 dh_installudev:57 dh_installwm:56
+#: dh_installinit:146 dh_installmodules:56 dh_installudev:57 dh_installwm:56
#: dh_usrlocal:51
msgid ""
"Note that this command is not idempotent. L<dh_prep(1)> should be called "
@@ -4165,19 +4165,12 @@ msgstr ""
#. type: textblock
#: dh_installchangelogs:21
-msgid ""
-"An upstream F<changelog> file may be specified as an option. If none is "
-"specified, it looks for files with names that seem likely to be changelogs. "
-"(In compatibility level 7 and above.)"
+msgid "An upstream F<changelog> file may be specified as an option."
msgstr ""
-"De forma opcional, puede definir un fichero F<changelog> de la fuente de "
-"software original. Si no se define, busca ficheros con nombres que indican "
-"la posibilidad de que sean ficheros de cambios (a partir del nivel 7 de "
-"compatibilidad y superior)."
# type: textblock
#. type: textblock
-#: dh_installchangelogs:25
+#: dh_installchangelogs:23
#, fuzzy
#| msgid ""
#| "Automatically installed into usr/share/doc/I<package>/ in the package "
@@ -4190,7 +4183,7 @@ msgstr ""
"construcción del paquete."
#. type: textblock
-#: dh_installchangelogs:28
+#: dh_installchangelogs:26
msgid ""
"If the upstream changelog is is a F<html> file (determined by file "
"extension), it will be installed as F<usr/share/doc/package/changelog.html> "
@@ -4201,28 +4194,28 @@ msgid ""
msgstr ""
#. type: =item
-#: dh_installchangelogs:39
+#: dh_installchangelogs:37
msgid "F<debian/changelog>"
msgstr "F<debian/changelog>"
#. type: =item
-#: dh_installchangelogs:41
+#: dh_installchangelogs:39
msgid "F<debian/NEWS>"
msgstr "F<debian/NEWS>"
#. type: =item
-#: dh_installchangelogs:43
+#: dh_installchangelogs:41
msgid "debian/I<package>.changelog"
msgstr "debian/I<paquete>.changelog"
#. type: =item
-#: dh_installchangelogs:45
+#: dh_installchangelogs:43
msgid "debian/I<package>.NEWS"
msgstr "debian/I<paquete>.NEWS"
# type: textblock
#. type: textblock
-#: dh_installchangelogs:47
+#: dh_installchangelogs:45
msgid ""
"Automatically installed into usr/share/doc/I<package>/ in the package build "
"directory."
@@ -4231,7 +4224,7 @@ msgstr ""
"construcción del paquete."
#. type: textblock
-#: dh_installchangelogs:50
+#: dh_installchangelogs:48
msgid ""
"Use the package specific name if I<package> needs a different F<NEWS> or "
"F<changelog> file."
@@ -4240,7 +4233,7 @@ msgstr ""
"F<changelog> o F<NEWS> diferente."
#. type: textblock
-#: dh_installchangelogs:53
+#: dh_installchangelogs:51
msgid ""
"The F<changelog> file is installed with a name of changelog for native "
"packages, and F<changelog.Debian> for non-native packages. The F<NEWS> file "
@@ -4252,7 +4245,7 @@ msgstr ""
# type: textblock
#. type: textblock
-#: dh_installchangelogs:65
+#: dh_installchangelogs:63
msgid ""
"Keep the original name of the upstream changelog. This will be accomplished "
"by installing the upstream changelog as F<changelog>, and making a symlink "
@@ -4269,7 +4262,7 @@ msgstr ""
# type: textblock
#. type: textblock
-#: dh_installchangelogs:73
+#: dh_installchangelogs:71
msgid ""
"Exclude upstream F<changelog> files that contain I<item> anywhere in their "
"filename from being installed."
@@ -4279,13 +4272,13 @@ msgstr ""
# type: =item
#. type: =item
-#: dh_installchangelogs:76
+#: dh_installchangelogs:74
msgid "I<upstream>"
msgstr "I<upstream>"
# type: textblock
#. type: textblock
-#: dh_installchangelogs:78
+#: dh_installchangelogs:76
msgid "Install this file as the upstream changelog."
msgstr ""
"Instala este fichero como el fichero de cambios del desarrollador principal."
@@ -5616,12 +5609,25 @@ msgstr ""
# type: =item
#. type: =item
#: dh_installinit:132
+#, fuzzy
+#| msgid "B<--no-start>"
+msgid "B<--upstart-only>"
+msgstr "B<--no-start>"
+
+#. type: textblock
+#: dh_installinit:134
+msgid "Deprecated option, ignored for compatibility."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: dh_installinit:136
msgid "B<--error-handler=>I<function>"
msgstr "B<--error-handler=>I<función>"
# type: textblock
#. type: textblock
-#: dh_installinit:134
+#: dh_installinit:138
msgid ""
"Call the named shell I<function> if running the init script fails. The "
"function should be provided in the F<prerm> and F<postinst> scripts, before "
@@ -5633,20 +5639,25 @@ msgstr ""
# type: =head1
#. type: =head1
-#: dh_installinit:330
+#: dh_installinit:349
msgid "AUTHORS"
msgstr "AUTORES"
#. type: textblock
-#: dh_installinit:334
+#: dh_installinit:353
msgid "Steve Langasek <steve.langasek at canonical.com>"
msgstr "Steve Langasek <steve.langasek at canonical.com>"
#. type: textblock
-#: dh_installinit:336
+#: dh_installinit:355
msgid "Michael Stapelberg <stapelberg at debian.org>"
msgstr ""
+#. type: textblock
+#: dh_installinit:357
+msgid "Scott James Remnant <scott at canonical.com>"
+msgstr ""
+
# type: textblock
#. type: textblock
#: dh_installlogcheck:5
@@ -6459,7 +6470,7 @@ msgstr "B<--priority=>I<prioridad>"
#: dh_installudev:47
#, fuzzy
#| msgid "Sets the priority number of a F<site-start.d> file. Default is 50."
-msgid "Sets the priority the file. Default is 60."
+msgid "Sets the priority the file. Default is 40."
msgstr ""
"Define el número de prioridad de un fichero F<site-start.d>. El número "
"predeterminado es 50."
@@ -8172,11 +8183,23 @@ msgid "Andrew Stribblehill <ads at debian.o
msgstr "Andrew Stribblehill <ads at debian.org>"
# type: textblock
-#~ msgid "Sets the priority string of the F<rules.d> symlink. Default is 60."
+#, fuzzy
+#~| msgid "Sets the priority string of the F<rules.d> symlink. Default is 60."
+#~ msgid "Sets the priority string of the F<rules.d> symlink. Default is 40."
#~ msgstr ""
#~ "Define la cadena para la prioridad del enlace simbólico de F<rules.d>. El "
#~ "valor predeterminado es 60."
+#~ msgid ""
+#~ "An upstream F<changelog> file may be specified as an option. If none is "
+#~ "specified, it looks for files with names that seem likely to be "
+#~ "changelogs. (In compatibility level 7 and above.)"
+#~ msgstr ""
+#~ "De forma opcional, puede definir un fichero F<changelog> de la fuente de "
+#~ "software original. Si no se define, busca ficheros con nombres que "
+#~ "indican la posibilidad de que sean ficheros de cambios (a partir del "
+#~ "nivel 7 de compatibilidad y superior)."
+
# type: textblock
#~ msgid ""
#~ "dh_python - calculates Python dependencies and adds postinst and prerm "
diff -pruN 9.20131227/man/po4a/po/fr.po 9.20131227ubuntu1/man/po4a/po/fr.po
--- 9.20131227/man/po4a/po/fr.po 2013-12-28 01:53:55.000000000 +0000
+++ 9.20131227ubuntu1/man/po4a/po/fr.po 2014-02-19 14:18:17.000000000 +0000
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: debhelper manpages\n"
-"POT-Creation-Date: 2013-12-27 21:53-0400\n"
+"POT-Creation-Date: 2014-02-19 14:18+0000\n"
"PO-Revision-Date: 2012-11-03 11:13-0400\n"
"Last-Translator: Valery Perrin <valery.perrin.debian at free.fr>\n"
"Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -575,7 +575,7 @@ msgstr ""
# type: =item
#. type: =item
-#: debhelper.pod:185 dh_compress:52 dh_install:81 dh_installchangelogs:71
+#: debhelper.pod:185 dh_compress:52 dh_install:81 dh_installchangelogs:69
#: dh_installdocs:80 dh_installexamples:41 dh_link:62 dh_makeshlibs:81
#: dh_md5sums:37 dh_shlibdeps:30 dh_strip:39
msgid "B<-X>I<item>, B<--exclude=>I<item>"
@@ -1366,7 +1366,7 @@ msgstr ""
# type: =head1
#. type: =head1
#: debhelper.pod:553 dh_auto_test:45 dh_installcatalogs:59 dh_installdocs:121
-#: dh_installemacsen:72 dh_installexamples:53 dh_installinit:140
+#: dh_installemacsen:72 dh_installexamples:53 dh_installinit:144
#: dh_installman:82 dh_installmodules:54 dh_installudev:55 dh_installwm:54
#: dh_installxfonts:37 dh_movefiles:64 dh_strip:68 dh_usrlocal:49
msgid "NOTES"
@@ -1739,10 +1739,10 @@ msgstr ""
#: dh_auto_configure:52 dh_auto_install:92 dh_auto_test:63 dh_bugfiles:124
#: dh_builddeb:124 dh_clean:142 dh_compress:210 dh_desktop:31 dh_fixperms:127
#: dh_gconf:101 dh_gencontrol:82 dh_icons:71 dh_install:260
-#: dh_installcatalogs:122 dh_installchangelogs:241 dh_installcron:79
+#: dh_installcatalogs:122 dh_installchangelogs:224 dh_installcron:79
#: dh_installdeb:142 dh_installdebconf:128 dh_installdirs:88
#: dh_installdocs:334 dh_installemacsen:141 dh_installexamples:108
-#: dh_installifupdown:71 dh_installinfo:77 dh_installinit:324
+#: dh_installifupdown:71 dh_installinfo:77 dh_installinit:343
#: dh_installlogcheck:80 dh_installlogrotate:52 dh_installman:263
#: dh_installmanpages:197 dh_installmenu:89 dh_installmime:63
#: dh_installmodules:115 dh_installpam:61 dh_installppp:67 dh_installudev:117
@@ -1785,7 +1785,7 @@ msgstr "Le site internet de debhelper."
#: dh_auto_configure:58 dh_auto_install:98 dh_auto_test:69 dh_bugfiles:132
#: dh_builddeb:130 dh_clean:148 dh_compress:216 dh_desktop:37 dh_fixperms:133
#: dh_gconf:107 dh_gencontrol:88 dh_icons:77 dh_install:266
-#: dh_installcatalogs:128 dh_installchangelogs:247 dh_installcron:85
+#: dh_installcatalogs:128 dh_installchangelogs:230 dh_installcron:85
#: dh_installdeb:148 dh_installdebconf:134 dh_installdirs:94
#: dh_installdocs:340 dh_installemacsen:148 dh_installexamples:114
#: dh_installifupdown:77 dh_installinfo:83 dh_installlogcheck:86
@@ -1804,10 +1804,10 @@ msgstr "AUTEUR"
#: debhelper.pod:699 dh:977 dh_auto_build:55 dh_auto_clean:58
#: dh_auto_configure:60 dh_auto_install:100 dh_auto_test:71 dh_builddeb:132
#: dh_clean:150 dh_compress:218 dh_fixperms:135 dh_gencontrol:90
-#: dh_install:268 dh_installchangelogs:249 dh_installcron:87 dh_installdeb:150
+#: dh_install:268 dh_installchangelogs:232 dh_installcron:87 dh_installdeb:150
#: dh_installdebconf:136 dh_installdirs:96 dh_installdocs:342
#: dh_installemacsen:150 dh_installexamples:116 dh_installifupdown:79
-#: dh_installinfo:85 dh_installinit:332 dh_installlogrotate:60
+#: dh_installinfo:85 dh_installinit:351 dh_installlogrotate:60
#: dh_installman:271 dh_installmanpages:205 dh_installmenu:99
#: dh_installmime:71 dh_installmodules:123 dh_installpam:69 dh_installppp:75
#: dh_installudev:125 dh_installwm:118 dh_installxfonts:97 dh_link:236
@@ -1910,7 +1910,7 @@ msgstr ""
#: dh:41 dh_auto_build:28 dh_auto_clean:30 dh_auto_configure:31
#: dh_auto_install:43 dh_auto_test:31 dh_bugfiles:50 dh_builddeb:24
#: dh_clean:41 dh_compress:48 dh_fixperms:31 dh_gconf:39 dh_gencontrol:26
-#: dh_icons:30 dh_install:59 dh_installcatalogs:49 dh_installchangelogs:59
+#: dh_icons:30 dh_install:59 dh_installcatalogs:49 dh_installchangelogs:57
#: dh_installcron:40 dh_installdebconf:61 dh_installdirs:31 dh_installdocs:71
#: dh_installemacsen:53 dh_installexamples:32 dh_installifupdown:39
#: dh_installinfo:31 dh_installinit:59 dh_installlogcheck:42
@@ -2591,10 +2591,10 @@ msgstr ""
#: dh:971 dh_auto_build:49 dh_auto_clean:52 dh_auto_configure:54
#: dh_auto_install:94 dh_auto_test:65 dh_builddeb:126 dh_clean:144
#: dh_compress:212 dh_fixperms:129 dh_gconf:103 dh_gencontrol:84
-#: dh_install:262 dh_installcatalogs:124 dh_installchangelogs:243
+#: dh_install:262 dh_installcatalogs:124 dh_installchangelogs:226
#: dh_installcron:81 dh_installdeb:144 dh_installdebconf:130 dh_installdirs:90
#: dh_installdocs:336 dh_installexamples:110 dh_installifupdown:73
-#: dh_installinfo:79 dh_installinit:326 dh_installlogcheck:82
+#: dh_installinfo:79 dh_installinit:345 dh_installlogcheck:82
#: dh_installlogrotate:54 dh_installman:265 dh_installmanpages:199
#: dh_installmime:65 dh_installmodules:117 dh_installpam:63 dh_installppp:69
#: dh_installudev:119 dh_installwm:112 dh_installxfonts:91 dh_link:230
@@ -2609,10 +2609,10 @@ msgstr "L<debhelper(7)>"
#: dh:973 dh_auto_build:51 dh_auto_clean:54 dh_auto_configure:56
#: dh_auto_install:96 dh_auto_test:67 dh_bugfiles:130 dh_builddeb:128
#: dh_clean:146 dh_compress:214 dh_desktop:35 dh_fixperms:131 dh_gconf:105
-#: dh_gencontrol:86 dh_icons:75 dh_install:264 dh_installchangelogs:245
+#: dh_gencontrol:86 dh_icons:75 dh_install:264 dh_installchangelogs:228
#: dh_installcron:83 dh_installdeb:146 dh_installdebconf:132 dh_installdirs:92
#: dh_installdocs:338 dh_installemacsen:146 dh_installexamples:112
-#: dh_installifupdown:75 dh_installinfo:81 dh_installinit:328
+#: dh_installifupdown:75 dh_installinfo:81 dh_installinit:347
#: dh_installlogrotate:56 dh_installman:267 dh_installmanpages:201
#: dh_installmenu:95 dh_installmime:67 dh_installmodules:119 dh_installpam:65
#: dh_installppp:71 dh_installudev:121 dh_installwm:114 dh_installxfonts:93
@@ -3053,7 +3053,7 @@ msgstr ""
# type: =head1
#. type: =head1
#: dh_bugfiles:22 dh_clean:31 dh_compress:31 dh_gconf:23 dh_install:38
-#: dh_installcatalogs:35 dh_installchangelogs:35 dh_installcron:21
+#: dh_installcatalogs:35 dh_installchangelogs:33 dh_installcron:21
#: dh_installdeb:22 dh_installdebconf:34 dh_installdirs:21 dh_installdocs:21
#: dh_installemacsen:27 dh_installexamples:22 dh_installifupdown:22
#: dh_installinfo:21 dh_installinit:27 dh_installlogcheck:21 dh_installman:51
@@ -3315,7 +3315,7 @@ msgstr "Permet d'indiquer d'autres fichi
# type: =item
#. type: =item
-#: dh_clean:45 dh_installchangelogs:63
+#: dh_clean:45 dh_installchangelogs:61
msgid "B<-k>, B<--keep>"
msgstr "B<-k>, B<--keep>"
@@ -4224,7 +4224,7 @@ msgstr ""
# type: textblock
#. type: textblock
#: dh_installcatalogs:61 dh_installdocs:127 dh_installemacsen:74
-#: dh_installinit:142 dh_installmodules:56 dh_installudev:57 dh_installwm:56
+#: dh_installinit:146 dh_installmodules:56 dh_installudev:57 dh_installwm:56
#: dh_usrlocal:51
msgid ""
"Note that this command is not idempotent. L<dh_prep(1)> should be called "
@@ -4278,21 +4278,14 @@ msgstr ""
"l'installation des journaux de suivi des modifications (changelog) dans le "
"répertoire de construction du paquet."
-# type: textblock
#. type: textblock
#: dh_installchangelogs:21
-msgid ""
-"An upstream F<changelog> file may be specified as an option. If none is "
-"specified, it looks for files with names that seem likely to be changelogs. "
-"(In compatibility level 7 and above.)"
+msgid "An upstream F<changelog> file may be specified as an option."
msgstr ""
-"Un journal amont des modifications (upstream F<changelog>) peut être indiqué "
-"en option. Si rien n'est indiqué, le processus cherche des fichiers portant "
-"des noms susceptibles d'être des changelogs. (à partir de la version 7)."
# type: textblock
#. type: textblock
-#: dh_installchangelogs:25
+#: dh_installchangelogs:23
#, fuzzy
#| msgid ""
#| "Automatically installed into usr/share/doc/I<package>/ in the package "
@@ -4305,7 +4298,7 @@ msgstr ""
"de construction du paquet."
#. type: textblock
-#: dh_installchangelogs:28
+#: dh_installchangelogs:26
msgid ""
"If the upstream changelog is is a F<html> file (determined by file "
"extension), it will be installed as F<usr/share/doc/package/changelog.html> "
@@ -4317,31 +4310,31 @@ msgstr ""
# type: =item
#. type: =item
-#: dh_installchangelogs:39
+#: dh_installchangelogs:37
msgid "F<debian/changelog>"
msgstr "F<debian/changelog>"
# type: =item
#. type: =item
-#: dh_installchangelogs:41
+#: dh_installchangelogs:39
msgid "F<debian/NEWS>"
msgstr "F<debian/NEWS>"
# type: =item
#. type: =item
-#: dh_installchangelogs:43
+#: dh_installchangelogs:41
msgid "debian/I<package>.changelog"
msgstr "debian/I<paquet>.changelog"
# type: =item
#. type: =item
-#: dh_installchangelogs:45
+#: dh_installchangelogs:43
msgid "debian/I<package>.NEWS"
msgstr "debian/I<paquet>.NEWS"
# type: textblock
#. type: textblock
-#: dh_installchangelogs:47
+#: dh_installchangelogs:45
msgid ""
"Automatically installed into usr/share/doc/I<package>/ in the package build "
"directory."
@@ -4351,7 +4344,7 @@ msgstr ""
# type: textblock
#. type: textblock
-#: dh_installchangelogs:50
+#: dh_installchangelogs:48
msgid ""
"Use the package specific name if I<package> needs a different F<NEWS> or "
"F<changelog> file."
@@ -4361,7 +4354,7 @@ msgstr ""
# type: textblock
#. type: textblock
-#: dh_installchangelogs:53
+#: dh_installchangelogs:51
msgid ""
"The F<changelog> file is installed with a name of changelog for native "
"packages, and F<changelog.Debian> for non-native packages. The F<NEWS> file "
@@ -4373,7 +4366,7 @@ msgstr ""
# type: textblock
#. type: textblock
-#: dh_installchangelogs:65
+#: dh_installchangelogs:63
msgid ""
"Keep the original name of the upstream changelog. This will be accomplished "
"by installing the upstream changelog as F<changelog>, and making a symlink "
@@ -4389,7 +4382,7 @@ msgstr ""
# type: textblock
#. type: textblock
-#: dh_installchangelogs:73
+#: dh_installchangelogs:71
msgid ""
"Exclude upstream F<changelog> files that contain I<item> anywhere in their "
"filename from being installed."
@@ -4399,13 +4392,13 @@ msgstr ""
# type: =item
#. type: =item
-#: dh_installchangelogs:76
+#: dh_installchangelogs:74
msgid "I<upstream>"
msgstr "I<journal-amont>"
# type: textblock
#. type: textblock
-#: dh_installchangelogs:78
+#: dh_installchangelogs:76
msgid "Install this file as the upstream changelog."
msgstr ""
"Installe ce fichier en tant que journal amont de suivi des modifications."
@@ -5769,12 +5762,25 @@ msgstr ""
# type: =item
#. type: =item
#: dh_installinit:132
+#, fuzzy
+#| msgid "B<--no-start>"
+msgid "B<--upstart-only>"
+msgstr "B<--no-start>"
+
+#. type: textblock
+#: dh_installinit:134
+msgid "Deprecated option, ignored for compatibility."
+msgstr ""
+
+# type: =item
+#. type: =item
+#: dh_installinit:136
msgid "B<--error-handler=>I<function>"
msgstr "B<--error-handler=>I<fonction>"
# type: textblock
#. type: textblock
-#: dh_installinit:134
+#: dh_installinit:138
msgid ""
"Call the named shell I<function> if running the init script fails. The "
"function should be provided in the F<prerm> and F<postinst> scripts, before "
@@ -5786,21 +5792,26 @@ msgstr ""
# type: =head1
#. type: =head1
-#: dh_installinit:330
+#: dh_installinit:349
msgid "AUTHORS"
msgstr "AUTEURS"
# type: textblock
#. type: textblock
-#: dh_installinit:334
+#: dh_installinit:353
msgid "Steve Langasek <steve.langasek at canonical.com>"
msgstr "Steve Langasek <steve.langasek at canonical.com>"
#. type: textblock
-#: dh_installinit:336
+#: dh_installinit:355
msgid "Michael Stapelberg <stapelberg at debian.org>"
msgstr "Michael Stapelberg <stapelberg at debian.org>"
+#. type: textblock
+#: dh_installinit:357
+msgid "Scott James Remnant <scott at canonical.com>"
+msgstr ""
+
# type: textblock
#. type: textblock
#: dh_installlogcheck:5
@@ -6641,7 +6652,7 @@ msgstr "B<--priority=>I<priorité>"
#: dh_installudev:47
#, fuzzy
#| msgid "Sets the priority number of a F<site-start.d> file. Default is 50."
-msgid "Sets the priority the file. Default is 60."
+msgid "Sets the priority the file. Default is 40."
msgstr ""
"Fixe le numéro de priorité du fichier F<site-start.d>. La valeur par défaut "
"est 50."
@@ -8393,13 +8404,26 @@ msgid "Andrew Stribblehill <ads at debian.o
msgstr "Andrew Stribblehill <ads at debian.org>"
# type: textblock
-#~ msgid "Sets the priority string of the F<rules.d> symlink. Default is 60."
+#, fuzzy
+#~| msgid "Sets the priority string of the F<rules.d> symlink. Default is 60."
+#~ msgid "Sets the priority string of the F<rules.d> symlink. Default is 40."
#~ msgstr ""
#~ "Fixe la priorité du lien symbolique des F<rules.d>. La valeur par défaut "
#~ "est 60."
# type: textblock
#~ msgid ""
+#~ "An upstream F<changelog> file may be specified as an option. If none is "
+#~ "specified, it looks for files with names that seem likely to be "
+#~ "changelogs. (In compatibility level 7 and above.)"
+#~ msgstr ""
+#~ "Un journal amont des modifications (upstream F<changelog>) peut être "
+#~ "indiqué en option. Si rien n'est indiqué, le processus cherche des "
+#~ "fichiers portant des noms susceptibles d'être des changelogs. (à partir "
+#~ "de la version 7)."
+
+# type: textblock
+#~ msgid ""
#~ "dh_python - calculates Python dependencies and adds postinst and prerm "
#~ "Python scripts (deprecated)"
#~ msgstr ""
More information about the debhelper-devel
mailing list