[devscripts] 04/04: Merge branch 'master' of git+ssh://git.debian.org/git/collab-maint/devscripts

[dod at debian.org]

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

dod pushed a commit to branch master
in repository devscripts.

commit eac8aedf6caa5139267783f439c4d0ae31d28dab
Merge: bfbd20a 7e13e03
Author: Dominique Dumont <dod at debian.org>
Date:   Sun Jun 21 12:34:26 2015 +0200

    Merge branch 'master' of git+ssh://git.debian.org/git/collab-maint/devscripts
    
    Conflicts:
    	debian/changelog

 debian/changelog         | 21 +++++++++++++++++++--
 scripts/checkbashisms.pl |  4 ++--
 scripts/debcheckout.pl   |  1 +
 scripts/uscan.1          |  6 +++---
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --cc debian/changelog
index 0404aa7,44612a1..7450a2e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,24 +1,27 @@@
- devscripts (2.15.6) UNRELEASED; urgency=low
+ devscripts (2.15.6) UNRELEASED; urgency=medium
  
+   [ Paul Wise ]
+   * Adjust wording of common suffixes passed to repacksuffix
+ 
+   [ James McCoy ]
+   * debcheckout: Handle Launchpad Git URLs.  Thanks to Colin Watson for the
+     patch.  (Closes: #788777)
+   * checkbashisms: Fix unescaped, literal curly brace in regex, causing FTBFS
+     with Perl 5.22.  Thanks to Roderich Schupp for the patch.  (Closes:
+     #788707)
+ 
+   [ Dominique Dumont ]
 -  * licensecheck: fix BSD-2-clause detection
 +  * licensecheck:
 +    * extract © owner when © and owners are specified on 2 lines.
 +    * fix digia © and license extraction (Closes: #789074)
++    * fix BSD-2-clause detection
+ 
+   [ Mattia Rizzolo ]
+   * uscan: Suggest the correct syntax in the manpage for the dversionmangle
+     option, escaping a '+'. Thanks to Martin Erik Werner for reporting.
+     (Closes: #789389)
  
-  -- Dominique Dumont <dod at debian.org>  Fri, 19 Jun 2015 07:42:55 +0200
+  -- Paul Wise <pabs at debian.org>  Wed, 17 Jun 2015 09:51:15 +0800
  
  devscripts (2.15.5) unstable; urgency=low
  

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