[devscripts] 03/08: merge

[Nicholas Bamber]

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

periapt pushed a commit to branch master
in repository devscripts.

commit 071acc571fb607b1ab1bb24d44cf0306ef0f8a10
Merge: 34e0b34 82b85b9
Author: Nicholas Bamber <nicholas at periapt.co.uk>
Date:   Thu Nov 12 11:42:35 2015 +0000

    merge

 debian/changelog        |  5 +++++
 scripts/licensecheck.pl | 16 ++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --cc debian/changelog
index cff2cf6,08d8870..81bd81b
--- a/debian/changelog
+++ b/debian/changelog
@@@ -4,18 -4,11 +4,23 @@@ devscripts (2.15.10) UNRELEASED; urgenc
    * test_uscan: Fix failure in testFileExclusion due to wrong tarfile name
      test on Ubuntu.
  
 +  [ Nicholas Bamber ]
 +  * Fixed issues with current bash completion (Closes: #804492)
 +    - Reorganised scripts/Makefile so that bash completion scripts
 +      are installed matching their command names - exception the
 +      generic pkgnames.bash_completion .
 +    - Where necessary added links to bash completion scripts
 +      to debian/links to reuse bash completion code
 +    - Removed deprecated "have" mechanism from bash completion scripts.
 +    - Removed undefined "$filenames" from chdist.bash_completion
 +    - Split debi.bash_completion off from pkgnames.bash_completion
 +      and added links for both debi/debc and corrected complete commands
 +
+   [ Dominique Dumont ]
+   * licensecheck: parse file matching -c regex whatever its mime
+     type (Closes: #803724)
+   * licensecheck: --text option is deprecated
+ 
   -- Benjamin Drung <bdrung at debian.org>  Fri, 23 Oct 2015 23:54:58 +0200
  
  devscripts (2.15.9) unstable; urgency=medium

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