Christoph Biedl wrote... > as briefly discussed in IRC, I tried to import upstream version 0.67 - > turns out this is no big deal:
Someone™ asked for a debdiff, see attachment. May contain easter eggs.
Christoph
diff --git a/debian/changelog b/debian/changelog index f91eaf7..4964eb8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +quilt (0.67-1) UNRELEASED; urgency=low + + * Import upstream version 0.67 + + -- Christoph Biedl <debian.a...@manchmal.in-ulm.de> Sun, 16 Oct 2022 17:06:38 +0200 + quilt (0.66-2.2) unstable; urgency=low * Non-maintainer upload. diff --git a/debian/control b/debian/control index 8e3bcac..4589c1c 100644 --- a/debian/control +++ b/debian/control @@ -1,10 +1,11 @@ Source: quilt Maintainer: Martin Quinson <mquin...@debian.org> -Uploaders: Dr. Tobias Quathamer <to...@debian.org> +Uploaders: Dr. Tobias Quathamer <to...@debian.org>, + Christoph Biedl <debian.a...@manchmal.in-ulm.de> Section: vcs Priority: optional Build-Depends: bash-completion, debhelper-compat (= 12) -Build-Depends-Indep: diffstat, ed, gettext, hevea, html2text, perl, procmail +Build-Depends-Indep: diffstat, ed, gawk, gettext, hevea, html2text, perl, procmail Standards-Version: 4.5.0 Vcs-Browser: https://salsa.debian.org/debian/quilt Vcs-Git: https://salsa.debian.org/debian/quilt.git diff --git a/debian/patches/manpage-typo.patch b/debian/patches/manpage-typo.patch index 7856be5..2680d4d 100644 --- a/debian/patches/manpage-typo.patch +++ b/debian/patches/manpage-typo.patch @@ -1,7 +1,7 @@ Description: Manpage typo --- a/quilt/header.in +++ b/quilt/header.in -@@ -29,7 +29,7 @@ +@@ -18,7 +18,7 @@ Print or change the header of the topmost or specified patch. -a, -r, -e @@ -12,16 +12,7 @@ Description: Manpage typo --- a/doc/quilt.1.in +++ b/doc/quilt.1.in -@@ -161,7 +161,7 @@ - well as the order in which it should be applied. - - The .pc/ directory contains some metadata about the current state of --your patch serie. Changing its content is not advised. This directory -+your patch series. Changing its content is not advised. This directory - can usually be regenerated from the initial files and the - content of the patches/ directory (provided that all patches were - regenerated before the removal). -@@ -208,7 +208,7 @@ +@@ -214,7 +214,7 @@ You may also want to add the "-E" option if you have issues with quilt not deleting empty files when you think it should. The documentation of GNU patch says that "normally this option is unnecessary", but when patch diff --git a/debian/patches/series b/debian/patches/series index bb80934..f490718 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,7 +2,6 @@ cherry-pick.v0.67-29-gf73f8d7.avoid-warnings-with-grep-3-8.patch quilt-init dep3mail ### Sent 2014-01-18 check_SERIES_exists ### Sent 2014-01-18 -setup-dont-read-pc ### Sent 2014-01-18 restrict-patch-names fail_on_missing diff --git a/debian/patches/setup-dont-read-pc b/debian/patches/setup-dont-read-pc deleted file mode 100644 index 11d65b8..0000000 --- a/debian/patches/setup-dont-read-pc +++ /dev/null @@ -1,34 +0,0 @@ -Description: setup don't obey the settings of any englobing .pc - . - This is mainly intended to get the setup.test working even if the - debian package contains a .pc directory. Without this patch, the - debian packaging stuff will get the testsuite using debian/patches - instead of patches (because it's the way it goes in our .pc). The - test breaks with that setting. - . - The patch changes the setup command to not take the settings of any - .pc directory found, and reset QUILT_PC QUILT_PATCHES and QUILT_SERIES - to their default values. -Bug-Debian: https://bugs.debian.org/573689 -Forwarded: 2014-01-18 - ---- - quilt/setup.in | 5 +++++ - 1 file changed, 5 insertions(+) - ---- a/quilt/setup.in -+++ b/quilt/setup.in -@@ -20,8 +20,13 @@ - . $QUILT_DIR/scripts/patchfns - if [ -n "$SUBDIR" ] - then -+ # Damn, found an enclosing quilt directory; don't follow its settings - cd $SUBDIR - unset SUBDIR -+ unset QUILT_PC QUILT_PATCHES QUILT_SERIES -+ : ${QUILT_PC:=.pc} -+ : ${QUILT_PATCHES:=patches} -+ : ${QUILT_SERIES:=series} - fi - fi - diff --git a/debian/patches/use-sensible-editor b/debian/patches/use-sensible-editor index 1bc11d9..2bb145b 100644 --- a/debian/patches/use-sensible-editor +++ b/debian/patches/use-sensible-editor @@ -20,13 +20,13 @@ Author: Ryan Niebur <ryanrya...@gmail.com> -: ${EDITOR:=vi} +: ${EDITOR:=sensible-editor} - # Read in library functions - if [ "$(type -t patch_file_name)" != function ] + usage() + { --- a/quilt/header.in +++ b/quilt/header.in -@@ -17,7 +17,7 @@ - . $QUILT_DIR/scripts/patchfns - fi +@@ -6,7 +6,7 @@ + # + # See the COPYING and AUTHORS files for more details. -: ${EDITOR:=vi} +: ${EDITOR:=sensible-editor} @@ -42,8 +42,8 @@ Author: Ryan Niebur <ryanrya...@gmail.com> -: ${EDITOR:=vi} +: ${EDITOR:=sensible-editor} - # Read in library functions - if [ "$(type -t patch_file_name)" != function ] + usage() + { --- a/test/edit.test +++ b/test/edit.test @@ -7,6 +7,7 @@
signature.asc
Description: PGP signature
