From 0a2286fee76ee5300901a99f16de0fcf281e198f Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 19 May 2024 06:38:49 +0200 Subject: Merging debian version 2.2.43-5. Signed-off-by: Daniel Baumann --- debian/changelog | 7 +++++++ debian/clean | 3 +++ debian/gbp.conf | 3 +++ debian/rules | 1 + 4 files changed, 14 insertions(+) diff --git a/debian/changelog b/debian/changelog index 178fc22..6c4d0ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gnupg2 (2.2.43-5) unstable; urgency=medium + + * Fix arch-independent (win32) builds + * Strip Changelog-2011 files when building too + + -- Daniel Kahn Gillmor Thu, 16 May 2024 19:53:06 -0400 + gnupg2 (2.2.43-4~progress7.99u1) graograman-backports; urgency=medium * Uploading to graograman-backports, remaining changes: diff --git a/debian/clean b/debian/clean index d0d7c31..3b9bc38 100644 --- a/debian/clean +++ b/debian/clean @@ -15,3 +15,6 @@ regexp/_unicode_mapping.c regexp/UnicodeData.txt common/audit-events.h common/status-codes.h +ChangeLog-2011 +*/ChangeLog-2011 +tests/*/ChangeLog-2011 diff --git a/debian/gbp.conf b/debian/gbp.conf index 51eb915..7423954 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -39,6 +39,9 @@ filter = [ 'regexp/UnicodeData.txt', 'common/audit-events.h', 'common/status-codes.h', + 'ChangeLog-2011', + '*/ChangeLog-2011', + 'tests/*/ChangeLog-2011', ] filter-pristine-tar = False diff --git a/debian/rules b/debian/rules index 97ce206..0c5ed18 100755 --- a/debian/rules +++ b/debian/rules @@ -87,6 +87,7 @@ override_dh_auto_build-indep: --with-zlib=/usr/i686-w64-mingw \ --prefix=/usr/i686-w64-mingw32 \ --host i686-w64-mingw32 + cd build-gpgv-win32/regexp && $(WIN32_FLAGS) $(MAKE) status-codes.h audit-events.h cd build-gpgv-win32/common && $(WIN32_FLAGS) $(MAKE) libcommon.a cd build-gpgv-win32/common && $(WIN32_FLAGS) $(MAKE) libgpgrl.a cd build-gpgv-win32/common && $(WIN32_FLAGS) $(MAKE) libsimple-pwquery.a -- cgit v1.2.3