feat: update devscripts to 2.25.19

Makefile.common

@@ -3,7 +3,8 @@ GEN_MAN1S := bts.1 build-rdeps.1 chdist.1 debcheckout.1 debcommit.1 \
 	     mk-build-deps.1 mk-origtargz.1 namecheck.1 rmadison.1 sadt.1 svnpath.1 \
 	     uscan.1 salsa.1 \
 	     tagpending.1 origtargz.1 transition-check.1 who-permits-upload.1 \
-	     git-deborig.1 hardening-check.1
+	     hardening-check.1
+GEN_MAN5S :=
 
 PREFIX = /usr
 BINDIR = $(PREFIX)/bin

README.md

@@ -115,7 +115,7 @@ And now, in alphabetical order, the scripts:
   can be performed by sbuild or other builders in a chroot environment created
   by debootsnap. The generated artifacts will be verified against the
   hashes from the buildinfo file.
-  [sbuild | mmdebstrap, python3-pycurl, libdpkg-perl]
+  [sbuild | mmdebstrap, python3-pycurl, libdpkg-perl, libstring-shellquote-perl]
 
 - debrepro: A script that tests reproducibility of Debian packages. It will
   build a given source directory twice, with a set of variation between the
@@ -191,10 +191,6 @@ And now, in alphabetical order, the scripts:
 
 - getbuildlog: download package build logs from Debian auto-builders. [wget]
 
-- git-deborig: try to produce Debian orig.tar using git-archive(1).
-  [libdpkg-perl, libgit-wrapper-perl, liblist-compare-perl,
-  libstring-shellquote-perl, libtry-tiny-perl]
-
 - grep-excuses: grep britney's excuses to find out what is happening to your
   packages. [libdbd-pg-perl, libterm-size-perl, libyaml-libyaml-perl, wget, w3m]
 

conf.default.in

@@ -555,11 +555,6 @@
 # Should we download newer upstream files we come across?
 # USCAN_DOWNLOAD=yes
 #
-# Should we use FTP PASV mode for ftp:// links?  'default' means let
-# Net::FTP(3) make the choice (primarily based on the FTP_PASSIVE
-# environment variable); 'yes' and 'no' override the default
-# USCAN_PASV=default
-#
 # Should we create a symlink from the downloaded tar.gz file to
 # pkg_version.orig.tar.gz, rename it like this or do nothing?
 # Options are 'symlink'/'yes', 'rename' or 'no'

debian/NEWS

@@ -1,3 +1,17 @@
+devscripts (2.25.18) unstable; urgency=medium
+
+  A fix (see #1100020) for archive naming issues in uscan required breaking
+  changes affecting a few debian/watch files:
+
+  - in default (LWP) mode, dirversionmangle rules that duplicate (implicit or
+    explicit) uversionmangle rules must now be removed
+
+  - in vcs (git and svn) HEAD modes, filenamemangle must now be used instead
+    of uversionmangle (as was previously suggested by the documentation) to
+    set a version number.
+
+ -- Julien Plissonneau Duquène <sre4ever@free.fr>  Wed, 13 Aug 2025 09:49:22 +0000
+
 devscripts (2.16.10) unstable; urgency=medium
 
   debuild's target mode (i.e. where it runs the specified debian/rules

debian/changelog

@@ -1,3 +1,178 @@
+devscripts (2.25.19) unstable; urgency=medium
+
+  [ Yadd ]
+  * Fix autopkgtest
+  * Indicates that debian/watch version 5 breaks dh-nodejs <= 0.16.0~
+  * Update French translation
+  * Dependencies:
+    * Move libio-string-perl from recommended dependencies to required ones
+    * Move libmetacpan-client-perl from suggested dependencies to recommended
+      ones
+    * Suggests libgitlab-api-v4-perl (needed by salsa)
+  * uscan:
+    - add "Untrackable" field to disable uscan + allow one paragraph
+    - in version=5, rename Pretty and Date into Git-Pretty and Git-Date
+    - set a default value for Matching-Pattern
+    - better error message when libmetacpan-client-perl is missing (Metacpan
+      template)
+    - group some duplicated code
+    - move "modes" into dedicated folder
+    - use debian/upstream/metadata if debian/watch is missing and a
+      corresponding template exists (Closes: #1111114)
+    - Templates:
+      * add template for npmjs.com registry
+      * add Gitlab template and mode
+      * fix component filenames in Github template
+      * update Github examples
+      * add "Release-Only" parameter for Github and Gitlab templates
+
+  [ Julien Plissonneau Duquène ]
+  * Update and fix french translations
+
+  [ наб ]
+  * uscan: mode=git: don't choke on signed commits
+
+ -- Yadd <yadd@debian.org>  Sat, 23 Aug 2025 01:47:47 +0200
+
+devscripts (2.25.18) unstable; urgency=medium
+
+  [ Yadd ]
+  * uscan:
+    - When --update-watchfile, try to use templates
+    - Add libmetacpan-client-perl into suggested packages
+    - Add metacpan autopkgtest (with restriction needs-internet)
+  * Update French translation
+
+  [ Sean Whitton ]
+  * Delete git-deborig that is moving to the git-debpush package
+    (Related: #1105759)
+    - Drop deps and recs on libgit-wrapper-perl, liblist-compare-perl,
+      libtry-tiny-perl
+  * Add Recommends on git-debpush
+  * README.md: debrebuild requires libstring-shellquote-perl
+
+  [ Hugh McMaster ]
+  * uscan:
+    - test/test_uscan_git: Convert tests to watch file Version 5 and refactor2
+    - uscan/WatchSource.pm: Remove boolean 'gitmodules' option
+    - uscan: Better handle Git-Modules: 'yes' and 'all' values
+    - uscan/Downloader.pm: Pass '--quiet' to git if not in verbose or debug mode
+    - uscan/git.pm: Pass '--quiet' to git if not in verbose or debug mode
+    - uscan/WatchSource.pm: Avoid leading whitespace in raw watch file output
+
+  [ Otto Kekäläinen ]
+  * dep-14-convert: Use 'upstream' as fallback if no merges found (Closes: #1110088)
+
+  [ Alexandre Detiste ]
+  * what-patch: Remove dead code testing for former removed patch systems
+
+  [ Bas Couwenberg ]
+  * debchange: trixie is now stable, forky is testing.
+
+  [ Julien Plissonneau Duquène ]
+  * uscan:
+    - Add a test case for using --download-version with version mangling in
+      git mode.
+    - Match unmangled versions against --download-version (Closes: #1100020)
+    - Add NEWS entry about d/watch breaking changes
+
+  [ Dorle Osterode ]
+  * (de) po4a/po/de.po: Update translation
+
+ -- Sean Whitton <spwhitton@spwhitton.name>  Fri, 15 Aug 2025 22:48:48 +0100
+
+devscripts (2.25.17) experimental; urgency=medium
+
+  [ наб ]
+  * uscan: add sample Forgejo (Codeberg) stanzas
+
+  [ James Cowgill ]
+  * mk-origtargz:
+    - Exclude empty directories when using Files-Included
+      (Closes: #1021287)
+    - Add a test for Files-Included-<component>
+    - Document --include-file option
+  * uscan:
+    - Fix indentation in copyright file examples
+    - Add an example using the Files-Included stanza (Closes: #977795)
+
+  [ Dorle Osterode ]
+  * (de) po4a/po/de.po: Update translation
+
+  [ Hugh McMaster ]
+  * .gitignore: Add scripts/dep-14-convert-git-branch-names
+  * test/test_uscan_git:
+    - Update watch file for version 5 syntax
+    - Use global variable 'MODULE1' for 'subrepo'
+    - Update some error messages
+
+  [ Yadd ]
+  * Replace gpg by gnupg and sopv by gpgv into test dependencies because
+    devscripts tests do not work with sequoia gpg (Closes: #1109607)
+  * uscan:
+    - Add "auto" values for Uversion-Mangle and Filename-Mangle
+    - Add macros @COMPONENT@, @SEMANTIC_VERSION@, @STABLE_VERSION@
+    - Fix some debug messages broken by v5
+    - Apply pagemangle also when searchmode=plain (Closes: #1057773)
+    - support overriding +~ delimiter for groups (Closes: #976829)
+    - add aliases: Version-Regex and Version-Pattern are aliases of
+      Matching-Pattern
+    - Fix doc for boolean option (Closes: #1109879)
+    - Fix Git-Modules option (Closes: #1109883)
+    - Drop pasv option: no effect for a while (Closes: #1109878)
+    - Add template engine
+      * Add GitHub template
+      * Add Metacpan template
+  * Update French translations
+
+  [ Niels Thykier ]
+  * uscan templates:
+    - Template/Github.pm:
+      * Set `pgpmode` to `none` by default
+      * Do not override `Search-Mode` if provided in the file
+    - Template/Metacpan.pm:
+      * Set `pgpmode` to `none` by default
+      * Do not override `source` if provided
+      * Allow `::` in metacpan dists
+    - Fix some undef warnings
+
+ -- Yadd <yadd@debian.org>  Mon, 28 Jul 2025 22:34:14 +0200
+
+devscripts (2.25.16) experimental; urgency=medium
+
+  [ Mechtilde ]
+  * Improved the German translation of the manpage for the tool bts
+
+  [ Nick Brown ]
+  * uscan: correct setting of request headers
+
+  [ Hugh McMaster ]
+  * uscan:
+    - uscan/Downloader.pm: Clone main git repository and submodules separately
+    - uscan/git.pm: Refactor code to clone versionless repositories with or
+      without submodules and refactor '$newversion' generation
+    - test/test_uscan_git: Update submodule test names
+    - test/test_uscan_git: Add tests to clone from HEAD with submodules
+
+  [ Yadd ]
+  * salsa:
+    - Use current repository if project is missing (check_repo, del_repo,
+      forks, last_ci_status, and merge_requests) and add "path" subcommand
+    - Add update_watch5 command to update debian/watch to version 5
+  * uscan
+    - Add more git debug
+    - Add recommended dependency to libio-string-perl (used by uscan/http)
+    - Better uscan test framework based on LWP::Protocol::PSGI
+    - Add new debian/watch format: version 5
+      * uscan: force Version-Schema to "group" for main watchsource when
+        Version-Schema is "checksum"
+      * Split uscan manpage and create debian-watch(5) [version 5] and
+        debian-watch-4(5) for previous formats
+    - Add liblwp-protocol-psgi-perl in autopkgtest dependencies
+  * Update French translation
+
+ -- Yadd <yadd@debian.org>  Sun, 20 Jul 2025 10:32:11 +0200
+
 devscripts (2.25.15) unstable; urgency=medium
 
   [ Yadd ]

debian/control

@@ -18,24 +18,24 @@ Build-Depends:
  faketime <!nocheck>,
  file <!nocheck>,
  git (>= 1:2.7.0) <!nocheck>,
- gpg <!nocheck>,
+ gnupg <!nocheck>,
  gpg-agent <!nocheck>,
+ gpgv <!nocheck>,
  help2man,
  isort <!nocheck>,
  libdistro-info-perl <!nocheck>,
  libdpkg-perl <!nocheck>,
  libfile-dirlist-perl <!nocheck>,
  libfile-homedir-perl <!nocheck>,
  libfile-touch-perl <!nocheck>,
- libgit-wrapper-perl <!nocheck>,
  libgitlab-api-v4-perl (>= 0.13) <!nocheck>,
+ libio-string-perl <!nocheck>,
  libjson-perl <!nocheck>,
- liblist-compare-perl <!nocheck>,
+ liblwp-protocol-psgi-perl <!nocheck>,
  libmoo-perl <!nocheck>,
  libstring-shellquote-perl <!nocheck>,
  libtest-output-perl <!nocheck>,
  libtimedate-perl <!nocheck>,
- libtry-tiny-perl <!nocheck>,
  liburi-perl <!nocheck>,
  libwww-perl <!nocheck>,
  lsb-release <!nocheck>,
@@ -58,7 +58,6 @@ Build-Depends:
  python3-unidiff <!nocheck>,
  python3-xdg <!nocheck>,
  shunit2 <!nocheck>,
- sopv <!nocheck> | gpgv <!nocheck>,
  subversion [!i386] <!nocheck>,
  unzip <!nocheck>,
  wdiff <!nocheck>,
@@ -83,6 +82,7 @@ Depends:
  libfile-dirlist-perl,
  libfile-homedir-perl,
  libfile-touch-perl,
+ libio-string-perl,
  libmoo-perl,
  libwww-perl,
  patchutils,
@@ -97,13 +97,12 @@ Recommends:
  apt (>= 1.3~pre3),
  dctrl-tools,
  dput | dupload,
+ git-debpush (>= 13.12),
  libdistro-info-perl,
  libencode-locale-perl,
- libgit-wrapper-perl,
  libjson-perl,
- liblist-compare-perl,
+ libmetacpan-client-perl,
  libstring-shellquote-perl,
- libtry-tiny-perl,
  liburi-perl,
  licensecheck,
  lintian,
@@ -141,6 +140,7 @@ Suggests:
  how-can-i-help,
  libauthen-sasl-perl,
  libdbd-pg-perl,
+ libgitlab-api-v4-perl (>= 0.13),
  libterm-size-perl,
  libtimedate-perl,
  libyaml-libyaml-perl,
@@ -161,6 +161,7 @@ Suggests:
 Breaks:
  hardening-includes,
  ubuntu-dev-tools (<< 0.147~),
+ dh-nodejs (<< 0.16.0~),
 Replaces:
  hardening-includes,
  ubuntu-dev-tools (<< 0.124~),

debian/copyright

@@ -239,10 +239,6 @@ Files: scripts/getbuildlog.*
 Copyright: 2008, Frank S. Thomas <fst@debian.org>
 License: GPL-2+
 
-Files: scripts/git-deborig*
-Copyright: 2016-2018, Sean Whitton <spwhitton@spwhitton.name>
-License: GPL-3+
-
 Files: scripts/grep-excuses.*
 Copyright: 2002, Joey Hess <joeyh@debian.org>
 License: GPL-2+

debian/manpages

@@ -3,3 +3,4 @@ po4a/de/*.5
 po4a/fr/*.1
 po4a/fr/*.5
 scripts/*.1
+scripts/*.5

debian/tests/control

@@ -7,9 +7,12 @@ Depends:
  faketime,
  git,
  gnupg,
+ gpgv,
  libdistro-info-perl,
  libgitlab-api-v4-perl,
+ libio-string-perl,
  libjson-perl,
+ liblwp-protocol-psgi-perl,
  libtest-output-perl,
  libwww-perl,
  lzip,
@@ -36,3 +39,20 @@ Restrictions:
  allow-stderr,
  breaks-testbed,
  needs-root,
+
+Tests:
+ metacpan,
+Depends:
+ debhelper,
+ gpgv,
+ libfile-dirlist-perl,
+ libfile-homedir-perl,
+ libfile-touch-perl,
+ libio-string-perl,
+ libjson-perl,
+ liblwp-protocol-psgi-perl,
+ libmetacpan-client-perl,
+ libwww-perl,
+Restrictions:
+ needs-internet,
+ allow-stderr,

debian/tests/metacpan

@@ -0,0 +1,4 @@
+#!/bin/sh
+set -e
+cd test
+TEST_INTERNET=1 prove -v -I../lib t/uscan.t