feat: update devscripts to 2.25.15

Makefile

@@ -53,7 +53,7 @@ install: all install_scripts install_doc
 	for f in lib/*; do cp -a "$$f" "$(DESTDIR)$(PERLMOD_DIR)"; done
 	install -m0644 conf.default "$(DESTDIR)$(DATA_DIR)"
 	install -m0644 templates/README.mk-build-deps "$(DESTDIR)$(TEMPLATES_DIR)"
-	install -m0644 README "$(DESTDIR)$(DOCDIR)"
+	install -m0644 README.md "$(DESTDIR)$(DOCDIR)"
 	ln -sf edit-patch.1 "$(DESTDIR)$(MAN1DIR)/add-patch.1"
 
 test_test:

Makefile.common

@@ -1,5 +1,5 @@
 GEN_MAN1S := bts.1 build-rdeps.1 chdist.1 debcheckout.1 debcommit.1 \
-	     deb-reversion.1 desktop2menu.1 dget.1 mass-bug.1 \
+	     deb-reversion.1 dget.1 mass-bug.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 \
@@ -10,6 +10,7 @@ BINDIR = $(PREFIX)/bin
 DOCDIR = $(PREFIX)/share/doc/devscripts
 MAN1DIR = $(PREFIX)/share/man/man1
 MAN5DIR = $(PREFIX)/share/man/man5
+MAN7DIR = $(PREFIX)/share/man/man7
 PERLMOD_DIR = $(shell perl -MConfig -e 'print $$Config{vendorlib}')
 DATA_DIR = $(PREFIX)/share/devscripts
 TEMPLATES_DIR = $(DATA_DIR)/templates

README → README.md

@@ -33,8 +33,8 @@ And now, in alphabetical order, the scripts:
   SOAP interface of the BTS. [www-browser, libauthen-sasl-perl,
   libsoap-lite-perl, liburi-perl, libwww-perl, bsd-mailx | mailx]
 
-- build-rdeps: Searches for all packages that build-depend on a given package.
-  [dctrl-tools, dose-extra, libdpkg-perl]
+- build-rdeps: Searches for all packages that build-depend on a given
+  package. [dctrl-tools, dose-extra, libdpkg-perl]
 
 - chdist: tool to easily play with several distributions. [dctrl-tools]
 
@@ -45,24 +45,13 @@ And now, in alphabetical order, the scripts:
   optionally also signing and uploading the result to an incoming queue.
   [ssh-client]
 
-- cvs-debi, cvs-debc: wrappers around debi and debc respectively (see below)
-  which allow them to be called from the CVS working directory.
-  [cvs-buildpackage]
-
-- cvs-debrelease: wrapper around debrelease which allows it to be called
-  from the CVS working directory. [cvs-buildpackage, dupload | dput,
-  ssh-client]
-
-- cvs-debuild: A wrapper for cvs-buildpackage to use debuild as its package
-  building program. [cvs-buildpackage, lintian, gnupg |gnupg2]
-
 - dcmd: run a given command replacing the name of a .changes or .dsc file
   with each of the files referenced therein. *
 
 - dd-list: given a list of packages, pretty-print it ordered by maintainer. *
 
 - debbisect: bisect snapshot.debian.org to find which change in the archive
-  introduced a certain problem. [mmdebstrap, python3-debian]
+  introduced a certain problem. [debvm, mmdebstrap, python3-debian]
 
 - debc: List contents of current package.  Do this after a successful
   "debuild" to see if the package looks all right.
@@ -95,10 +84,14 @@ And now, in alphabetical order, the scripts:
 - debdiff-apply: Apply unified diffs of two Debian source packages, such as
   those generated by debdiff, to a target Debian source package. Any changes
   to debian/changelog are dealt with specially, to avoid the conflicts that
-  changelog diffs typically produce when applied naively. May be used to check
-  that old patches still apply to newer versions of those packages.
+  changelog diffs typically produce when applied naively. May be used to
+  check that old patches still apply to newer versions of those packages.
   [python3-debian, python3-unidiff, quilt]
 
+- debftbfs: list source packages which have FTBFS bugs filed against them
+  and print them with the bug number and title.
+  [postgresql-client, python3-debian, python3-debianbts]
+
 - debi: Installs the current package by using dpkg.  It assumes that the
   current package has just been built (for example by debuild), and the .deb
   lives in the parent directory, and will effectively run dpkg -i on the .deb.
@@ -110,14 +103,18 @@ And now, in alphabetical order, the scripts:
   to re-create a chroot from the past, for example to reproduce a bug. The
   tool is also used by debrebuild to build a package in a chroot with build
   dependencies in the same version as recorded in the buildinfo file.
-  [apt-utils, dpkg-dev, equivs, mmdebstrap, python3-pycurl]
+  [apt-utils, equivs, mmdebstrap, python3-debian, python3-pycurl,
+  python3-requests]
 
 - debrelease: A wrapper around dupload or dput which figures out which
   version to upload, and then calls dupload or dput to actually perform
   the upload. [dupload | dput, ssh-client]
 
-- debrebuild: A script that provided a .buildinfo file reports the
-  instructions on how to try to reproduce the reported build.
+- debrebuild: Given a buildinfo file, builds the referenced source package
+  in an environment documented in the provided buildinfo file. The build
+  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]
 
 - debrepro: A script that tests reproducibility of Debian packages. It will
@@ -130,14 +127,14 @@ And now, in alphabetical order, the scripts:
 
 - debrsign: This transfers a .changes/.dsc pair to a remote machine for
   signing, and runs debsign on the remote machine over an SSH connection.
-  [gnupg | gnupg2, debian-keyring, ssh-client]
+  [gnupg, debian-keyring, ssh-client]
 
 - debsign: Use GNU Privacy Guard to sign the changes (and possibly dsc)
   files created by running dpkg-buildpackage with no-sign options.  Useful
   if you are building a package on a remote machine and wish to sign it on
   a local one.  This script is capable of automatically downloading the
-  .changes and .dsc files from a remote machine. [gnupg |gnupg2,
-  debian-keyring, ssh-client]*
+  .changes and .dsc files from a remote machine. [gnupg, debian-keyring,
+  ssh-client]*
 
 - debsnap: grab packages from https://snapshot.debian.org [libwww-perl,
   libjson-perl]
@@ -146,7 +143,12 @@ And now, in alphabetical order, the scripts:
   avoid problems with insufficient permissions and wrong paths etc.
   Debuild will set up the proper environment for building a package.
   Debuild will also run lintian to check that the package does not
-  have any major policy violations. [lintian, gnupg | gnupg2]*
+  have any major policy violations. [lintian, gnupg]*
+
+- deb-check-file-conflicts: Check (using apt-file) if a
+  Debian package installs files in the exact same path as any other package, and
+  if there are Breaks/Replaces (or Conflicts) defined in debian/control to avoid
+  the package installation failing on file conflicts.
 
 - deb-janitor: command-line client for interacting with the Debian Janitor.
 
@@ -156,10 +158,14 @@ And now, in alphabetical order, the scripts:
 - deb-why-removed: shows the reason a package was removed from the archive.
   [libdpkg-perl]
 
+- deb2apptainer: build a Singularity/Apptainer image with given Debian
+  packages.
+
+- deb2docker: build a docker image with given Debian packages. [docker.io]
+
 - dep3changelog: generate a changelog entry from a DEP3-style patch header.
 
-- desktop2menu: given a freedesktop.org desktop file, generate a skeleton
-  for a menu file. [libfile-desktopentry-perl]
+- dep-14-convert-git-branch-name: Convert git branches to follow DEP-14.
 
 - dget: Downloads Debian source and binary packages. Point at a .changes or
   .dsc to download all references files. Specify a package name to download
@@ -174,13 +180,14 @@ And now, in alphabetical order, the scripts:
   when trying to determine the packages needed in the Build-Depends etc.
   lines in the debian/control file. [build-essential, strace]
 
-- dscextract: extract a single file from a Debian source package. [patchutils]
+- dscextract: extract a single file from a Debian source package.
+  [patchutils]
 
 - dscverify: check the signature and MD5 sums of a dsc file against the most
-  current Debian keyring on your system. [gnupg | gnupg2, debian-keyring]
+  current Debian keyring on your system. [gnupg, debian-keyring, debian-tag2upload-keyring]
 
 - edit-patch: add/edit a patch for a source package and commit the changes.
-  [quilt | dpatch | cdbs]
+  [quilt]
 
 - getbuildlog: download package build logs from Debian auto-builders. [wget]
 
@@ -189,7 +196,7 @@ And now, in alphabetical order, the scripts:
   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-syck-perl, wget, w3m]
+  packages. [libdbd-pg-perl, libterm-size-perl, libyaml-libyaml-perl, wget, w3m]
 
 - hardening-check: report the hardening characteristics of a set of binaries.
 
@@ -257,14 +264,14 @@ And now, in alphabetical order, the scripts:
 
 - transition-check: Check a list of source packages for involvement in
   transitions for which uploads to unstable are currently blocked.
-  [libwww-perl, libyaml-syck-perl]
+  [libwww-perl, libyaml-libyaml-perl]
 
 - uscan: Automatically scan for and download upstream updates.  Uscan can
   also call a program such as uupdate to attempt to update the Debianised
   version based on the new update.  Whilst uscan could be used to release
   the updated version automatically, it is probably better not to without
   testing it first.  Uscan can also verify detached OpenPGP signatures if
-  upstream's signing key is known. [file, gpgv | gpgv2, gnupg | gnupg2,
+  upstream's signing key is known. [file, sopv | gpgv,
   libfile-dirlist-perl, libfile-touch-perl, libfile-which-perl,
   liblwp-protocol-https-perl, libmoo-perl, libwww-perl, unzip, xz-utils]*
 
@@ -279,11 +286,10 @@ And now, in alphabetical order, the scripts:
 - whodepends: check which maintainers' packages depend on a package.
 
 - who-permits-upload: Retrieve information about Debian Maintainer access
-  control lists. [gnupg | gnupg2, libencode-locale-perl, libwww-perl,
-  debian-keyring]
+  control lists. [gnupg, libencode-locale-perl, libwww-perl, debian-keyring]
 
 - who-uploads: determine the most recent uploaders of a package to the Debian
-  archive. [gnupg | gnupg2, debian-keyring, debian-maintainers, wget]
+  archive. [gnupg, debian-keyring, debian-maintainers, wget]
 
 - wnpp-alert: list installed packages which are orphaned or up for adoption.
   [wget | curl]

README.newscripts

@@ -5,7 +5,7 @@ List of things to do when adding a new script to devscripts package:
      scripts/Makefile and patch it
    - if the script is perl and uses embedded POD for documentation, add an
      entry to the GEN_MAN1S variable in Makefile
-2. Add an entry in README
+2. Add an entry in README.md
 3. Add an entry in debian/control
 4. Add an entry in po4a/devscripts-po4a.conf
 5. Add any necessary entries to the Suggests: and Recommends: lines in
@@ -15,3 +15,5 @@ List of things to do when adding a new script to devscripts package:
 8. Add entries in .gitignore
 9. Add a changelog entry
 10. Add an entry in https://wiki.debian.org/Devscripts/bugs (and send to the BTS)
+11. For Python scripts, add the name to the SCRIPTS array in
+    scripts/devscripts/test/__init__.py

conf.default.in

@@ -127,27 +127,19 @@
 #
 # No variables currently; see cowpoke.conf and cowpoke(1)
 
-##### cvs-debc
-#
-# No variables currently
-
-##### cvs-debi
-#
-# No variables currently
-
-##### cvs-debrelease
+##### dd-list
 #
 # No variables currently
 
-##### cvs-debuild
+##### dcmd
 #
 # No variables currently
 
-##### dd-list
+##### deb2apptainer
 #
 # No variables currently
 
-##### dcmd
+##### deb2docker
 #
 # No variables currently
 
@@ -179,7 +171,7 @@
 # When appending to a multiple-maintainer changelog, if there are
 # existing changes made by the current maintainer, should new
 # changelog entries be appended to the existing entries?
-# DEBCHANGE_MULTIMAINT_MERGE=no
+# DEBCHANGE_MULTIMAINT_MERGE=yes
 #
 # When appending entries to the changelog, should the trailer line
 # be maintained as-is?
@@ -227,15 +219,15 @@
 # Strip a leading "* " from commit messages taken from changelogs?
 # DEBCOMMIT_STRIP_MESSAGE=yes
 #
-# Sign created tags using gnupg?
+# Sign created tags using OpenPGP?
 # DEBCOMMIT_SIGN_TAGS=no
 #
 # Take any uncommitted changes in the changelog in
 # to account when determining the commit message
 # for a release?
 # DEBCOMMIT_RELEASE_USE_CHANGELOG=no
 #
-# Sign commits using gnupg?
+# Sign commits using OpenPGP?
 # DEBCOMMIT_SIGN_COMMITS=no
 
 ##### debdiff
@@ -320,10 +312,10 @@
 # manpage.  Corresponds to -sgpg and -spgp.
 # DEBSIGN_SIGNLIKE=
 #
-# Maintainer name (only used to determine GPG keyid; -m option)
+# Maintainer name (only used to determine OpenPGP key ID; -m option)
 # DEBSIGN_MAINT=
 #
-# GPG keyid to use (-k option)
+# OpenPGP key ID to use (-k option)
 # DEBSIGN_KEYID=
 
 ##### debsnap
@@ -432,14 +424,14 @@
 # It pays attention to the values of DEBSIGN_MAINT and DEBSIGN_KEY in
 # addition to the following.
 #
-# This key ID takes precedence over the rest
+# This OpenPGP key ID takes precedence over the rest
 # DPKGSIG_KEYID=
 #
 # Do we sign the .changes and .dsc files?  See the manpage for more
 # info.  Valid options are no, auto, yes, full and force_full.
 # DPKGSIG_SIGN_CHANGES=auto
 #
-# Do we cache the gpg passphrase by default?  This can be dangerous!
+# Do we cache the OpenPGP passphrase by default?  This can be dangerous!
 # DPKGSIG_CACHE_PASS=no
 
 ##### dscverify
@@ -629,4 +621,3 @@
 ##### wnpp-check
 #
 # No variables currently
-

cowpoke.conf

@@ -32,7 +32,7 @@ BUILDD_HOST=
 # and temporary build directory will also be located under this path.
 #PBUILDER_BASE="/var/cache/pbuilder"
 
-# The gpg key id to pass to debsign's -k option.  eg. SIGN_KEYID="0x12345678"
+# The OpenPGP key ID to pass to debsign's -k option.  eg. SIGN_KEYID="0x12345678"
 # Leave this unset if you do not wish to sign packages built in this way.
 #SIGN_KEYID=