Control: tags 668477 + pending
Control: tags 965443 + patch
Control: tags 965443 + pending

Dear maintainer,

I've prepared an NMU for cadaver (versioned as 0.23.3-2.2) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.

Regards,

Eriberto

diff -Nru cadaver-0.23.3/debian/changelog cadaver-0.23.3/debian/changelog
--- cadaver-0.23.3/debian/changelog     2022-04-16 01:41:44.000000000 -0300
+++ cadaver-0.23.3/debian/changelog     2022-04-15 21:27:34.000000000 -0300
@@ -1,3 +1,21 @@
+cadaver (0.23.3-2.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Migrated to DebSrc 3.0. Consequently:
+      - debian/source/options: created to ignore changes in config.guess and
+        config.sub.
+      - Migrated the current patch from dpatch to quilt.
+      - Closes: #668477
+  * Using new DH level format. Consequently:
+      - debian/compat: removed.
+      - debian/control: changed from 'debhelper' to 'debhelper-compat' in
+        Build-Depends field and bumped level to 13.
+      - debian/rules: using 'dh_prep' instead of 'dh_clean -k' because the
+        '-k' option is not supported since compat 12.
+      - Closes: #965443
+
+ -- Joao Eriberto Mota Filho <eribe...@debian.org>  Fri, 15 Apr 2022 21:27:34 
-0300
+
 cadaver (0.23.3-2.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru cadaver-0.23.3/debian/compat cadaver-0.23.3/debian/compat
--- cadaver-0.23.3/debian/compat        2022-04-16 01:41:44.000000000 -0300
+++ cadaver-0.23.3/debian/compat        1969-12-31 21:00:00.000000000 -0300
@@ -1 +0,0 @@
-5
diff -Nru cadaver-0.23.3/debian/control cadaver-0.23.3/debian/control
--- cadaver-0.23.3/debian/control       2022-04-16 01:41:44.000000000 -0300
+++ cadaver-0.23.3/debian/control       2022-04-15 21:27:34.000000000 -0300
@@ -2,7 +2,7 @@
 Section: web
 Priority: optional
 Maintainer: Sebastian Harl <tok...@debian.org>
-Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.6), dpatch,
+Build-Depends: debhelper-compat (= 13), dpkg-dev (>= 1.14.6), quilt (>= 0.40),
  autotools-dev,
  libgcrypt20-dev,
  libncurses5-dev,
diff -Nru cadaver-0.23.3/debian/patches/00list 
cadaver-0.23.3/debian/patches/00list
--- cadaver-0.23.3/debian/patches/00list        2022-04-16 01:41:44.000000000 
-0300
+++ cadaver-0.23.3/debian/patches/00list        1969-12-31 21:00:00.000000000 
-0300
@@ -1,2 +0,0 @@
-manpage_hyphen.dpatch
-
diff -Nru cadaver-0.23.3/debian/patches/manpage_hyphen.dpatch 
cadaver-0.23.3/debian/patches/manpage_hyphen.dpatch
--- cadaver-0.23.3/debian/patches/manpage_hyphen.dpatch 2022-04-16 
01:41:44.000000000 -0300
+++ cadaver-0.23.3/debian/patches/manpage_hyphen.dpatch 1969-12-31 
21:00:00.000000000 -0300
@@ -1,27 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## manpage_hyphen.dpatch by Sebastian Harl <s...@tokkee.org>
-##
-## DP: Do not use hyphens as minus signs.
-
-@DPATCH@
-
---- a/doc/cadaver.1
-+++ b/doc/cadaver.1
-@@ -2,7 +2,7 @@
- .SH NAME
- cadaver \- A command\-line WebDAV client for Unix. 
- .SH SYNOPSIS
--cadaver [-trp[-r file][-p host[:port]]][-V][-h] http://hostname[:port]/path
-+cadaver [\-trp[\-r file][\-p host[:port]]][\-V][\-h] 
http://hostname[:port]/path
- .SH DESCRIPTION
- .B cadaver 
- supports file upload, download, on-screen display, namespace operations
-@@ -162,7 +162,7 @@
- .IP
- .SH FILES
- .IP "~/.cadaverrc"
--Individual user settings that can override cadaver defaults and to script 
cadaver. Can be changed by the "--rcfile" option.
-+Individual user settings that can override cadaver defaults and to script 
cadaver. Can be changed by the "\-\-rcfile" option.
- .IP "~/.netrc"
- Login and initialization information used by the auto-login process. See
- section "THE .netrc FILE" for details.
diff -Nru cadaver-0.23.3/debian/patches/manpage_hyphen.patch 
cadaver-0.23.3/debian/patches/manpage_hyphen.patch
--- cadaver-0.23.3/debian/patches/manpage_hyphen.patch  1969-12-31 
21:00:00.000000000 -0300
+++ cadaver-0.23.3/debian/patches/manpage_hyphen.patch  2022-04-15 
21:27:34.000000000 -0300
@@ -0,0 +1,22 @@
+Author: Sebastian Harl <s...@tokkee.org>
+Description: Do not use hyphens as minus signs.
+--- cadaver-0.23.3.orig/doc/cadaver.1
++++ cadaver-0.23.3/doc/cadaver.1
+@@ -2,7 +2,7 @@
+ .SH NAME
+ cadaver \- A command\-line WebDAV client for Unix. 
+ .SH SYNOPSIS
+-cadaver [-trp[-r file][-p host[:port]]][-V][-h] http://hostname[:port]/path
++cadaver [\-trp[\-r file][\-p host[:port]]][\-V][\-h] 
http://hostname[:port]/path
+ .SH DESCRIPTION
+ .B cadaver 
+ supports file upload, download, on-screen display, namespace operations
+@@ -162,7 +162,7 @@ Connects to a server called secure.examp
+ .IP
+ .SH FILES
+ .IP "~/.cadaverrc"
+-Individual user settings that can override cadaver defaults and to script 
cadaver. Can be changed by the "--rcfile" option.
++Individual user settings that can override cadaver defaults and to script 
cadaver. Can be changed by the "\-\-rcfile" option.
+ .IP "~/.netrc"
+ Login and initialization information used by the auto-login process. See
+ section "THE .netrc FILE" for details.
diff -Nru cadaver-0.23.3/debian/patches/series 
cadaver-0.23.3/debian/patches/series
--- cadaver-0.23.3/debian/patches/series        1969-12-31 21:00:00.000000000 
-0300
+++ cadaver-0.23.3/debian/patches/series        2022-04-15 21:27:34.000000000 
-0300
@@ -0,0 +1 @@
+manpage_hyphen.patch
diff -Nru cadaver-0.23.3/debian/rules cadaver-0.23.3/debian/rules
--- cadaver-0.23.3/debian/rules 2022-04-16 01:41:44.000000000 -0300
+++ cadaver-0.23.3/debian/rules 2022-04-15 21:27:34.000000000 -0300
@@ -21,9 +21,9 @@
        CFLAGS += -O2
 endif
 
-include /usr/share/dpatch/dpatch.make
+include /usr/share/quilt/quilt.make
 
-$(BUILDDIR)/config.status: configure $(DPATCH_STAMPFN)
+$(BUILDDIR)/config.status: configure $(QUILT_STAMPFN)
        dh_testdir
        
        for file in config.guess config.sub; do \
@@ -72,7 +72,7 @@
 install: build
        dh_testdir
        dh_testroot
-       dh_clean -k
+       dh_prep
        dh_installdirs
        
        $(MAKE) -C $(BUILDDIR) install prefix=$(CURDIR)/debian/cadaver/usr
diff -Nru cadaver-0.23.3/debian/source/format 
cadaver-0.23.3/debian/source/format
--- cadaver-0.23.3/debian/source/format 1969-12-31 21:00:00.000000000 -0300
+++ cadaver-0.23.3/debian/source/format 2022-04-15 21:27:34.000000000 -0300
@@ -0,0 +1 @@
+3.0 (quilt)
diff -Nru cadaver-0.23.3/debian/source/options 
cadaver-0.23.3/debian/source/options
--- cadaver-0.23.3/debian/source/options        1969-12-31 21:00:00.000000000 
-0300
+++ cadaver-0.23.3/debian/source/options        2022-04-15 21:27:34.000000000 
-0300
@@ -0,0 +1 @@
+extend-diff-ignore = "^config.(guess|sub)$"

Reply via email to