lp://staging/~ubuntu-branches/ubuntu/precise/debhelper/precise-201111050559

Branch merges

Propose for merging

No branches dependent on this one.

Rejected for merging into lp://staging/ubuntu/precise/debhelper

Ubuntu branches: Pending requested 2011-11-05

Diff: 27 lines (+13/-0) (has conflicts)

1 file modified

debian/changelog (+13/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

77. By Steve Langasek on 2011-11-04

mark debhelper Multi-Arch: foreign, so it's recognized as satisfying
cross-dependencies and cross-build-dependencies.

76. By Steve Langasek on 2011-10-16

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.

75. By Martin Pitt on 2011-10-16

merge 8.9.8 from Debian

74. By أحمد المحمودي (Ahmed El-Mahmoudy) on 2011-07-01

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

73. By Steve Langasek on 2011-05-20

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

72. By أحمد المحمودي (Ahmed El-Mahmoudy) on 2011-04-28

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

71. By Steve Langasek on 2011-03-21

debhelper.pod: v9 info was added in the wrong place by mistake; move it
to where it belongs so the manpage reads sensibly again.

70. By Steve Langasek on 2011-03-15

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.

69. By Steve Langasek on 2011-03-14

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

68. By أحمد المحمودي (Ahmed El-Mahmoudy) on 2011-02-15

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