diff options
-rw-r--r-- | debian/changelog | 13 | ||||
-rwxr-xr-x | debian/rules | 6 |
2 files changed, 19 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 87e8b0a4..2a4657b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +pam (1.5.2-9.1) unstable; urgency=medium + + * Non-maintainer upload acked by Sam Hartman. + * Really fix quilt-related FTBFS: (Closes: #1054505) + pam is a 3.0 (quilt) source package and has a .pc directory after unpack + despite having no debian/patches. Even when setting QUILT_PATCH_DIR or + QUILT_PATCHES, quilt is now mislead to using the non-existent + debian/patches and this makes dh_quilt_unpatch fail, so we delete that + directory unless it corresponds to the real debian/patches-applied that we + want to be used. + + -- Helmut Grohne <helmut@subdivi.de> Tue, 24 Oct 2023 19:38:53 +0200 + pam (1.5.2-9) unstable; urgency=low * Revert 1.5.2-8 upload; as far as I can tell the change is incorrect, diff --git a/debian/rules b/debian/rules index 73819f0c..f4881680 100755 --- a/debian/rules +++ b/debian/rules @@ -21,6 +21,12 @@ dl = $(d)/local %: dh $@ --with quilt,autoreconf +# Since this is a 3.0 (quilt) source package, it has a .pc directory pointing +# to debian/patches after initial unpack. This misleads quilt and makes +# dh_quilt_unpatch fail hard. +execute_before_dh_quilt_unpatch: + if test "`cat .pc/.quilt_patches 2>/dev/null`" = debian/patches; then rm -Rf .pc; fi + # avoid libaudit-dev when bootstrapping ifneq (,$(filter stage1,$(DEB_BUILD_PROFILES))) CONFIGURE_OPTS += --disable-audit |