feat: update devscripts to 2.25.18

.gitignore

@@ -0,0 +1,143 @@
+*.pyc
+build-stamp-arch
+build-stamp-indep
+conf.default
+debian/*.debhelper
+debian/debhelper-build-stamp
+debian/devscripts.debhelper.log
+debian/devscripts.substvars
+debian/devscripts/
+debian/files
+doc/devscripts.7
+make_scripts
+po4a/fr/*.1
+po4a/fr/*.5
+po4a/fr/*.dbk
+po4a/fr/*.pl
+po4a/fr/*.pod
+po4a/de/*.1
+po4a/de/*.5
+po4a/de/*.dbk
+po4a/de/*.pl
+po4a/de/*.pod
+po4a/pt/*.1
+po4a/pt/*.5
+po4a/pt/*.dbk
+po4a/pt/*.pl
+po4a/pt/*.pod
+po4a/translate
+scripts/bash_completion/*
+scripts/annotate-output
+scripts/archpath
+scripts/bts
+scripts/bts.1
+scripts/build
+scripts/build-rdeps
+scripts/build-rdeps.1
+scripts/chdist
+scripts/chdist.1
+scripts/checkbashisms
+scripts/cowpoke
+scripts/dcmd
+scripts/dd-list
+scripts/deb-reversion
+scripts/deb-reversion.1
+scripts/deb-why-removed
+scripts/deb-why-removed.1
+scripts/deb2apptainer
+scripts/deb2docker
+scripts/debbisect.1
+scripts/debc
+scripts/debchange
+scripts/debcheckout
+scripts/debcheckout.1
+scripts/debclean
+scripts/debcommit
+scripts/debcommit.1
+scripts/debdiff
+scripts/debftbfs.1
+scripts/debi
+scripts/debian-watch-4.5
+scripts/debian-watch.5
+scripts/debootsnap.1
+scripts/debpkg
+scripts/debpkg-wrapper
+scripts/debrebuild
+scripts/debrebuild.1
+scripts/debrelease
+scripts/debrepro
+scripts/debrepro.1
+scripts/debrsign
+scripts/debsign
+scripts/debsnap
+scripts/debuild
+scripts/dep-14-convert-git-branch-names
+scripts/dep3changelog
+scripts/devscripts.chdist
+scripts/devscripts.debchange
+scripts/devscripts.debsign
+scripts/devscripts.egg-info
+scripts/devscripts.pkgnames
+scripts/devscripts.uupdate
+scripts/devscripts/__init__.py
+scripts/dget
+scripts/dget.1
+scripts/diff2patches
+scripts/dpkg-depcheck
+scripts/dpkg-genbuilddeps
+scripts/dscextract
+scripts/dscverify
+scripts/edit-patch
+scripts/getbuildlog
+scripts/grep-excuses
+scripts/hardening-check
+scripts/hardening-check.1
+scripts/libvfork.o
+scripts/libvfork.so.0
+scripts/list-unreleased
+scripts/ltnu
+scripts/ltnu.1
+scripts/manpage-alert
+scripts/mass-bug
+scripts/mass-bug.1
+scripts/mergechanges
+scripts/mk-origtargz
+scripts/mk-origtargz.1
+scripts/mk-build-deps
+scripts/mk-build-deps.1
+scripts/namecheck
+scripts/namecheck.1
+scripts/nmudiff
+scripts/origtargz
+scripts/origtargz.1
+scripts/plotchangelog
+scripts/pts-subscribe
+scripts/rc-alert
+scripts/reproducible-check.1
+scripts/rmadison
+scripts/rmadison.1
+scripts/run_bisect
+scripts/run_bisect_qemu
+scripts/sadt.1
+scripts/salsa
+scripts/salsa.1
+scripts/svnpath
+scripts/svnpath.1
+scripts/tagpending
+scripts/tagpending.1
+scripts/transition-check
+scripts/transition-check.1
+scripts/uscan
+scripts/uscan.1
+scripts/uscan-templates.5
+scripts/uupdate
+scripts/what-patch
+scripts/who-permits-upload
+scripts/who-permits-upload.1
+scripts/who-uploads
+scripts/whodepends
+scripts/wnpp-alert
+scripts/wnpp-check
+test-stamp
+translated_manpages
+version

.mailmap

@@ -0,0 +1,5 @@
+James McCoy <jamessan@debian.org>
+James McCoy <jamessan@debian.org> <vega.james@gmail.com>
+Johannes Schauer Marin Rodrigues <josch@mister-muffin.de>
+Johannes Schauer Marin Rodrigues <josch@mister-muffin.de> <j.schauer@email.de>
+Johannes Schauer Marin Rodrigues <josch@mister-muffin.de> <josch@debian.org>

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,123 @@
+devscripts (2.25.18) unstable; urgency=medium
+
+  [ Yadd ]
+  * uscan:
+    - When --update-watchfile, try to use templates
+    - Add libmetacpan-client-perl into suggested packages
+  * Update French translation
+
+  [ Sean Whitton ]
+  * Delete git-deborig.
+    Script is moving to the git-debpush package.  See #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.
+
+  [ 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
+
+ -- 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>,
@@ -97,13 +96,12 @@ Recommends:
  apt (>= 1.3~pre3),
  dctrl-tools,
  dput | dupload,
+ git-debpush (>= 13.12),
  libdistro-info-perl,
  libencode-locale-perl,
- libgit-wrapper-perl,
+ libio-string-perl,
  libjson-perl,
- liblist-compare-perl,
  libstring-shellquote-perl,
- libtry-tiny-perl,
  liburi-perl,
  licensecheck,
  lintian,
@@ -141,6 +139,7 @@ Suggests:
  how-can-i-help,
  libauthen-sasl-perl,
  libdbd-pg-perl,
+ libmetacpan-client-perl,
  libterm-size-perl,
  libtimedate-perl,
  libyaml-libyaml-perl,