[debhelper-devel] [debhelper] 09/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 c5f8172e38f35cadc4ed38e173ed91fc132a2397
Merge: 91e0f3e 98265dd
Author: Niels Thykier <niels at thykier.net>
Date:   Fri May 15 18:32:00 2015 +0200

    Merge branch 'master' into super-cow-ddebs-support
    
    Conflicts:
    	debian/changelog

 debian/changelog  | 13 ++++++++
 dh_bugfiles       | 13 +++++---
 man/po4a/po/pt.po | 90 ++++++++++++++++++++++++++++++++++++-------------------
 3 files changed, 81 insertions(+), 35 deletions(-)

diff --cc debian/changelog
index eb2c211,c7454af..38349fd
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,16 +1,23 @@@
+ debhelper (9.20150507) unstable; urgency=medium
+ 
+   [ Niels Thykier ]
+   * dh_bugfiles: Fix regression in installing the reportbug
+     script correctly.  Thanks to Jakub Wilk for reporting.
+     (Closes: #784648)
+ 
+   [ Translation updates ]
+   * pt - Thanks to Américo Monteiro.
+     (Closes: #784582)
+ 
+  -- Niels Thykier <niels at thykier.net>  Thu, 07 May 2015 20:07:49 +0200
+ 
 +debhelper (9.20150502+ddebs) experimental; urgency=medium
 +
 +  * Add /experimental/ ddebs support *if* the environment
 +    variable DH_BUILD_DDEBS is set to 1.
 +
 + -- Niels Thykier <niels at thykier.net>  Sat, 02 May 2015 10:35:29 +0200
 +
  debhelper (9.20150502) unstable; urgency=medium
  
    * dh_compress: REVERT change to avoid compressing ".xhtml"

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