Use gbp pq for patches, Closes: #995239

27 files changed, 6 insertions, 13 deletions

diff --git a/debian/README.source b/debian/README.source
index cdbf32fe..6e74d5b8 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,17 +1,11 @@
-This package uses quilt to manage all modifications to the upstream
-source.  Changes are stored in the source package as diffs in
-debian/patches-applied and applied during the build.  Please see:
-
-    /usr/share/doc/quilt/README.source
-
-for more information on how to apply the patches, modify patches, or
-remove a patch.
+This package uses gbp pq to patch the source; please see the gbp-pq
+man page.
 
 If you patch a man page or other XML documentation in the package, it
 is important to include a patch both to the xml file and the resulting
 nroff or other sources in your patch.  much of the man pages is
 installed in Multi-Arch: same packages, so the resulting documents
 need to be identical.  The best way to guarantee this is to include
-the resulting document in the source.p
+the resulting document in the source.
 
- -- Sam Hartman <hartmans@debian.org>, Wed,  3 Feb 2021 12:26:39 -0500
+ -- Sam Hartman <hartmans@debian.org>, Mon, 11 Sep 2023 13:56:17 -0600
diff --git a/debian/control b/debian/control
index 9cdc3f81..f5b545d5 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Sam Hartman <hartmans@debian.org>
 Uploaders: Steve Langasek <vorlon@debian.org>
 Standards-Version: 4.6.0
-Build-Depends: debhelper-compat (= 13), dh-exec, quilt, flex, libdb-dev, libcrypt-dev, libselinux1-dev [linux-any], po-debconf, dh-autoreconf, autopoint, libaudit-dev [linux-any] <!stage1>, pkg-config, libfl-dev, libfl-dev:native, docbook-xsl, docbook-xml, xsltproc, libxml2-utils, w3m
+Build-Depends: debhelper-compat (= 13), dh-exec,  flex, libdb-dev, libcrypt-dev, libselinux1-dev [linux-any], po-debconf, dh-autoreconf, autopoint, libaudit-dev [linux-any] <!stage1>, pkg-config, libfl-dev, libfl-dev:native, docbook-xsl, docbook-xml, xsltproc, libxml2-utils, w3m
 Build-Conflicts-Indep: fop
 Build-Conflicts: libdb4.2-dev, libxcrypt-dev
 Vcs-Browser: https://salsa.debian.org/vorlon/pam
diff --git a/debian/patches-applied/007_modules_pam_unix b/debian/patches/007_modules_pam_unix
index 218379c0..218379c0 100644
--- a/debian/patches-applied/007_modules_pam_unix
+++ b/debian/patches/007_modules_pam_unix
diff --git a/debian/patches-applied/008_modules_pam_limits_chroot b/debian/patches/008_modules_pam_limits_chroot
index 7a86fdd5..7a86fdd5 100644
--- a/debian/patches-applied/008_modules_pam_limits_chroot
+++ b/debian/patches/008_modules_pam_limits_chroot
diff --git a/debian/patches-applied/021_nis_cleanup b/debian/patches/021_nis_cleanup
index f05c7103..f05c7103 100644
--- a/debian/patches-applied/021_nis_cleanup
+++ b/debian/patches/021_nis_cleanup
diff --git a/debian/patches-applied/022_pam_unix_group_time_miscfixes b/debian/patches/022_pam_unix_group_time_miscfixes
index 8239fd98..8239fd98 100644
--- a/debian/patches-applied/022_pam_unix_group_time_miscfixes
+++ b/debian/patches/022_pam_unix_group_time_miscfixes
diff --git a/debian/patches-applied/026_pam_unix_passwd_unknown_user b/debian/patches/026_pam_unix_passwd_unknown_user
index d277fee9..d277fee9 100644
--- a/debian/patches-applied/026_pam_unix_passwd_unknown_user
+++ b/debian/patches/026_pam_unix_passwd_unknown_user
diff --git a/debian/patches-applied/027_pam_limits_better_init_allow_explicit_root b/debian/patches/027_pam_limits_better_init_allow_explicit_root
index c4603f5a..c4603f5a 100644
--- a/debian/patches-applied/027_pam_limits_better_init_allow_explicit_root
+++ b/debian/patches/027_pam_limits_better_init_allow_explicit_root
diff --git a/debian/patches-applied/031_pam_include b/debian/patches/031_pam_include
index 16cf6d31..16cf6d31 100644
--- a/debian/patches-applied/031_pam_include
+++ b/debian/patches/031_pam_include
diff --git a/debian/patches-applied/032_pam_limits_EPERM_NOT_FATAL b/debian/patches/032_pam_limits_EPERM_NOT_FATAL
index ec97b441..ec97b441 100644
--- a/debian/patches-applied/032_pam_limits_EPERM_NOT_FATAL
+++ b/debian/patches/032_pam_limits_EPERM_NOT_FATAL
diff --git a/debian/patches-applied/036_pam_wheel_getlogin_considered_harmful b/debian/patches/036_pam_wheel_getlogin_considered_harmful
index 805c62f4..805c62f4 100644
--- a/debian/patches-applied/036_pam_wheel_getlogin_considered_harmful
+++ b/debian/patches/036_pam_wheel_getlogin_considered_harmful
diff --git a/debian/patches-applied/040_pam_limits_log_failure b/debian/patches/040_pam_limits_log_failure
index 0ef703bf..0ef703bf 100644
--- a/debian/patches-applied/040_pam_limits_log_failure
+++ b/debian/patches/040_pam_limits_log_failure
diff --git a/debian/patches-applied/045_pam_dispatch_jump_is_ignore b/debian/patches/045_pam_dispatch_jump_is_ignore
index e19a5456..e19a5456 100644
--- a/debian/patches-applied/045_pam_dispatch_jump_is_ignore
+++ b/debian/patches/045_pam_dispatch_jump_is_ignore
diff --git a/debian/patches-applied/PAM-manpage-section b/debian/patches/PAM-manpage-section
index 7cdadad3..7cdadad3 100644
--- a/debian/patches-applied/PAM-manpage-section
+++ b/debian/patches/PAM-manpage-section
diff --git a/debian/patches-applied/do_not_check_nis_accidentally b/debian/patches/do_not_check_nis_accidentally
index 29ce6097..29ce6097 100644
--- a/debian/patches-applied/do_not_check_nis_accidentally
+++ b/debian/patches/do_not_check_nis_accidentally
diff --git a/debian/patches-applied/fix-autoreconf.patch b/debian/patches/fix-autoreconf.patch
index bdd96262..bdd96262 100644
--- a/debian/patches-applied/fix-autoreconf.patch
+++ b/debian/patches/fix-autoreconf.patch
diff --git a/debian/patches-applied/hurd_no_setfsuid b/debian/patches/hurd_no_setfsuid
index 00610a87..00610a87 100644
--- a/debian/patches-applied/hurd_no_setfsuid
+++ b/debian/patches/hurd_no_setfsuid
diff --git a/debian/patches-applied/lib_security_multiarch_compat b/debian/patches/lib_security_multiarch_compat
index e386ff39..e386ff39 100644
--- a/debian/patches-applied/lib_security_multiarch_compat
+++ b/debian/patches/lib_security_multiarch_compat
diff --git a/debian/patches-applied/make_documentation_reproducible.patch b/debian/patches/make_documentation_reproducible.patch
index b6a4bfe3..b6a4bfe3 100644
--- a/debian/patches-applied/make_documentation_reproducible.patch
+++ b/debian/patches/make_documentation_reproducible.patch
diff --git a/debian/patches-applied/no_PATH_MAX_on_hurd b/debian/patches/no_PATH_MAX_on_hurd
index ab2403dd..ab2403dd 100644
--- a/debian/patches-applied/no_PATH_MAX_on_hurd
+++ b/debian/patches/no_PATH_MAX_on_hurd
diff --git a/debian/patches-applied/nullok_secure-compat.patch b/debian/patches/nullok_secure-compat.patch
index d85aa9fe..d85aa9fe 100644
--- a/debian/patches-applied/nullok_secure-compat.patch
+++ b/debian/patches/nullok_secure-compat.patch
diff --git a/debian/patches-applied/pam-limits-nofile-fd-setsize-cap b/debian/patches/pam-limits-nofile-fd-setsize-cap
index 9c0503c7..9c0503c7 100644
--- a/debian/patches-applied/pam-limits-nofile-fd-setsize-cap
+++ b/debian/patches/pam-limits-nofile-fd-setsize-cap
diff --git a/debian/patches-applied/pam_mkhomedir_stat_before_opendir b/debian/patches/pam_mkhomedir_stat_before_opendir
index aec49b69..aec49b69 100644
--- a/debian/patches-applied/pam_mkhomedir_stat_before_opendir
+++ b/debian/patches/pam_mkhomedir_stat_before_opendir
diff --git a/debian/patches-applied/pam_unix_dont_trust_chkpwd_caller.patch b/debian/patches/pam_unix_dont_trust_chkpwd_caller.patch
index 6a9e525e..6a9e525e 100644
--- a/debian/patches-applied/pam_unix_dont_trust_chkpwd_caller.patch
+++ b/debian/patches/pam_unix_dont_trust_chkpwd_caller.patch
diff --git a/debian/patches-applied/series b/debian/patches/series
index 3ea285ae..3ea285ae 100644
--- a/debian/patches-applied/series
+++ b/debian/patches/series
diff --git a/debian/patches-applied/update-motd b/debian/patches/update-motd
index 14d5fee4..14d5fee4 100644
--- a/debian/patches-applied/update-motd
+++ b/debian/patches/update-motd
diff --git a/debian/rules b/debian/rules
index 73819f0c..b236f56d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,13 +13,12 @@ DEB_HOST_MULTIARCH	?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 LC_COLLATE=C
 export LC_COLLATE
 
-export QUILT_PATCH_DIR = debian/patches-applied
 
 d = $(CURDIR)/debian
 dl = $(d)/local
 
 %:
-	dh $@ --with quilt,autoreconf
+	dh $@ --with autoreconf
 
 # avoid libaudit-dev when bootstrapping
 ifneq (,$(filter stage1,$(DEB_BUILD_PROFILES)))