Merging debian version 2.2.43-2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 17 insertions, 7 deletions

diff --git a/debian/changelog b/debian/changelog
index 865f0fb..15297ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gnupg2 (2.2.43-2) unstable; urgency=medium
+
+  * d/changelog: correct old misspelling of "ghostscript"
+  * Generate documentation artifacts from source, respecting nodoc
+
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Tue, 14 May 2024 20:34:53 -0400
+
 gnupg2 (2.2.43-1~progress7.99u1) graograman-backports; urgency=medium
 
   * Uploading to graograman-backports, remaining changes:
@@ -1657,8 +1664,8 @@ gnupg2 (2.0.12-1) unstable; urgency=low
 
   * New upstream release. (Closes: #499569, #463270, #446494, #314068,
     #519375, #514587)
-  * debian/control: Change build dependency on gs to ghoscript, since
-    ghoscript has been replaced.
+  * debian/control: Change build dependency on gs to ghostscript, since
+    ghostscript has been replaced.
   * debian/compat: Use debhelper v7.
   * debian/control: Update Standards-Version to 3.8.2.
   * debian/control: Use ${misc:Depends}.
diff --git a/debian/clean b/debian/clean
index c5225d4..2a2c7cf 100644
--- a/debian/clean
+++ b/debian/clean
@@ -8,3 +8,5 @@ doc/gnupg.info
 doc/gnupg.info-1
 doc/gnupg.info-2
 doc/gnupg.info-3
+doc/*.pdf
+doc/*.png
diff --git a/debian/control b/debian/control
index d460c78..57632e6 100644
--- a/debian/control
+++ b/debian/control
@@ -13,11 +13,11 @@ Build-Depends:
  automake,
  autopoint,
  debhelper-compat (= 13),
+ fig2dev <!nodoc>,
  file,
  gettext,
-# ghostscript <!nodoc>,
  gpgrt-tools,
-# imagemagick <!nodoc>,
+ imagemagick <!nodoc>,
  libassuan-dev (>= 2.5.0),
  libbz2-dev,
  libgcrypt20-dev (>= 1.8.0),
@@ -32,7 +32,6 @@ Build-Depends:
  openssh-client <!nocheck>,
  pkgconf,
  texinfo <!nodoc>,
-# transfig <!nodoc>,
  zlib1g-dev | libz-dev,
 Build-Depends-Indep:
  binutils-multiarch [!amd64 !i386],
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 77b338a..dae894c 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -17,6 +17,8 @@ filter = [
  'config.h.in',
  'configure',
  'doc/gnupg.info*',
+ 'doc/*.pdf',
+ 'doc/*.png',
  'INSTALL',
  'm4/iconv.m4',
  'm4/intdiv0.m4',
diff --git a/debian/gnupg.info b/debian/gnupg.info
index e4baa0f..1b1ae00 100644
--- a/debian/gnupg.info
+++ b/debian/gnupg.info
@@ -1,3 +1,3 @@
 debian/tmp/usr/share/info/gnupg.info*
-doc/gnupg-card-architecture.png
-doc/gnupg-module-overview.png
+build/doc/gnupg-card-architecture.png
+build/doc/gnupg-module-overview.png