lp:~noskcaj/ubuntu/saucy/debhelper/saucy

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:ubuntu/saucy/debhelper

Colin Watson: Disapprove on 2013-08-29

Diff: 6293 lines (+1570/-1704)

18 files modified

Debian/Debhelper/Buildsystem/makefile.pm (+2/-2)
Debian/Debhelper/Buildsystem/python_distutils.pm (+1/-1)
Debian/Debhelper/Dh_Lib.pm (+1/-1)
debhelper.pod (+5/-0)
debian/changelog (+40/-0)
debian/copyright (+0/-4)
dh_clean (+2/-2)
dh_install (+2/-2)
dh_installdocs (+2/-1)
dh_installinit (+10/-1)
dh_python (+0/-292)
doc/TODO (+0/-1)
man/po4a/po/de.po (+287/-304)
man/po4a/po/debhelper.pot (+608/-430)
man/po4a/po/es.po (+303/-343)
man/po4a/po/fr.po (+306/-317)
man/po4a/po4a.cfg (+0/-1)
t/size (+1/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

103. By Jackson Doak on 2013-08-29

* Merge from Debian unstable. 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

102. By Colin Watson on 2013-07-01

* 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.

101. By Colin Watson on 2013-06-27

* 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.

100. By Colin Watson on 2013-06-05

* 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.

99. By Colin Watson on 2013-06-04

* 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.

98. By Colin Watson on 2013-05-24

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).

97. By Steve Langasek on 2013-05-18

* 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.

96. By Steve Langasek on 2013-05-18

releasing version 9.20120909ubuntu2

95. By Steve Langasek on 2013-05-18

Depend on the version of invoke-rc.d that supports upstart jobs directly,
without which invoke-rc.d will incorrectly use the sysvinit script instead
of the upstart job when starting the service.

94. By Steve Langasek on 2013-05-13

* 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.