[devscripts] 01/01: Merge branch 'multitar'

[Osamu Aoki]

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

osamu pushed a commit to branch master
in repository devscripts.

commit a056c0709b514a0c0f468fb150c87b83f682e894
Merge: 4d4d094 d798261
Author: Osamu Aoki <osamu at debian.org>
Date:   Fri Nov 13 21:21:09 2015 +0900

    Merge branch 'multitar'

 README                        |   21 +-
 debian/changelog              |   44 +-
 debian/control                |   24 +-
 po4a/devscripts-po4a.conf     |    4 +-
 scripts/Makefile              |    2 +-
 scripts/debsign.1             |    1 +
 scripts/debsign.sh            |    2 +
 scripts/dscverify.1           |    1 +
 scripts/dscverify.pl          |    3 +-
 scripts/mk-origtargz.pl       |   42 +-
 scripts/uscan.1               |  596 -------
 scripts/uscan.pl              | 3459 +++++++++++++++++++++++++++++++++--------
 scripts/uupdate.1             |   32 +-
 scripts/uupdate.sh            |  416 +++--
 scripts/who-permits-upload.pl |    4 +-
 scripts/who-uploads.1         |    2 +-
 scripts/who-uploads.sh        |   14 +-
 test/test_mk-origtargz        |    4 +-
 test/test_uscan               |    2 +-
 test/test_uscan_mangle        |  834 ++++++++--
 test/uscan/PRIVATE_KEY.asc    |  106 ++
 test/uscan/PUBLIC_KEY.asc     |   52 +
 test/uscan/server-head.py     |   22 +
 23 files changed, 4131 insertions(+), 1556 deletions(-)

diff --cc debian/changelog
index 2a67f50,0900b35..c9866d0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,50 +1,57 @@@
 -devscripts (2.15.9+multitar1) UNRELEASED; urgency=medium
 +devscripts (2.15.10) UNRELEASED; urgency=medium
  
 -  * Non-maintainer upload.
 +  [ Benjamin Drung ]
 +  * test_uscan: Fix failure in testFileExclusion due to wrong tarfile name
 +    test on Ubuntu.
 +
 +  [ Dominique Dumont ]
 +  * licensecheck: parse file matching -c regex whatever its mime
 +    type. Parse postscript with embedded binary (Closes: #803724)
 +  * licensecheck: --text option is deprecated
  
-  -- Benjamin Drung <bdrung at debian.org>  Fri, 23 Oct 2015 23:54:58 +0200
+   [ Osamu Aoki ]
+   * uscan:
+     + Start uupdate with --verbose as needed.  (Closes: #350454)
+     + Add test_uscan_mangle for testing the mangling rules and pgp signature.
+     + Add --download-debversion.  (Closes: #755754)
+     + Add pagemangle.  (Closes: #395439, #451051, #538717, #705989, #773390)
+     + Add oversionmangle as a part of multiple upstream tarball support.
+       (Closes: #458777)
+     + Add dirversionmangle with $download-version consideration with detailed
+       and sorted reporting of all available URLs.
+       (Closes: #363346, #375138, #472065, #516704, #557768, #734748)
+     + Add the multiple upstream tarball support and extend the OpenPGP support
+       with new watch line options: component, compression, repack, pgpmode,
+       versionmode, decompress.  (Closes: #526443, #531321, #549178, #731725,
+       #738977, #778723, #800704)
+     + Updated manpage contents and build it from POD.  (Closes: #409094,
+       #415680, #573631, #733272, #775526, #790629, #796293, #797787)
+     + Improve FTP listing handling. (Closes: #696492)
+     + Add the --overwrite-download, --skip-signature, and similar options
+       to reorganize behavior around existing downloaded files.
+       (Closes: #532182, #740366)
+     + Update filenamemangle to support the version pattern matching in any
+       position of the URL and remove .download hack which breaks 
+       mk-origtargz. (Closes: #526450, #803948, #804239)
+     + Reorganize the reporting by uscan and adjust its text strings.
+       (Closes: #582958)
+     + Add download compression ordering support to prefer xz over gz.
+       (Closes: #763071)
+     + Add generarized search regex support with @PACKAGE@ etc.
 -      (Closes: #517637, #539780)
++      and prioritize: tar.xz > tar.bz2 > tar.gz . (Closes: #517637, #539780)
+   * uupdate:
+     + Prevent failure when upstream version is 0.  (Closes: #798175)
+     + Work around missing debian.tar.gz for "3.0 (quilt)".  (Closes: 798133)
+     + Add multiple upstream tarball support and resolve minor bugs by using
+       dpkg-source as the backend.  (Closes: #278797, #544638, #570221, 
+       #752364, #797045)
+   * mk-origtargz:
+     + Support component name for the multiple upstream tarball support.
+     + Fix Files-Excluded for duplicate entries. (Closes: #762263)
+   * debian/control
+     + Add gnupg2/gpgv2 as alternative option to gnupg/gpgv.  (Closes: #788414)
+ 
+  -- Osamu Aoki <osamu at debian.org>  Wed, 07 Oct 2015 21:46:20 +0900
  
  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