diff --git a/devscripts-checkbashisms-early-fail.patch b/devscripts-checkbashisms-early-fail.patch deleted file mode 100644 index f2aeab4..0000000 --- a/devscripts-checkbashisms-early-fail.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff --git a/scripts/checkbashisms.1 b/scripts/checkbashisms.1 -index 6df5f3c7..1075408a 100644 ---- a/scripts/checkbashisms.1 -+++ b/scripts/checkbashisms.1 -@@ -44,6 +44,9 @@ which may be ignored. - For example, the use of "\fB$BASH_ENV\fR" may be preceded by checking - whether "\fB$BASH\fR" is set. - .TP -+.BR \-\-early-fail ", " \-e -+Exit right after a first error is seen. -+.TP - .BR \-\-version ", " \-v - Show version and copyright information. - .SH "EXIT VALUES" -diff --git a/scripts/checkbashisms.bash_completion b/scripts/checkbashisms.bash_completion -index 4ce5b521..b0e30fdf 100644 ---- a/scripts/checkbashisms.bash_completion -+++ b/scripts/checkbashisms.bash_completion -@@ -10,7 +10,7 @@ _checkbashisms() - _init_completion || return - - if [[ "$cur" == -* ]]; then -- COMPREPLY=( $( compgen -W '--newline --posix --force --extra' -- "$cur" ) ) -+ COMPREPLY=( $( compgen -W '--newline --posix --force --extra --early-fail' -- "$cur" ) ) - else - COMPREPLY=( $( compgen -o filenames -f -- "$cur" ) ) - fi -diff --git a/scripts/checkbashisms.pl b/scripts/checkbashisms.pl -index 653ec1bb..568e2c33 100755 ---- a/scripts/checkbashisms.pl -+++ b/scripts/checkbashisms.pl -@@ -30,7 +30,7 @@ sub init_hashes; - (my $progname = $0) =~ s|.*/||; - - my $usage = <<"EOF"; --Usage: $progname [-n] [-f] [-x] script ... -+Usage: $progname [-n] [-f] [-x] [-e] script ... - or: $progname --help - or: $progname --version - This script performs basic checks for the presence of bashisms -@@ -47,7 +47,7 @@ You are free to redistribute this code under the terms of the - GNU General Public License, version 2, or (at your option) any later version. - EOF - --my ($opt_echo, $opt_force, $opt_extra, $opt_posix); -+my ($opt_echo, $opt_force, $opt_extra, $opt_posix, $opt_early_fail); - my ($opt_help, $opt_version); - my @filenames; - -@@ -62,12 +62,13 @@ if (scalar(@ARGV) == 0 && (-p STDIN or -f STDIN)) { - $opt_help = 1 if int(@ARGV) == 0; - - GetOptions( -- "help|h" => \$opt_help, -- "version|v" => \$opt_version, -- "newline|n" => \$opt_echo, -- "force|f" => \$opt_force, -- "extra|x" => \$opt_extra, -- "posix|p" => \$opt_posix, -+ "help|h" => \$opt_help, -+ "version|v" => \$opt_version, -+ "newline|n" => \$opt_echo, -+ "force|f" => \$opt_force, -+ "extra|x" => \$opt_extra, -+ "posix|p" => \$opt_posix, -+ "early-fail|e" => \$opt_early_fail, - ) - or die - "Usage: $progname [options] filelist\nRun $progname --help for more details\n"; -@@ -543,6 +544,9 @@ sub output_explanation { - $issues = 1; - } else { - warn "possible bashism in $filename line $. ($explanation):\n$line\n"; -+ if ($opt_early_fail) { -+ exit 1; -+ } - $status |= 1; - } - } diff --git a/devscripts-fix-build.patch b/devscripts-fix-build.patch index 9d9f616..5790dea 100644 --- a/devscripts-fix-build.patch +++ b/devscripts-fix-build.patch @@ -1,6 +1,7 @@ -diff -paur a/Makefile b/Makefile ---- a/Makefile 2018-11-15 08:15:00.000000000 +0300 -+++ b/Makefile 2018-12-16 16:59:27.376872292 +0300 +Index: devscripts-v2.22.2/Makefile +=================================================================== +--- devscripts-v2.22.2.orig/Makefile ++++ devscripts-v2.22.2/Makefile @@ -4,7 +4,7 @@ include Makefile.common DESTDIR = @@ -10,37 +11,35 @@ diff -paur a/Makefile b/Makefile version: rm -f version -diff -paur a/Makefile.common b/Makefile.common ---- a/Makefile.common 2018-11-15 08:15:00.000000000 +0300 -+++ b/Makefile.common 2018-12-16 17:00:29.077661251 +0300 -@@ -13,3 +13,5 @@ PERLMOD_DIR = $(shell perl -MConfig -e ' +Index: devscripts-v2.22.2/Makefile.common +=================================================================== +--- devscripts-v2.22.2.orig/Makefile.common ++++ devscripts-v2.22.2/Makefile.common +@@ -14,3 +14,5 @@ PERLMOD_DIR = $(shell perl -MConfig -e ' DATA_DIR = $(PREFIX)/share/devscripts TEMPLATES_DIR = $(DATA_DIR)/templates SYSCONFDIR = /etc + +XSL_STYLESHEET = /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl -Только в b: Makefile.common.orig -Только в b: Makefile.common.rej -Только в b: Makefile.orig -Только в b: Makefile.rej -diff -paur a/po4a/Makefile b/po4a/Makefile ---- a/po4a/Makefile 2018-11-15 08:15:00.000000000 +0300 -+++ b/po4a/Makefile 2018-12-16 16:57:58.863740489 +0300 -@@ -40,8 +40,7 @@ fr/%.fr.1: fr/%.fr.pod translate - podchecker $< - pod2man --utf8 --center=" " --release="Utilitaires Debian" $< > $@ - fr/%.fr.1: fr/%.fr.dbk translate -- xsltproc --nonet -o $@ \ +Index: devscripts-v2.22.2/po4a/Makefile +=================================================================== +--- devscripts-v2.22.2.orig/po4a/Makefile ++++ devscripts-v2.22.2/po4a/Makefile +@@ -33,8 +33,7 @@ clean: ../doc/devscripts.1 + -podchecker $< + pod2man --utf8 --center=" " --release="$(DESC_$(dir $@))" $< > $@ + %.1:: %.dbk translate +- xsltproc --nonet \ - /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $< + xsltproc --nonet -o $@ $(XSL_STYLESHEET) $< - # xsltproc writes out to foo.1 even if you tell it to do otherwise, so we have - # to rename the file after it's generated - mv fr/$*.1 $@ -Только в b/po4a: Makefile.orig -diff -paur a/scripts/Makefile b/scripts/Makefile ---- a/scripts/Makefile 2018-11-15 08:15:00.000000000 +0300 -+++ b/scripts/Makefile 2018-12-16 17:02:23.223120806 +0300 -@@ -81,8 +81,7 @@ endif + # /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/other.xsl + # (which is imported by the above stylesheet) insists in writing the output + # to where it wants to. we can only move the file ourselves. +Index: devscripts-v2.22.2/scripts/Makefile +=================================================================== +--- devscripts-v2.22.2.orig/scripts/Makefile ++++ devscripts-v2.22.2/scripts/Makefile +@@ -87,8 +87,7 @@ endif podchecker $< pod2man --utf8 --center=" " --release="Debian Utilities" $< > $@ %.1: %.dbk @@ -50,5 +49,3 @@ diff -paur a/scripts/Makefile b/scripts/Makefile # Syntax checker test_sh: $(SH_CHECKS) -Только в b/scripts: Makefile.orig -Только в b/scripts: Makefile.rej diff --git a/devscripts-v2.19.5.tar.bz2 b/devscripts-v2.19.5.tar.bz2 deleted file mode 100644 index 336523c..0000000 --- a/devscripts-v2.19.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:30344ce41f553ce01bc9f71b4e539d0833900267d77e65710959b1ec0f00c2ca -size 1102199 diff --git a/devscripts-v2.22.2.tar.bz2 b/devscripts-v2.22.2.tar.bz2 new file mode 100644 index 0000000..6b88fc6 --- /dev/null +++ b/devscripts-v2.22.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c81823ecb906aa421e78c8efda05bc76126466421a7587e66a3c2dd1ed906909 +size 1378584 diff --git a/devscripts.changes b/devscripts.changes index 65d8edf..165edf2 100644 --- a/devscripts.changes +++ b/devscripts.changes @@ -1,3 +1,65 @@ +------------------------------------------------------------------- +Tue Jul 12 09:38:54 UTC 2022 - Dirk Müller + +- update to 2.22.2: + * who-permits-upload: + + Fix fingerprint lookup, so it actually finds the user id + * debsnap: + + Add a -l option as the short version of --list. Closes: #1006904 + * sadt: + + Run autodep8 when looking for autopkgtests to run. + * deprepro: + + Add new options, to make it easier to debrepro against arbitrary source + directories (i.e. not Debian packages): + - -B, --build-command: specify custom build command + - -a, --artifact-pattern: specify custom artifacts to be compared + across builds + - --no-copy: run commands against the source tree directly, i.e. don't + copy it to a temporary build directory. + * mk-origtargz: + + Apply patch from Vasyl Gello to make Files-Included- work. + * Include the updated Portuguese translation. Closes: #1011316 + Thanks to Américo Monteiro . + * Run perltidy with the newer 20220217. + * Bump Standards-Version to 4.6.1, no changes needed. + * mk-origtargz: + + Display compression/tar errors + * wrap-and-sort: + + Introduce an experimental mode using the RTS parser available with + python-debian >= 0.1.43. This will let wrap-and-sort retain comments. + This feature is opt-in with a new flag. MR: !237 + + Futher improvements to the RTS mode, now also supporting short indent + (-s) among others. MR: !263 + * deb-janitor: + + Add a new 'review' subcommand. MR: !261 + * wnpp-check: + + Replace HTTP URLs with HTTPS. Closes: #1002311, #902242; MR: !256 + * rc-alert, wnpp-alert, wnpp-check: + + Allow curl to follow HTTP redirections. MR: !257 + * wnpp-check: + + Document -e,--exact in the --help output. Closes: #1003254 + * Make pristine-tar a Suggests in Ubuntu, as it's not in main so it can't be + a Recommends. LP: #1885766 + * Don't build-depend on subversion on i386, skipping the test_uscan_svn + test; this is to avoid a delta with Ubuntu, that doesn't have svn on i386. + * debrebuild: + + Use the new field_parse_binary_source() from libdpkg-perl >= 1.21.0 + if available. MR: !249 + * test_uscan_mangle: + + Use MGZREPACK to specify the expected file extension when necessary; + otherwise, use the default file extension. + + Add a workaround for testWatch4WebNonNativeMUT0(). MR: !258 + + Test use of filenamemangle with single and multiple upstream tarballs. + + Modify helperWatch() to accept filenamemangled filenames. + + Allow filenamemangling with multiple upstream tarballs. + * Fix some spelling errors in code comments. MR: !243 + * hardening-check: + + Handle emtpy symble table by returning an unknown result for the + stack-protector check. MR: !223 + * salsa: + + Add a new last_ci_status subcommand. MR: !226 +- drop devscripts-checkbashisms-early-fail.patch (upstream) + ------------------------------------------------------------------- Mon May 2 11:42:50 UTC 2022 - Michal Hrusecky diff --git a/devscripts.spec b/devscripts.spec index 56e0ed8..c587ab8 100644 --- a/devscripts.spec +++ b/devscripts.spec @@ -18,7 +18,7 @@ %define _xsl_stylesheet %{_datadir}/xml/docbook/stylesheet/nwalsh/current/manpages/docbook.xsl Name: devscripts -Version: 2.19.5 +Version: 2.22.2 Release: 0 Summary: Scripts to make the life of a Debian Package maintainer easier License: (Artistic-1.0 OR GPL-1.0-or-later) AND Artistic-2.0 AND GPL-2.0-only AND GPL-2.0-or-later AND GPL-3.0-or-later AND GPL-3.0-only AND SUSE-Public-Domain AND ISC @@ -31,7 +31,6 @@ Patch0: devscripts-fix-build.patch Patch1: devscripts-fix-python-install-layout.patch # PATCH-FEATURE-OPENSUSE devscripts-debcommit-hg16.patch -- Mercurial cannot commit empty, fix it. Patch2: devscripts-debcommit-hg16.patch -Patch3: devscripts-checkbashisms-early-fail.patch BuildRequires: bash-completion-devel BuildRequires: docbook-xsl-stylesheets BuildRequires: dpkg-devel >= 1.18.19 @@ -93,7 +92,6 @@ bashisms are detected. %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 %build make %{?_smp_mflags} V=1 \