[debhelper-devel] [debhelper] 24/28: Merge branch 'master' into super-cow-ddebs-support

[Niels Thykier]

This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository debhelper.

commit 129eed5e6eb192c383ec05c021d317293c492320
Merge: 14f5f20 49df738
Author: Niels Thykier <niels at thykier.net>
Date:   Mon Jun 15 20:07:41 2015 +0200

    Merge branch 'master' into super-cow-ddebs-support
    
    Conflicts:
    	Debian/Debhelper/Dh_Lib.pm
    	debian/changelog

 Debian/Debhelper/Buildsystem.pm | 36 ++++++++++++++++++++++++++++++++++++
 Debian/Debhelper/Dh_Lib.pm      | 23 ++++++++++++++---------
 debian/changelog                | 22 ++++++++++++++++++++++
 dh_auto_test                    |  3 +--
 dh_compress                     |  5 +++--
 dh_makeshlibs                   |  2 +-
 dh_usrlocal                     |  2 +-
 doc/PROGRAMMING                 |  6 ++++++
 8 files changed, 84 insertions(+), 15 deletions(-)

diff --cc Debian/Debhelper/Dh_Lib.pm
index b064f47,bba5a1b..34bd33e
--- a/Debian/Debhelper/Dh_Lib.pm
+++ b/Debian/Debhelper/Dh_Lib.pm
@@@ -21,7 -21,7 +21,7 @@@ use vars qw(@ISA @EXPORT %dh)
  	    &dpkg_architecture_value &sourcepackage &make_symlink
  	    &is_make_jobserver_unavailable &clean_jobserver_makeflags
  	    &cross_command &set_buildflags &get_buildoption
- 	    &install_dh_config_file &package_multiarch
 -	    &install_dh_config_file &error_exitcode
++	    &install_dh_config_file &error_exitcode &package_multiarch
  	    &install_file &install_prog &install_lib &install_dir
  );
  
diff --cc debian/changelog
index 5e60f31,b5aa3f0..f214eff
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,34 -1,25 +1,56 @@@
 +debhelper (9.20150520+ddebs) UNRELEASED; urgency=medium
 +
 +  * dh_gencontrol: Put ddebs in the "debugsym" section.
 +  * dh_strip: Support a new --[no-]ddebs option intended for
 +    packages to disable automatic ddebs.
 +  * dh_strip: Do not create ddebs for "-dbg" packages.
 +  * dh_builddeb: Let dpkg figure out the name of the ddebs
 +    itself now that ddebs uses a ".deb" extension.
 +
 + -- Niels Thykier <niels at thykier.net>  Mon, 25 May 2015 12:10:37 +0200
 +
 +debhelper (9.20150519+ddebs) experimental; urgency=medium
 +
 +  * dh_strip: Add --ddeb-migration option to support migration
 +    from a --dbg-package to a automatic ddeb.
 +  * Dh_Lib.pm: Add "package_multiarch" function.
 +  * d/control: Add versioned Build-Depends on dpkg-dev to support
 +    creating ddebs with the ".deb" extension.
 +  * Dh_lib.pm: Generate ddebs with the ".deb" extension.
 +  * dh_gencontrol: Reduce the "pkg:arch" to "pkg" as APT and dpkg
 +    disagree on what satisfies an "pkg:arch" dependency.
 +  * dh_strip.1: Document what inhibits ddeb generation.
 +  * dh_gencontrol: Only mark a ddeb as Multi-Arch: same if the
 +    original deb was Multi-Arch: same.  All other ddebs are now
 +    Multi-Arch: no (by omitting the field).
 +  * dh_strip: Avoid generating a ddeb if the same name as an
 +    explicitly declared package.  Apparently, Ubuntu has been
 +    creating some of these manually.
 +
 + -- Niels Thykier <niels at thykier.net>  Tue, 19 May 2015 21:56:55 +0200
 +
+ debhelper (9.20150508) UNRELEASED; urgency=medium
+ 
+   [ Niels Thykier ]
+   * Buildsystem.pm: Apply patch from Emmanuel Bourg to
+     provide doit_in_{build,source}dir_noerror methods.
+     (Closes: #785811)
+   * Dh_Lib.pm: Promote error_exitcode to a regular exported
+     subroutine (from an internal one).
+   * dh_compress: Apply patch from Osamu Aoki to avoid compressing
+     ".xhtml" files and to use a POSIX compliant find expression.
+     (Closes: #740405)
+   * dh_makeshlibs: Fix typo in manpage.  Thanks to Jakub Wilk for
+     reporting it.  (Closes: #788473)
+   * dh_auto_test: Run tests by default even during cross-building.
+     (Closes: #726967)
+ 
+   [ Thibaut Paumard ]
+   * Bug fix: "dh_usrlocal leaves directories behind", thanks to Andreas
+     Beckmann (Closes: #788098).
+ 
+  -- Niels Thykier <niels at thykier.net>  Wed, 20 May 2015 21:53:08 +0200
+ 
  debhelper (9.20150507) unstable; urgency=medium
  
    [ Niels Thykier ]

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debhelper/debhelper.git