[Pkg-clamav-devel] Bug#1007559: clamsmtp: please consider upgrading to 3.0 source format

[Bastian Germann]

I am uploading a NMU to DELAYED/10 in order to fix this.
Please find the debdiff attached.
-------------- next part --------------
diff -Nru clamsmtp-1.10/debian/changelog clamsmtp-1.10/debian/changelog
--- clamsmtp-1.10/debian/changelog	2023-10-28 12:59:24.000000000 +0200
+++ clamsmtp-1.10/debian/changelog	2023-10-28 12:35:57.000000000 +0200
@@ -1,3 +1,10 @@
+clamsmtp (1.10-17.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Convert to source format 3.0. (Closes: #1007559)
+
+ -- Bastian Germann <bage at debian.org>  Sat, 28 Oct 2023 12:35:57 +0200
+
 clamsmtp (1.10-17.2) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru clamsmtp-1.10/debian/control clamsmtp-1.10/debian/control
--- clamsmtp-1.10/debian/control	2023-10-28 12:59:24.000000000 +0200
+++ clamsmtp-1.10/debian/control	2023-10-28 12:34:37.000000000 +0200
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: ClamAV Team <pkg-clamav-devel at lists.alioth.debian.org>
 Uploaders: Michael Meskes <meskes at debian.org>
-Build-Depends: debhelper (>= 11), quilt (>= 0.46-7)
+Build-Depends: debhelper (>= 11)
 Standards-Version: 4.1.3
 Vcs-Git: git://anonscm.debian.org/pkg-clamav/clamsmtp.git
 Vcs-Browser: https://anonscm.debian.org/gitweb/?p=pkg-clamav/clamsmtp.git;a=summary
diff -Nru clamsmtp-1.10/debian/patches/include_order.patch clamsmtp-1.10/debian/patches/include_order.patch
--- clamsmtp-1.10/debian/patches/include_order.patch	2023-10-28 12:59:24.000000000 +0200
+++ clamsmtp-1.10/debian/patches/include_order.patch	2023-10-28 12:35:57.000000000 +0200
@@ -21,13 +21,13 @@
 @@ -51,6 +51,8 @@
  AC_PROG_LN_S
  AC_PROG_MAKE_SET
-
+ 
 +AC_USE_SYSTEM_EXTENSIONS
 +
  # Debug mode
- AC_ARG_ENABLE(debug,=20
+ AC_ARG_ENABLE(debug, 
          AC_HELP_STRING([--enable-debug],
-
+         [Compile binaries in debug mode]))
 diff -Nru clamsmtp-1.10/common/smtppass.c clamsmtp-patched/common/smtppass.c
 --- clamsmtp-1.10/common/smtppass.c	2015-03-02 09:36:27.793398352 +0100
 +++ clamsmtp-patched/common/smtppass.c	2015-03-02 09:38:50.843467581 +0100
diff -Nru clamsmtp-1.10/debian/README.source clamsmtp-1.10/debian/README.source
--- clamsmtp-1.10/debian/README.source	2023-10-28 12:59:24.000000000 +0200
+++ clamsmtp-1.10/debian/README.source	1970-01-01 01:00:00.000000000 +0100
@@ -1,58 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source.  Changes are stored in the source package as diffs in
-debian/patches and applied during the build.
-
-To configure quilt to use debian/patches instead of patches, you want
-either to export QUILT_PATCHES=debian/patches in your environment
-or use this snippet in your ~/.quiltrc:
-
-    for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
-        if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
-                export QUILT_PATCHES=debian/patches
-                break
-        fi
-    done
-
-To get the fully patched source after unpacking the source package, cd to
-the root level of the source package and run:
-
-    quilt push -a
-
-The last patch listed in debian/patches/series will become the current
-patch.
-
-To add a new set of changes, first run quilt push -a, and then run:
-
-    quilt new <patch>
-
-where <patch> is a descriptive name for the patch, used as the filename in
-debian/patches.  Then, for every file that will be modified by this patch,
-run:
-
-    quilt add <file>
-
-before editing those files.  You must tell quilt with quilt add what files
-will be part of the patch before making changes or quilt will not work
-properly.  After editing the files, run:
-
-    quilt refresh
-
-to save the results as a patch.
-
-Alternately, if you already have an external patch and you just want to
-add it to the build system, run quilt push -a and then:
-
-    quilt import -P <patch> /path/to/patch
-    quilt push -a
-
-(add -p 0 to quilt import if needed). <patch> as above is the filename to
-use in debian/patches.  The last quilt push -a will apply the patch to
-make sure it works properly.
-
-To remove an existing patch from the list of patches that will be applied,
-run:
-
-    quilt delete <patch>
-
-You may need to run quilt pop -a to unapply patches first before running
-this command.
diff -Nru clamsmtp-1.10/debian/rules clamsmtp-1.10/debian/rules
--- clamsmtp-1.10/debian/rules	2023-10-28 12:59:24.000000000 +0200
+++ clamsmtp-1.10/debian/rules	2023-10-28 12:34:55.000000000 +0200
@@ -3,4 +3,4 @@
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
 %:
-	dh $@ --with quilt,autoreconf
+	dh $@ --with autoreconf
diff -Nru clamsmtp-1.10/debian/source/format clamsmtp-1.10/debian/source/format
--- clamsmtp-1.10/debian/source/format	2023-10-28 12:59:24.000000000 +0200
+++ clamsmtp-1.10/debian/source/format	2023-10-28 12:34:23.000000000 +0200
@@ -1 +1 @@
-1.0
+3.0 (quilt)