[devscripts] 01/02: Merge tag 'v2.14.11' into wheezy-backports

James McCoy jamessan at debian.org
Mon Dec 15 02:50:15 UTC 2014


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

jamessan pushed a commit to branch wheezy-backports
in repository devscripts.

commit 75a889f055659d09a4b50db50d460a04429cc845
Merge: abeda4d 68e6970
Author: James McCoy <jamessan at debian.org>
Date:   Sun Dec 14 20:53:11 2014 -0500

    Merge tag 'v2.14.11' into wheezy-backports
    
    tagging package devscripts version 2.14.11
    
    Format: 1.8
    Date: Wed, 03 Dec 2014 23:01:48 -0500
    Source: devscripts
    Binary: devscripts
    Architecture: source amd64
    Version: 2.14.11
    Distribution: unstable
    Urgency: medium
    Maintainer: James McCoy <jamessan at debian.org>
    Changed-By: James McCoy <jamessan at debian.org>
    Description:
     devscripts - scripts to make the life of a Debian Package maintainer easier
    Closes: 749729 766180 766516 766641 766885 768587
    Changes:
     devscripts (2.14.11) unstable; urgency=medium
     .
       [ Paul Wise ]
       * Suggest debbindiff for deep .deb comparisons
       * Use mirror.ftp-master instead of specific hostnames
     .
       [ James McCoy ]
       * debcommit: Correctly show --strip-message is the default in --help.
         (Closes: #766885)
       * mk-origtargz: Warn about unmatched Files-Excluded patterns.  (Closes:
         #766641)
       * annotate-output: Fix handling of a date format that contains whitespace.
         (Closes: #766180)
       * Fix regression in dpkg-architecture using scripts when only -a or -t is
         specified, rather than both or neither.  (Closes: #768587)
     .
       [ Jakub Wilk ]
       * sadt:
         + Fix handling of rw-build-tree restriction
         + Improve handling of non-executable test files.  When rw-build-tree is in
           effect, simply chmod the file.  Otherwise, attempt to chmod the file
           (skipping the test on failure) and restore the original permissions on
           completion.  (Closes: #749729)
     .
       [ Adam D. Barratt ]
       * debchange:
         + Fix handling of changelogs where the most recent trailer line does not
           include a maintainer name.  (Closes: #766516)
         + Add jessie-backports to the version mapping for --bpo.
       * bts: Support the "stretch", "buster", "stretch-ignore" and "buster-ignore"
         tags.
     .
       [ Stefano Zacchiroli ]
       * bts:
         + Support for the "newcomer" tag
         + Backward compatibility for the old "gift" usertag: drop
           documentation for it, but do both gift and newcomer (user)tagging for
           the time being
    Checksums-Sha1:
     1155e40c2bf660ba23a274c026cabc8f31fa5779 1242 devscripts_2.14.11.dsc
     abe0e9e9b67cd692b1cd68444986f7db3148a591 608372 devscripts_2.14.11.tar.xz
     928d29f278896add4990c6f881c7335563de6553 899322 devscripts_2.14.11_amd64.deb
    Checksums-Sha256:
     bf7d01af591fd1861e83388e690689b07df43c235509c0f9422cd66985921f33 1242 devscripts_2.14.11.dsc
     2fc98f4b00452e3dfb37f44d69e19824f6aa9621d7305067cf53c1eaa4bb8eed 608372 devscripts_2.14.11.tar.xz
     9b76712b7da359b8a8d8f396f7d937eac8a9f5575ce89bc51f42f2cf3037aa56 899322 devscripts_2.14.11_amd64.deb
    Files:
     4c569dae43870f20f1a087dbcb7d1f03 1242 devel optional devscripts_2.14.11.dsc
     7fa5e7fd2264e2c6101fb631d33cbf79 608372 devel optional devscripts_2.14.11.tar.xz
     53dab362dd2bf63a240d03e2980ef092 899322 devel optional devscripts_2.14.11_amd64.deb
    
    Signed-off-by: James McCoy <jamessan at debian.org>

 .mailmap                               |    2 +
 Devscripts/Compression.pm              |    3 +-
 Devscripts/PackageDeps.pm              |    2 +-
 Devscripts/Packages.pm                 |    2 +-
 Devscripts/Set.pm                      |    2 +-
 Devscripts/Versort.pm                  |    2 +-
 README                                 |    1 +
 conf.default.in                        |    2 +-
 cowpoke.conf                           |   42 +
 debian/changelog                       |  181 +++
 debian/control                         |    8 +-
 debian/copyright                       |    2 +-
 debian/postinst                        |    2 +-
 doc/wrap-and-sort.1                    |   13 +-
 examples/debian.procmail               |    2 +-
 examples/master.procmail               |    2 +-
 po4a/add_de/translator_man.add         |    2 +-
 po4a/add_fr/translator_man.add         |    2 +-
 po4a/po/de.po                          | 1989 ++++++++++++++++++++------------
 po4a/po/devscripts.pot                 | 1519 ++++++++++++++----------
 po4a/po/fr.po                          | 1877 +++++++++++++++++++-----------
 scripts/annotate-output.sh             |   12 +-
 scripts/archpath.sh                    |    2 +-
 scripts/bts.pl                         |   30 +-
 scripts/build-rdeps.pl                 |    3 +-
 scripts/chdist.pl                      |    2 +-
 scripts/checkbashisms.pl               |    2 +-
 scripts/cowpoke.1                      |  127 +-
 scripts/cowpoke.sh                     |  194 +++-
 scripts/cvs-debi.sh                    |   12 +-
 scripts/cvs-debrelease.sh              |   12 +-
 scripts/cvs-debuild.pl                 |    2 +-
 scripts/dcmd.1                         |   16 +-
 scripts/dcmd.sh                        |   30 +-
 scripts/dcontrol.pl                    |    6 +-
 scripts/dd-list.1                      |    2 +-
 scripts/dd-list.pl                     |    2 +-
 scripts/deb-reversion.sh               |    2 +
 scripts/debchange.1                    |    2 +-
 scripts/debchange.pl                   |   11 +-
 scripts/debcheckout.pl                 |   11 +-
 scripts/debcommit.pl                   |    4 +-
 scripts/debdiff.1                      |    5 +-
 scripts/debdiff.pl                     |    2 +
 scripts/debi.pl                        |   32 +-
 scripts/debpkg.pl                      |    2 +-
 scripts/debrelease.sh                  |   11 +-
 scripts/debrsign.sh                    |   12 +-
 scripts/debsign.sh                     |   32 +-
 scripts/debsnap.pl                     |    2 +-
 scripts/debuild.pl                     |   22 +-
 scripts/devscripts/test/test_pylint.py |    2 +-
 scripts/diff2patches.sh                |    2 +-
 scripts/dpkg-depcheck.pl               |    2 +-
 scripts/dscverify.pl                   |    2 +-
 scripts/grep-excuses.1                 |    2 +-
 scripts/grep-excuses.pl                |    7 +-
 scripts/licensecheck.pl                |    4 +-
 scripts/mass-bug.pl                    |    2 +-
 scripts/mergechanges.sh                |    2 +-
 scripts/mk-build-deps.pl               |   51 +-
 scripts/mk-origtargz.pl                |   53 +-
 scripts/namecheck.pl                   |    1 -
 scripts/nmudiff.sh                     |   10 +-
 scripts/origtargz.pl                   |    2 +-
 scripts/plotchangelog.pl               |    2 +-
 scripts/pts-subscribe.1                |    2 +-
 scripts/rc-alert.pl                    |    2 +-
 scripts/rmadison.pl                    |   29 +-
 scripts/sadt                           |   17 +-
 scripts/suspicious-source              |    6 +-
 scripts/uscan.1                        |   19 +-
 scripts/uscan.pl                       |   52 +-
 scripts/uupdate.sh                     |   20 +-
 scripts/who-permits-upload.pl          |    4 +-
 scripts/who-uploads.sh                 |    6 +-
 scripts/wnpp-alert.1                   |    2 +-
 scripts/wnpp-alert.sh                  |    2 +-
 scripts/wnpp-check.1                   |    2 +-
 scripts/wnpp-check.sh                  |    2 +-
 scripts/wrap-and-sort                  |   15 +-
 test/test_mk-origtargz                 |  123 +-
 test/test_uscan                        |   44 +-
 83 files changed, 4404 insertions(+), 2348 deletions(-)

diff --cc debian/changelog
index 6f9b108,2fef598..3822a58
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,15 -1,184 +1,196 @@@
+ devscripts (2.14.11) unstable; urgency=medium
+ 
+   [ Paul Wise ]
+   * Suggest debbindiff for deep .deb comparisons
+   * Use mirror.ftp-master instead of specific hostnames
+ 
+   [ James McCoy ]
+   * debcommit: Correctly show --strip-message is the default in --help.
+     (Closes: #766885)
+   * mk-origtargz: Warn about unmatched Files-Excluded patterns.  (Closes:
+     #766641)
+   * annotate-output: Fix handling of a date format that contains whitespace.
+     (Closes: #766180)
+   * Fix regression in dpkg-architecture using scripts when only -a or -t is
+     specified, rather than both or neither.  (Closes: #768587)
+ 
+   [ Jakub Wilk ]
+   * sadt:
+     + Fix handling of rw-build-tree restriction
+     + Improve handling of non-executable test files.  When rw-build-tree is in
+       effect, simply chmod the file.  Otherwise, attempt to chmod the file
+       (skipping the test on failure) and restore the original permissions on
+       completion.  (Closes: #749729)
+ 
+   [ Adam D. Barratt ]
+   * debchange:
+     + Fix handling of changelogs where the most recent trailer line does not
+       include a maintainer name.  (Closes: #766516)
+     + Add jessie-backports to the version mapping for --bpo.
+   * bts: Support the "stretch", "buster", "stretch-ignore" and "buster-ignore"
+     tags.
+ 
+   [ Stefano Zacchiroli ]
+   * bts:
+     + Support for the "newcomer" tag
+     + Backward compatibility for the old "gift" usertag: drop
+       documentation for it, but do both gift and newcomer (user)tagging for
+       the time being
+ 
+  -- James McCoy <jamessan at debian.org>  Wed, 03 Dec 2014 23:01:48 -0500
+ 
+ devscripts (2.14.10) unstable; urgency=medium
+ 
+   * Fix all the other calls to dpkg-architecture in devscripts.
+     (Closes: #764963 ... again)
+ 
+  -- James McCoy <jamessan at debian.org>  Mon, 13 Oct 2014 22:35:31 -0400
+ 
+ devscripts (2.14.9) unstable; urgency=medium
+ 
+   * debuild: Only pass -a/-t to dpkg-architecture when the user has specified
+     values for them.  (Closes: #764963)
+ 
+  -- James McCoy <jamessan at debian.org>  Sun, 12 Oct 2014 21:32:05 -0400
+ 
+ devscripts (2.14.8) unstable; urgency=medium
+ 
+   [ James McCoy ]
+   * uscan:
+     + Ensure $keyring is defined before trying to use it when checking whether
+       the upstream keyring exists.
+     + Strip the Referer header when using qa.debian.org's Sourceforge
+       redirector.  When there's a foreign Referer header, Sourceforge responds
+       with a web page containing a <meta refresh=...> redirect to the actual
+       file, causing uscan to save the web page rather than the file.  (Closes:
+       #764367)
+   * uupdate: When updating a 1.0 source format package, remove any symlinks in
+     the new upstream source before applying the Debian diff, restoring the
+     symlinks after.  This prevents patch from following the symlinks, which
+     may point to targets outside of the source tree, when applying the diff.
+     Thanks to Jakub Wilk for the discovery and suggested fix.
+     (Closes: #737160, CVE-2014-1833)
+ 
+   [ Ron Lee ]
+   * cowpoke: Add --sign and --upload command line overrides.
+ 
+  -- James McCoy <jamessan at debian.org>  Sat, 11 Oct 2014 00:22:34 -0400
+ 
+ devscripts (2.14.7) unstable; urgency=low
+ 
+   [ Cyril Brulebois ]
+   * deb-reversion: update change_version(), fixing the missing call_hook
+     statement in the udeb case. That was overlooked when the changelog
+     massaging was made conditional, and causes hooks to be ignored for
+     udebs. (Closes: #757425)
+ 
+   [ James McCoy ]
+   * debsign/debi/debc: Delay checking for the existence of the
+     --debs-dir/DEBRELEASE_DEBS_DIR directory until we get to code that
+     actually uses said directory.  (Closes: #544366)
+   * mk-build-deps: Pass the file, not package, names to unlink when --remove
+     is given.  (Closes: #757481)
+   * debcheckout: Always define $origtgz_name when a URL is specified on the
+     command line.  (Closes: #757614)
+   * dcmd: Add --debtar option and restrict --tar/--orig to orig.tar.*.  Thanks
+     to Osamu Aoki for the patch.  (Closes: #622561)
+   * grep-excuses: Remove useless call to “hostname --fqdn”.  (Closes: #758668)
+   * build-rdeps: Recognize arch-qualified package names.  Thanks to Stuart
+     Prescott for the patch.  (Closes: #757807)
+   * uscan:
+     + Consistently pass the path to the downloaded (and possibly
+       renamed/symlinked/…) file as an argument to the watch file's action
+       command.
+     + Add support for a repacksuffix option to the watch file.  This is passed
+       through to mk-origtargz.  (Closes: #753772)
+     + Specify Referer header when traversing http(s) sites.  Thanks to David
+       Prévot for the patch.  (Closes: #739137)
+   * mk-origtargz: Add a --repack-suffix option to adjust the upstream version
+     when the upstream sources are modified (e.g., due to Files-Excluded).
+   * bts: Don't send the email when the user saves an empty body for the email.
+     (Closes: #762888)
+ 
+   [ Benjamin Drung ]
+   * Remove unused build-dependencies libjson-perl and libterm-size-perl
+ 
+   [ Joachim Breitner ]
+   * mk-origtargz: Treat jars like zip files (Closes: #754203)
+ 
+   [ Dominique Dumont ]
+   * licensecheck: Check javascript files.  (Closes: #762070)
+ 
+  -- James McCoy <jamessan at debian.org>  Thu, 25 Sep 2014 20:49:15 -0400
+ 
+ devscripts (2.14.6) unstable; urgency=medium
+ 
+   [ Benjamin Drung ]
+   * suspicious-source: Add image/tiff, application/pgp-keys, and image/x-icon
+     to whitelisted mime-types. Add .gmo to whitelisted file extensions.
+   * wrap-and-sort: Add --max-line-length option with a default of 79 characters
+     (it was previously hard-coded to 80 characters).  (Closes: #756067)
+ 
+   [ Guillem Jover ]
+   * nmudiff: Send control messages inline.  (Closes: #752152)
+ 
+   [ Paul Wise ]
+   * rmadison: bpo madison is dead, remove it
+   * rmadison: add new to the defaults for Debian
+   * rmadison: document the defaults in the manual page
+ 
+   [ James McCoy ]
+   * namecheck: Remove berlios, since it no longer hosts code.  (Closes:
+     #752382)
+   * mk-build-deps:
+     + Provide the package name, not file name, to “dpkg --remove” when package
+       install fails.
+     + Read all of the output from “apt-cache showsrc” to ensure mk-build-deps
+       doesn't get stuck waiting for apt-cache to exit.
+     + Pass the name of the .deb file out of build_equiv to ensure the correct
+       .deb is installed.  (Closes: #753657)
+ 
+   [ Christoph Berg ]
+   * Update all qa.debian.org URLs to https://.
+ 
+   [ Ron Lee ]
+   * cowpoke:
+     + Allow more flexibility for specialised build chroots.
+       It's now possible to specify arbitrary 'dist' names, with arbitrary
+       special configurations on top of the real BASE_DIST suite.  This means
+       it's easy to have things like a chroot for wheezy-backports which will
+       be able to pull other deps from the backports repo, while still having
+       a pristine wheezy build chroot on the same build host.  Or to have a
+       staging chroot for unstable, with extra build deps pulled in from a
+       local repository, or installed manually, while still having a pristine
+       sid chroot for building other packages to upload.  And it all works the
+       same as normal, you just pass --dist=wheezy_bpo to select the chroot.
+     + Allow SIGN_KEYID and UPLOAD_QUEUE to be overridden per arch/dist.
+       This makes a lot more sense now that the above is easily possible.
+       People can use that for private or work (in progress) builds too, and
+       this can reduce the chance of accidentally uploading to the wrong place,
+       or signing some package not intended for upload with a key that would
+       would let it be accepted by dak.
+     + Better handling of --debbuildopts.  There were some corner cases for
+       this where the required quoting of options could be rather weird in the
+       intersection of all the layers it might get passed through. This should
+       make it more forgiving and better able to always DTRT.
+ 
+   [ David Prévot ]
+   * uscan.1: Use +dfsg suffix in examples
+ 
+  -- James McCoy <jamessan at debian.org>  Mon, 04 Aug 2014 22:34:17 -0400
+ 
 +devscripts (2.14.5~bpo70+2) wheezy-backports; urgency=medium
 +
 +  * Rebuild for wheezy-backports, and include previous changelog entries.
 +
 + -- James McCoy <jamessan at debian.org>  Mon, 16 Jun 2014 23:05:49 -0400
 +
 +devscripts (2.14.5~bpo70+1) wheezy-backports; urgency=medium
 +
 +  * Rebuild for wheezy-backports.
 +
 + -- James McCoy <jamessan at debian.org>  Mon, 16 Jun 2014 20:58:17 -0400
 +
  devscripts (2.14.5) unstable; urgency=medium
  
    * debchange:

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



More information about the devscripts-devel mailing list