summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--debian/changelog7
-rw-r--r--debian/clean3
-rw-r--r--debian/gbp.conf3
-rwxr-xr-xdebian/rules1
4 files changed, 14 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index c82df93..b2a75a2 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 <dkg@fifthhorseman.net> Thu, 16 May 2024 19:53:06 -0400
+
gnupg2 (2.2.43-4) unstable; urgency=medium
* Stop shipping upstream ChangeLog (/usr/share/doc/*/changelog.gz)
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