[devscripts] 01/03: Merge tag 'v2.17.5' into jessie-backports
James McCoy
jamessan at debian.org
Thu May 25 03:55:30 UTC 2017
This is an automated email from the git hooks/post-receive script.
jamessan pushed a commit to branch jessie-backports
in repository devscripts.
commit cb8647bfd057073163e3fc4f5a6813b032c1b5b4
Merge: c24132d 5d65fe3
Author: James McCoy <jamessan at debian.org>
Date: Wed May 24 23:23:55 2017 -0400
Merge tag 'v2.17.5' into jessie-backports
tagging package devscripts version 2.17.5
.gitignore | 6 +-
Makefile.common | 5 +-
README | 21 +-
conf.default.in | 9 -
debian/NEWS | 10 +
debian/changelog | 396 +-
debian/control | 43 +-
debian/copyright | 3 +-
debian/postinst | 9 -
debian/tests/control | 2 +-
po4a/devscripts-po4a.conf | 6 +-
po4a/po/de.po | 8677 ++++++++++++++++--------
po4a/po/devscripts.pot | 6407 ++++++++++++------
po4a/po/fr.po | 8838 +++++++++++++++++--------
scripts/Makefile | 2 +-
scripts/bts.bash_completion | 17 +-
scripts/bts.pl | 41 +-
scripts/build-rdeps.pl | 40 +-
scripts/chdist.bash_completion | 24 +-
scripts/chdist.pl | 24 +-
scripts/checkbashisms.bash_completion | 18 +-
scripts/checkbashisms.pl | 2 +-
scripts/dcontrol.pl | 3 +-
scripts/dcut.bash_completion | 45 -
scripts/dd-list.pl | 4 +-
scripts/deb-reversion.sh | 10 +-
scripts/debc.1 | 3 +
scripts/debc.pl | 1 +
scripts/debchange.bash_completion | 58 +-
scripts/debchange.pl | 7 +-
scripts/debcheckout.pl | 2 +-
scripts/debclean.1 | 5 +-
scripts/debclean.sh | 11 +-
scripts/debcommit.pl | 8 +-
scripts/debdiff.1 | 2 +-
scripts/debdiff.bash_completion | 184 +-
scripts/debi.bash_completion | 12 +
scripts/debi.pl | 9 +-
scripts/debrepro.pod | 131 +
scripts/debrepro.sh | 202 +
scripts/debsign.1 | 64 +-
scripts/debsign.bash_completion | 37 +-
scripts/debsign.sh | 530 +-
scripts/debsnap.pl | 13 +-
scripts/debuild.1 | 69 +-
scripts/debuild.bash_completion | 18 +-
scripts/debuild.pl | 971 +--
scripts/desktop2menu.pl | 3 +-
scripts/dget.pl | 9 +-
scripts/dpkg-buildpackage-snapshot | 267 -
scripts/dscextract.bash_completion | 16 +-
scripts/dscverify.1 | 15 +-
scripts/dscverify.bash_completion | 18 +-
scripts/dscverify.pl | 35 +-
scripts/edit-patch.sh | 6 +-
scripts/git-deborig.pl | 186 +
scripts/grep-excuses.1 | 2 +-
scripts/grep-excuses.pl | 15 +-
scripts/licensecheck.bash_completion | 33 -
scripts/licensecheck.pl | 863 ---
scripts/list-unreleased.bash_completion | 12 +
scripts/mass-bug.pl | 2 +-
scripts/mergechanges.sh | 6 +-
scripts/mk-build-deps.pl | 2 +-
scripts/mk-origtargz.bash_completion | 5 +-
scripts/mk-origtargz.pl | 2 +-
scripts/namecheck.pl | 6 -
scripts/origtargz.pl | 18 +-
scripts/pkgnames.bash_completion | 12 +
scripts/plotchangelog.bash_completion | 28 +-
scripts/plotchangelog.pl | 3 +-
scripts/rc-alert.pl | 3 +-
scripts/rmadison.pl | 3 +-
scripts/sadt | 9 +-
scripts/suspicious-source | 1 +
scripts/tagpending.pl | 2 +-
scripts/transition-check.pl | 2 +-
scripts/uscan.bash_completion | 5 +-
scripts/uscan.pl | 96 +-
scripts/uupdate.bash_completion | 34 +-
scripts/uupdate.sh | 2 +-
scripts/what-patch.bash_completion | 12 +
scripts/who-permits-upload.pl | 4 +-
scripts/who-uploads.sh | 12 +-
scripts/wnpp-alert.sh | 12 +-
scripts/wrap-and-sort | 6 +
test/Makefile | 2 -
test/licensecheck/academic.h | 4 -
test/licensecheck/artistic-2-0-modules.pm | 239 -
test/licensecheck/artistic-2-0.txt | 206 -
test/licensecheck/beerware.cpp | 8 -
test/licensecheck/boost.h | 34 -
test/licensecheck/bsd-1-clause-1.c | 24 -
test/licensecheck/bsd-3-clause-authorsany.c | 11 -
test/licensecheck/bsd-3-clause.cpp | 26 -
test/licensecheck/bsd-regents.c | 30 -
test/licensecheck/bsd.f | 25 -
test/licensecheck/bug-559429 | 10 -
test/licensecheck/cddl.h | 26 -
test/licensecheck/comments-detection.h | 19 -
test/licensecheck/comments-detection.txt | 6 -
test/licensecheck/copr-iso8859.h | 18 -
test/licensecheck/copr-utf8.h | 20 -
test/licensecheck/dual.c | 21 -
test/licensecheck/duplicated-copyright.rb | 43 -
test/licensecheck/epl.h | 11 -
test/licensecheck/false-positives | 33 -
test/licensecheck/freetype.c | 16 -
test/licensecheck/gpl-1 | 15 -
test/licensecheck/gpl-2 | 10 -
test/licensecheck/gpl-2+ | 14 -
test/licensecheck/gpl-2+.scm | 14 -
test/licensecheck/gpl-2-comma.sh | 5 -
test/licensecheck/gpl-2-incorrect-address | 16 -
test/licensecheck/gpl-3+ | 11 -
test/licensecheck/gpl-3+-with-rem-comment.xml | 18 -
test/licensecheck/gpl-3+.el | 20 -
test/licensecheck/gpl-3-only.c | 12 -
test/licensecheck/gpl-3.sh | 14 -
test/licensecheck/gpl-no-version.h | 8 -
test/licensecheck/gpl-variation.c | 13 -
test/licensecheck/info-at-eof.h | 388 --
test/licensecheck/lgpl-2-3.c | 17 -
test/licensecheck/lgpl-2.1.c | 15 -
test/licensecheck/lgpl-2.1.h | 15 -
test/licensecheck/lgpl-2.s | 11 -
test/licensecheck/lgpl-3+.h | 13 -
test/licensecheck/lgpl-big-blue.h | 14 -
test/licensecheck/lgpl-by-dist-zilla.pl | 20 -
test/licensecheck/lgpl-digia.c | 32 -
test/licensecheck/lgpl-no-version.h | 8 -
test/licensecheck/lgpl-variation.c | 12 -
test/licensecheck/libuv-isc.am | 24 -
test/licensecheck/llgpl.lisp | 13 -
test/licensecheck/mpl-1.1.sh | 16 -
test/licensecheck/mpl-2.0-comma.sh | 5 -
test/licensecheck/mpl-2.0.sh | 5 -
test/licensecheck/multi-line-copyright.c | 25 -
test/licensecheck/regexp-killer.c | 20 -
test/licensecheck/texinfo.tex | 27 -
test/test_debchange | 4 +-
test/test_licensecheck | 171 -
test/test_licensecheck_SL | 83 -
test/test_package_lifecycle | 88 +-
test/test_uscan_mangle | 39 +-
145 files changed, 18723 insertions(+), 12110 deletions(-)
diff --cc debian/changelog
index 8bac2ca,0c32aaa..5a15ade
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,393 +1,399 @@@
+ devscripts (2.17.5) unstable; urgency=medium
+
+ * Create GNUPGHOME in /tmp to fix CI failures due to long path names.
+
+ -- James McCoy <jamessan at debian.org> Sat, 18 Mar 2017 21:18:46 -0400
+
+ devscripts (2.17.4) unstable; urgency=medium
+
+ * debsign:
+ + Don't try to sign a buildinfo file when one isn't listed in the
+ changes/dsc. (Closes: #857964)
+
+ -- James McCoy <jamessan at debian.org> Thu, 16 Mar 2017 22:41:27 -0400
+
+ devscripts (2.17.3) unstable; urgency=medium
+
+ * debsign:
+ + Fix auto-detection of the signer. Regression introduced in 2.17.2.
+ (Closes: #857537)
+ + Determine the names of related files from the file listings in
+ .changes/.buildinfo. (Closes: #857536)
+ + In remote mode, ensure files are copied locally before trying to use
+ them. Regression introduced in 2.17.2. (Closes: #857716)
+
+ -- James McCoy <jamessan at debian.org> Wed, 15 Mar 2017 23:28:00 -0400
+
+ devscripts (2.17.2) unstable; urgency=medium
+
+ [ James McCoy ]
+ * deb-reversion:
+ + Correct parsing of long-form --new-version switch. (Closes: #853919)
+ * grep-excuses:
+ + Improve robustness of HTML parsing to avoid issues like #856104, until
+ grep-excuses is converted to consume YAML.
+ * debsign:
+ + Add support for *.buildinfo files. Thanks to Ximin Luo and Guillem
+ Jover for the patches! (Closes: #855282)
+ * debian/tests/control: Add mozilla-devscripts to Depends, as needed by
+ mk-origtargz's tests.
+
+ [ Antonio Terceiro ]
+ * rc-alert:
+ + Add bug URL to the output.
+
+ [ Guillem Jover ]
+ * wrap-and-sort:
+ + Deal with Build-Conflicts-{Arch,Indep}, Build-Depends-Arch and
+ Built-Using fields. (Closes: #855433)
+
+ [ Mattia Rizzolo ]
+ * Remove Ryan Niebur from Uploaders after a request from the MIA Team.
+ Thank you for all your past contributions! (Closes: #856374)
+
+ -- James McCoy <jamessan at debian.org> Sun, 05 Mar 2017 22:23:37 -0500
+
+ devscripts (2.17.1) unstable; urgency=medium
+
+ [ Osamu Aoki ]
+ * uscan:
+ + PyPI packages location change. (Closes: #851590)
+
+ [ Guillem Jover ]
+ * dscverify:
+ + Add support for .buildinfo files. (Closes: #852801)
+
+ [ Mattia Rizzolo ]
+ * dscverify:
+ + Remove reference to the long gone debian-maintainers package.
+ * test_package_lifecycle:
+ + Import patch from Ubuntu to have the test pass on their builders too:
+ filter out output from pkg-create-dbgsym's dh_gencontrol wrapper, pass
+ --set-envvar=NO_PKG_MANGLE=1 to debuild, and pass -U to debchange.
+ * debian/tests/control:
+ + Depend on build-essential.
+
+ [ James McCoy ]
+ * test_package_lifecycle:
+ + Ignore debhelper's new "create-stamp" output to fix the test failure.
+ (Closes: #852918)
+
+ -- James McCoy <jamessan at debian.org> Wed, 01 Feb 2017 21:25:00 -0500
+
+ devscripts (2.17.0) unstable; urgency=medium
+
+ [ Sean Whitton ]
+ * New script: git-deborig, a wrapper around git-archive(1) to generate
+ Debian orig.tar files.
+
+ [ Paul Wise ]
+ * grep-excuses:
+ + Ignore new --- header line in autoremovals.yaml.cgi
+
+ [ James McCoy ]
+ * Check for existence of gpg/gpg2 in $PATH rather than absolute paths.
+ (Closes: #850655)
+ * wrap-and-sort:
+ + Support debian/clean files. (Closes: #850662)
+ * Remove bash completion for dcut, since src:dput will be providing it.
+ (Closes: #850684)
+ * dget:
+ + Verify exit status of “dpkg-source -x” and propagate failure. (Closes:
+ #850845)
+
+ -- James McCoy <jamessan at debian.org> Tue, 10 Jan 2017 23:21:45 -0500
+
+ devscripts (2.16.13) unstable; urgency=medium
+
+ [ Paul Wise ]
+ * uscan:
+ + Add .sign to the default OpenPGP extensions list
+
+ [ James McCoy ]
+ * debuild:
+ + Pass "-tc" through to dpkg-buildpackage instead of treating it as
+ "-t c". (Closes: #848210)
+
+ -- James McCoy <jamessan at debian.org> Thu, 15 Dec 2016 21:41:54 -0500
+
+ devscripts (2.16.12) unstable; urgency=medium
+
+ [ James McCoy ]
+ * mergechanges:
+ + Add handling for buildinfo files, based on a patch by Simon McVittie.
+ (Closes: #843470)
+ * debuild:
+ + Move invocation of lintian back into debuild. This restores the
+ behavior of ignoring the return code of lintian (Closes: #847168) and
+ only running lintian when it is present (Closes: #846711).
+
+ [ Antonio Terceiro ]
+ * debrepro:
+ + export NO_FAKE_STAT=1 when using faketime to avoid faking stat() calls
+ (see discussion in bug #846365)
+
+ -- James McCoy <jamessan at debian.org> Fri, 09 Dec 2016 17:24:12 -0500
+
+ devscripts (2.16.11) unstable; urgency=medium
+
+ [ James McCoy ]
+ * debuild:
+ + Avoid setting a hook to just "cd ..; ".
+ + Clear @ARGV if running lintian to avoid treating @ARGV as debian/rules
+ targets to run. (Closes: #846863)
+
+ [ Antonio Terceiro ]
+ * debclean:
+ + do not descend on subdirectories if current directory is already a
+ Debian source package.
+ + fix manpage to mention what exactly is executed on each directory (i.e.
+ debclean calls `debuild -- clean`, not `debian/rules clean`)
+ * debrepro:
+ + add -s/--skip option to skip any of the supported variations
+ (Closes: #846365)
+
+ -- James McCoy <jamessan at debian.org> Sun, 04 Dec 2016 21:19:15 -0500
+
+ devscripts (2.16.10) unstable; urgency=medium
+
+ [ Afif Elghraoui ]
+ * debcommit:
+ + Use standard version mangling for git tags. (Closes: #770187)
+
+ [ Antonio Terceiro ]
+ * debrepro:
+ + document exit status in manpage
+
+ [ James McCoy ]
+ * debuild:
+ + Fix mapping of debuild final-clean hook to dpkg-buildpackage's
+ postclean.
+ + Preserve SOURCE_DATE_EPOCH in the environment.
+ + Require a '--' between debuild options and debian/rules target so we
+ know where options end. (Closes: #845566)
+ + Adjust hook commands to account for dpkg-buildpackage running from a
+ different directory than debuild used for the lintian, signing, and
+ post-dpkg-buildpackage hooks. (Closes: #845628)
+
+ -- James McCoy <jamessan at debian.org> Sat, 26 Nov 2016 13:21:58 -0500
+
+ devscripts (2.16.9) unstable; urgency=medium
+
+ [ James McCoy ]
+ * debsnap:
+ + Fix "no binaries for given arch" detection so it doesn't download
+ binaries for unspecified archs. (Closes: #839533)
+ + Add handling for the --version switch, as advertised by --help.
+ (Closes: #839537)
+ * bts:
+ + Switch to Net::SMTPS to support STARTTLS. Based on a patch by Andrew
+ Shadura. (Closes: #518622)
+ * Refactor debuild to remove dpkg-buildpackage emulation and generally be a
+ much thinner wrapper around dpkg-buildpackage. (Closes: #789581)
+ + Remove claim from man page that dpkg-buildpackage doesn't support hooks.
+ (Closes: #765495)
+ + Remove handling of all dpkg-buildpackage options that aren't directly
+ used by debuild.
+ - This fixes the issue where debuild didn't understand "-Jauto", as
+ debuild now just passes it through. (Closes: #826508)
+ + Honor -a option regardless of which debuild mode is being used, since
+ both modes now invoke dpkg-buildpackage. (Closes: #611896)
+ + Bump dpkg-dev (Build-)Depends to 1.17.6 for dpkg-buildpackage's
+ --check-command and --hook-* options.
+ * Fix debuild test failures due to new dpkg-genbuildinfo calls.
+ (Closes: #844910)
+ * dscverify:
+ + Always display gpg output if --verbose is used, regardless of whether
+ verification succeeds. (Closes: #735416)
+
+ [ Antonio Terceiro ]
+ * debrepro:
+ + Don't vary the build path. See
+ https://wiki.debian.org/ReproducibleBuilds/History (section "Giving up
+ on build paths") for an explanation on why it is not currently feasible
+ to vary build paths for reproducible builds.
+ + convert mapage to POD
+ + in case of non-matching binaries, call diffoscope only on the .changes
+ files instead of on the .deb files. This way we even get diff in
+ .buildinfo between the builds.
+
+ [ Guillem Jover ]
+ * debrepro improvements (Closes: #841149):
+ + Simplify and make the vary() function more clear
+ + Use dpkg-buildpackage instead of ad-hoc code
+
+ [ Paul Wise ]
+ * who-uploads:
+ + Fix search for user IDs with gpg2 and no @debian.org user IDs (Closes:
+ #843961)
+ * uscan:
+ + Fix a mention of the location of the upstream signing key (Closes:
+ #842542)
+
+ [ Jochen Sprickerhof ]
+ * build-rdeps:
+ + add -q/--quiet option for use in scripts (Closes: #844327)
+
+ -- James McCoy <jamessan at debian.org> Wed, 23 Nov 2016 22:47:38 -0500
+
+ devscripts (2.16.8) unstable; urgency=medium
+
+ [ Paul Wise ]
+ * Add some more Debian development & QA tools to Suggests:
+ adequate autopkgtest bls-standalone check-all-the-things
+ duck how-can-i-help piuparts ratt
+
+ [ Antonio Terceiro ]
+ * New script: debrepro, a simple reproducibility tester specific for Debian
+ packages. (Closes: #786755)
+
+ [ James McCoy ]
+ * deb-reversion: Update md5sum of changelog if it's changed. (Closes:
+ #836725)
+ * Change Getopt::Long configuration to disable gnu_compat so an '=' isn't
+ required for optional arguments (e.g. "dch --news=").
+ * chdist:
+ + Silence warnings about uninitialized values. Thanks to Christoph Biedl
+ for the patch. (Closes: #838185)
+ + For compare-bin-packages, use the newest version of a package if
+ multiple versions exist. Thanks to Christoph Biedl for the patch.
+ (Closes: #838184)
+
+ -- James McCoy <jamessan at debian.org> Fri, 30 Sep 2016 22:17:07 -0400
+
+ devscripts (2.16.7) unstable; urgency=medium
+
+ [ Paul Wise ]
+ * grep-excuses:
+ + Fix the script for the removal of testing.pl from release.debian.org
+ * dscverify:
+ + Fix bash completion of the --no-conf option
+ * uscan:
+ + Strip whitespace from hrefs before processing (Closes: #833779)
+ + Debug mode: print hrefs before checking them
+ * Suggest reprotest for reproducible builds testing (Closes: #786755)
+
+ [ Jakub Wilk ]
+ * wnpp-alert:
+ + Use HTTPS.
+
+ [ Salvatore Bonaccorso ]
+ * debchange: Add support for buster and bullseye
+ * bts: Add the "bullseye" and "bullseye-ignore" tags.
+
+ [ Christoph Berg ]
+ * origtargz: Fix unpacking of tarballs found in --path.
+
+ [ James McCoy ]
+ * Remove . from @INC when loading modules dynamically. [CVE-2016-1238]
+ (Closes: #832441)
+
+ -- James McCoy <jamessan at debian.org> Mon, 22 Aug 2016 00:01:48 -0400
+
+ devscripts (2.16.6) unstable; urgency=medium
+
+ [ James McCoy ]
+ * uscan:
+ + Fix typo of "passive" in description of PASV FTP mode. Thanks to Yann
+ Dirson for the patch. (Closes: #826321)
+ + Fix an “undefined subroutine” error by using the, already imported, cwd
+ function instead of getcwd. (Closes: #827422)
+ * dd-list:
+ + Require an argument for ‘-s’ option, as intended, fixing a compatibility
+ issue with Perl 5.24's Getopt::Long. Thanks to Niko Tyni for the patch.
+ (Closes: #826401)
+ * debchange:
+ + Merging the existing changelog stanza when a package is UNRELEASED and
+ --newversion is used now also happens with --distribution. Thanks to
+ Ilias Tsitsimpi for the patch. (Closes: #826837)
+ * Replace git-import-orig references with gbp-import-orig. Thanks to Guido
+ Günther for the patch. (Closes: #828758)
+ * Remove licensecheck script and add a Recommends for the new licensecheck
+ package. (Closes: #828872)
+
+ [ Paul Wise ]
+ * uscan:
+ + Fix typo of "release" in description of git repository mode
+ * debsnap:
+ + Avoid an extra / in the srcfiles URL
+ * chdist:
+ + add support for apt and suggest it instead of apt-get
+
+ [ Antonio Terceiro ]
+ * debc:
+ + Added --list-debs option, which makes debc only list the filenames of
+ the .deb files, and none of their contents.
+
+ [ Osamu Aoki ]
+ * uscan:
+ + Fix watch file examples around pgpmode=none.
+
+ [ Jakub Wilk ]
+ * debcommit:
+ + Fix typo in the manual page.
+ * debdiff:
+ + Fix typo in the manual page.
+ * uscan:
+ + Fix gpgv existence check.
+ + Fix typos in the manual page.
+ * who-permits-upload:
+ + Fix typo in the manual page.
+ * README:
+ + Fix typo.
+
+ -- James McCoy <jamessan at debian.org> Sun, 03 Jul 2016 15:17:31 -0400
+
+ devscripts (2.16.5) unstable; urgency=medium
+
+ [ James McCoy ]
+ * uscan:
+ + Import catfile from File::Spec::Functions to fix use of unqualified
+ name. Thanks to Craig Small for the patch. (Closes: #823218)
+ + Use builtin die function when telling the user they don't have
+ LWP::UserAgent installed, instead of calling an undefined function.
+ (Closes: #826146)
+ * Declare compliance with policy 3.9.8, no changes needed.
+
+ [ Osamu Aoki ]
+ * uscan:
+ + Clarify --no-symlink meaning. (Closes: #819111)
+ + No output if upstream == debian and no errors. (Closes: #822649)
+ + Better @ANY_VERSION@ regex. (Closes: #821224)
+ * uupdate:
+ + Use "dpkg-source --skip-patches ..." with -f to prevent patches to be
+ applied. Thanks Herbert Parentes Fortes Neto. (Closes: #823350)
+ * test_package_lifecycle:
+ + Handle new output format for dpkg-dev utilities. (Closes: #825228)
+
+ [ Ben Finney ]
+ * scripts/*.bash_completion:
+ + Render U+0009 TAB to spaces.
+ + Normalise editor hints to preserve formatting.
+ + Standardise explanatory header block.
+ * debdiff:
+ + Include all options in Bash command completion. (Closes: #824372)
+ + Correct Bash completion for ‘--debs-dir’ option. (Closes: #824369)
+
+ [ Paul Wise ]
+ * licensecheck:
+ + Detect files containing "do not modify" as generated
+ + Detect files containing "Generated data" as generated
+ + Detect files containing "edit the original" as generated
+
+ [ Dominique Dumont ]
+ * licensecheck:
+ + added --deb-fmt option to use dep-5 license keywords (see #472199)
+ + parse "copyright-holders: John Doe" (See #820798)
+ + Parse "license: BSD-x-Clause" declaration (Closes: #820798)
+
+ -- James McCoy <jamessan at debian.org> Fri, 03 Jun 2016 21:14:43 -0400
+
+devscripts (2.16.4~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+
+ -- James McCoy <jamessan at debian.org> Fri, 29 Apr 2016 20:23:22 -0400
+
devscripts (2.16.4) unstable; urgency=medium
* mk-build-deps:
diff --cc debian/control
index 9670de2,52b774e..c69bc77
--- a/debian/control
+++ b/debian/control
@@@ -74,17 -78,25 +78,26 @@@ Recommends: apt
wget | curl,
xz-utils,
${vendor:Recommends}
- Suggests: bsd-mailx | mailx,
+ Suggests: adequate,
+ autopkgtest,
+ bls-standalone,
+ bsd-mailx | mailx,
build-essential,
+ check-all-the-things,
cvs-buildpackage,
+ debbindiff,
devscripts-el,
+ diffoscope,
+ disorderfs,
dose-extra (>= 4.0),
+ duck,
+ faketime,
gnuplot,
gpgv | gpgv2,
+ how-can-i-help,
libauthen-sasl-perl,
libfile-desktopentry-perl,
- libnet-smtp-ssl-perl,
+ libnet-smtps-perl,
libterm-size-perl,
libtimedate-perl,
libyaml-syck-perl,
diff --cc po4a/po/de.po
index f852ab0,d177e0f..730beb8
--- a/po4a/po/de.po
+++ b/po4a/po/de.po
@@@ -8879,8 -9058,8 +9058,8 @@@ msgstr "
"möglicherweise versehentlich zwischen zwei Revisionen des Pakets verloren "
"gingen. Es prüft außerdem die Dateibesitzer und Zugriffsrechte und "
"vergleicht die Steuerdateien der beiden Pakete mittels des Programms "
- "B<wdiff>. Falls Sie zwei Debian-Pakete genauer vergleichen wollen, können Sie "
- "das Werkzeug B<debbindiff> benutzen."
+ "B<wdiff>. Falls Sie zwei Debian-Pakete genauer vergleichen wollen, können "
-"Sie das Werkzeug B<diffoscope> benutzen."
++"Sie das Werkzeug B<debbindiff> benutzen."
#. type: Plain text
#: ../scripts/debdiff.1:29
@@@ -9452,16 -9662,16 +9662,16 @@@ msgstr "
"wird der Rückgabewert 255 sein."
#. type: Plain text
- #: ../scripts/debdiff.1:224
+ #: ../scripts/debdiff.1:241
msgid ""
"B<diffstat>(1), B<dpkg-deb>(1), B<interdiff>(1), B<wdiff>(1), B<devscripts."
-"conf>(5), B<diffoscope>(1)"
+"conf>(5), B<debbindiff>(1)"
msgstr ""
"B<diffstat>(1), B<dpkg-deb>(1), B<interdiff>(1), B<wdiff>(1), B<devscripts."
-"conf>(5), B<diffoscope>(1)"
+"conf>(5), B<debbindiff>(1)"
#. type: Plain text
- #: ../scripts/debdiff.1:229
+ #: ../scripts/debdiff.1:246
msgid ""
"B<debdiff> was originally written as a shell script by Yann Dirson "
"E<lt>dirson at debian.orgE<gt> and rewritten in Perl with many more features by "
@@@ -21579,50 -24514,4 +24514,4 @@@ msgid "
"maintainer Julian Gilbey E<lt>jdg at debian.orgE<gt>."
msgstr ""
"Diese Handbuchseite wurde für das Paket B<devscripts> durch den "
-"Paketbetreuer Julian Gilbey E<lt>jdg at debian.orgE<gt> geschrieben."
+"Paketbetreuer Julian Gilbey E<lt>jdg at debian.orgE<gt> geschrieben."
-
- #~ msgid ""
- #~ "As a special case, the unofficial B<gift> tag name is supported in "
- #~ "addition to official tag names. B<gift> is used as a shorthand for the "
- #~ "B<gift> usertag; see L<https://wiki.debian.org/qa.debian.org/GiftTag>. "
- #~ "Adding/removing the B<gift> tag will add/remove the B<gift> usertag, "
- #~ "belonging to the \"debian-qa at lists.debian.org\" user."
- #~ msgstr ""
- #~ "Als Sonderfall wird die inoffizielle Markierung B<gift> zusätzlich zu den "
- #~ "offiziellen Markierungsnamen unterstützt. B<gift> wird als Kurzschrift "
- #~ "für die Benutzermarkierung B<gift> verwendet; siehe L<https://wiki.debian."
- #~ "org/qa.debian.org/GiftTag>. Entfernen/Hinzufügen der Markierung B<gift> "
- #~ "wird die Benutzermarkierung B<gift> entfernen/hinzufügen, die zum "
- #~ "Benutzer »debian-qa at lists.debian.org« gehört."
-
- #~ msgid "B<--diff>"
- #~ msgstr "B<--diff>"
-
- #~ msgid ""
- #~ "Make orig.tar.gz symlinks to any downloaded files if their extensions are "
- #~ "I<.tar.gz> or I<.tgz>. This is also handled for orig.tar.bz2 (for "
- #~ "upstream I<.tar.bz2>, I<.tbz>, and I<.tbz2>), orig.tar.lzma (for upstream "
- #~ "I<.tar.lzma>, I<.tlz>, I<.tlzm>, and I<.tlzma>), and orig.tar.xz (for "
- #~ "upstream I<.tar.xz> and I<.txz>). (This is the default behaviour.)"
- #~ msgstr ""
- #~ "erstellt symbolische orig.tar.gz-Verweise zu allen heruntergeladenen "
- #~ "Dateien, falls ihre Erweiterungen I<.tar.gz> oder I<.tgz> sind. Dies wird "
- #~ "außerdem für orig.tar.bz2 (für I<.tar.bz2>, I<.tbz> und I<.tbz2> der "
- #~ "Ursprungsautoren), orig.tar.lzma (für I<.tar.lzma>, I<.tlz>, I<.tlzm> und "
- #~ "I<.tlzma> der Ursprungsautoren) und orig.tar.xz (für I<.tar.xz> und I<."
- #~ "txz> der Ursprungsautoren) so gehandhabt. (Dies ist das "
- #~ "Standardverhalten.)"
-
- #~ msgid ""
- #~ "Instead of symlinking, rename the downloaded files to their Debian I<orig."
- #~ "tar.gz>, I<orig.tar.bz2>, I<orig.tar.lzma>, or I<orig.tar.xz> names as "
- #~ "described above."
- #~ msgstr ""
- #~ "benennt, wie oben beschrieben, die heruntergeladenen Dateien in ihre "
- #~ "Debian-I<orig.tar.gz>-, -I<orig.tar.bz2>-, -I<orig.tar.lzma>- oder -"
- #~ "I<orig.tar.xz>-Namen um, anstatt symbolische Verweise darauf zu erstellen."
-
- #~ msgid "Don't make these symlinks and don't rename the files."
- #~ msgstr ""
- #~ "erstellt nicht diese symbolischen Verweise und benennt die Dateien nicht "
- #~ "um."
diff --cc po4a/po/devscripts.pot
index bd2e8a7,27696aa..bf6e28b
--- a/po4a/po/devscripts.pot
+++ b/po4a/po/devscripts.pot
@@@ -7251,10 -7418,10 +7418,10 @@@ msgid "
msgstr ""
#. type: Plain text
- #: ../scripts/debdiff.1:224
+ #: ../scripts/debdiff.1:241
msgid ""
"B<diffstat>(1), B<dpkg-deb>(1), B<interdiff>(1), B<wdiff>(1), "
-"B<devscripts.conf>(5), B<diffoscope>(1)"
+"B<devscripts.conf>(5), B<debbindiff>(1)"
msgstr ""
#. type: Plain text
diff --cc po4a/po/fr.po
index 760a3e3,d679ba0..4f48ce9
--- a/po4a/po/fr.po
+++ b/po4a/po/fr.po
@@@ -9464,16 -9686,16 +9686,16 @@@ msgstr "
"retour sera 255."
#. type: Plain text
- #: ../scripts/debdiff.1:224
+ #: ../scripts/debdiff.1:241
msgid ""
"B<diffstat>(1), B<dpkg-deb>(1), B<interdiff>(1), B<wdiff>(1), B<devscripts."
-"conf>(5), B<diffoscope>(1)"
+"conf>(5), B<debbindiff>(1)"
msgstr ""
"B<diffstat>(1), B<dpkg-deb>(1), B<interdiff>(1), B<wdiff>(1), B<devscripts."
-"conf>(5), B<diffoscope>(1)"
+"conf>(5), B<debbindiff>(1)"
#. type: Plain text
- #: ../scripts/debdiff.1:229
+ #: ../scripts/debdiff.1:246
msgid ""
"B<debdiff> was originally written as a shell script by Yann Dirson "
"E<lt>dirson at debian.orgE<gt> and rewritten in Perl with many more features by "
--
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