Source: wmpuzzle
Version: 0.5.2-2
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap

wmpuzzle fails to cross build from source, because debian/rules hard
codes the build architecture strip. The attached patch fixes that by
getting the strip from dpkg's buildtools.mk. Please consider using
debhelper (which would also fix this bug) or applying the patch.

Helmut
diff --minimal -Nru wmpuzzle-0.5.2/debian/changelog 
wmpuzzle-0.5.2/debian/changelog
--- wmpuzzle-0.5.2/debian/changelog     2015-06-07 18:55:10.000000000 +0200
+++ wmpuzzle-0.5.2/debian/changelog     2019-05-11 13:39:35.000000000 +0200
@@ -1,3 +1,10 @@
+wmpuzzle (0.5.2-2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTCBFS: Use a strip from dpkg's buildtools.mk. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de>  Sat, 11 May 2019 13:39:35 +0200
+
 wmpuzzle (0.5.2-2) unstable; urgency=low
 
   * Fixed reproducible builds, closes: #777362, thanks to Chris Lamb.
diff --minimal -Nru wmpuzzle-0.5.2/debian/rules wmpuzzle-0.5.2/debian/rules
--- wmpuzzle-0.5.2/debian/rules 2015-06-07 18:54:31.000000000 +0200
+++ wmpuzzle-0.5.2/debian/rules 2019-05-11 13:39:33.000000000 +0200
@@ -6,6 +6,9 @@
 testdir  = test -f src/wmpuzzle.c && test -f debian/rules
 testroot = test x`whoami` = xroot
 
+-include /usr/share/dpkg/buildtools.mk
+STRIP ?= strip
+
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
        CONFFLAGS += --build $(DEB_HOST_GNU_TYPE)
 else
@@ -53,7 +56,7 @@
 
        $(MAKE) -C src install DESTDIR=$(CURDIR)/debian/wmpuzzle
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-       strip -R .comment -R .note $(BUILDDIR)/usr/games/wmpuzzle
+       $(STRIP) -R .comment -R .note $(BUILDDIR)/usr/games/wmpuzzle
 endif
        gzip -9n $(BUILDDIR)/usr/share/man/man6/wmpuzzle.6
        install -D -p -o root -g root -m 0644 debian/menu 
$(BUILDDIR)/usr/share/menu/wmpuzzle

Reply via email to