Control: tags -1 + patch

On Thu, Sep 10, 2026 at 10:47:58PM +0100, Ian Jackson wrote:
> I wrote:
> > I would love to have considered your patch today (finally!).
> ...
> > Unfortunately you seem to have omitted to attach it.
> 
> It looks like I didn't CC you on my mail in 2024...

Oh dear. I failed to recover the patch. Here is a new one. However this
one makes me want there to be a nicer way to express this.

Helmut
diff -Nru adns-1.6.2/debian/changelog adns-1.6.2/debian/changelog
--- adns-1.6.2/debian/changelog 2026-05-27 20:34:08.000000000 +0200
+++ adns-1.6.2/debian/changelog 2026-09-11 13:48:33.000000000 +0200
@@ -1,3 +1,10 @@
+adns (1.6.2-3.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Add a native build pass for help2man. (Closes: #947958)
+
+ -- Helmut Grohne <[email protected]>  Fri, 11 Sep 2026 13:48:33 +0200
+
 adns (1.6.2-3) unstable; urgency=medium
 
   * Attempt to fix autopkgtest or at least debug it.
diff -Nru adns-1.6.2/debian/rules adns-1.6.2/debian/rules
--- adns-1.6.2/debian/rules     2026-05-27 20:34:08.000000000 +0200
+++ adns-1.6.2/debian/rules     2026-09-11 13:48:33.000000000 +0200
@@ -19,6 +19,19 @@
        dh_auto_build
 override_dh_auto_install:
        $(MAKE) install prefix=`pwd`/debian/tmp/usr
+ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
        for i in `ls debian/tmp/usr/bin/`; do \
                
LD_LIBRARY_PATH=debian/tmp/usr/lib:debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) 
help2man -N -n "Asynchronous-capable DNS client utilities" 
debian/tmp/usr/bin/$$i > debian/$$i.1; \
        done
+else
+       dh_auto_clean
+       dpkg-architecture -a$(DEB_BUILD_ARCH) -f -c dh_auto_configure 
--reload-all-buildenv-variables
+       XCFLAGS="`dpkg-buildflags --get CPPFLAGS_FOR_BUILD` `dpkg-buildflags 
--get CFLAGS_FOR_BUILD`" \
+               XLDFLAGS=`dpkg-buildflags --get LDFLAGS_FOR_BUILD` \
+               dpkg-architecture -a$(DEB_BUILD_ARCH) -f -c \
+               dh_auto_build --reload-all-buildenv-variables
+       $(MAKE) install prefix=`pwd`/debian/nativetmp
+       for i in `ls debian/nativetmp/bin/`; do \
+               
LD_LIBRARY_PATH=debian/nativetmp/lib:debian/nativetmp/lib/$(DEB_BUILD_MULTIARCH)
 help2man -N -n "Asynchronous-capable DNS client utilities" 
debian/nativetmp/bin/$$i > debian/$$i.1; \
+       done
+endif

Reply via email to