[devscripts] 02/02: 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 94148cbe0ec0b1209c6ecc3a70467d29cd16ad2c
Merge: 79edb0a afd239b
Author: Dominique Dumont <dod at debian.org>
Date:   Mon Jun 8 21:29:12 2015 +0200

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

 conf.default.in              |   2 +-
 debian/changelog             |  18 ++++++++
 lib/Devscripts/Debbugs.pm    |  23 ++++++----
 lib/Devscripts/URI.pm        | 106 -------------------------------------------
 scripts/Makefile             |   1 -
 scripts/bts.pl               |  27 +++++++----
 scripts/dcut.bash_completion |  46 +++++++++++++++++++
 scripts/debdiff.pl           |  18 ++++----
 scripts/debuild.pl           |  11 ++++-
 scripts/rc-alert.1           |   4 +-
 scripts/rc-alert.pl          |  22 ++++++---
 scripts/uscan.1              |   4 +-
 scripts/uscan.pl             |   3 ++
 scripts/wnpp-alert.1         |   2 +-
 scripts/wnpp-alert.sh        |  14 +++++-
 15 files changed, 152 insertions(+), 149 deletions(-)

diff --cc debian/changelog
index c3254a6,cc284ad..314ea96
--- a/debian/changelog
+++ b/debian/changelog
@@@ -36,9 -47,14 +47,16 @@@ devscripts (2.15.5) UNRELEASED; urgency
      * support eclipse public license (Closes: #587892)
      * handle LGPL as written by IBM (Closes: #587970)
      * handle REM style comments (Closes: #748611)
 +  * uscan: use defined-or (//) instead of "||" to avoid loosing
 +    '0' version field (Closes: #787767)
  
+   [ Piotr Ożarowski ]
+   * uscan: Use pypi.debian.net redirector instead of
+     pypi.debian.org/packages/source URLs.  (Closes: #785746)
+ 
+   [ Hideki Yamane ]
+   * Add bash completion for dcut.  (Closes: #787321)
+ 
   -- Cyril Brulebois <kibi at debian.org>  Tue, 28 Apr 2015 16:58:36 +0200
  
  devscripts (2.15.4) unstable; urgency=medium

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