Source: fbreader
Version: 0.99.4+dfsg-3
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs
fbreader regressed cross building since 0.99.4+dfsg-3. It now strips
with the build architecture strip. Beyond breaking cross building, this
also breaks DEB_BUILD_OPTIONS=nostrip as well as generation of -dbgsym
packages. It is best to skip any stripping during build and letting
debhelper do its job. I'm attaching a patch for your convenience.
Helmut
diff --minimal -Nru fbreader-0.99.4+dfsg/debian/changelog
fbreader-0.99.4+dfsg/debian/changelog
--- fbreader-0.99.4+dfsg/debian/changelog 2023-09-07 17:41:50.000000000
+0200
+++ fbreader-0.99.4+dfsg/debian/changelog 2023-09-08 10:04:51.000000000
+0200
@@ -1,3 +1,9 @@
+fbreader (0.99.4+dfsg-6) UNRELEASED; urgency=medium
+
+ * Fix FTCBFS: Defer stripping to debhelper. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Fri, 08 Sep 2023 10:04:51 +0200
+
fbreader (0.99.4+dfsg-5) unstable; urgency=medium
* QA upload.
diff --minimal -Nru fbreader-0.99.4+dfsg/debian/patches/nostrip.patch
fbreader-0.99.4+dfsg/debian/patches/nostrip.patch
--- fbreader-0.99.4+dfsg/debian/patches/nostrip.patch 1970-01-01
01:00:00.000000000 +0100
+++ fbreader-0.99.4+dfsg/debian/patches/nostrip.patch 2023-09-08
10:04:46.000000000 +0200
@@ -0,0 +1,15 @@
+--- fbreader-0.99.4+dfsg.orig/fbreader/desktop/Makefile
++++ fbreader-0.99.4+dfsg/fbreader/desktop/Makefile
+@@ -7,7 +7,7 @@
+ BINARY = $(DESTDIR)$(BINDIR)/FBReader
+
+ install:
+- @strip $(BINARY)
++ @$(STRIP) $(BINARY)
+ @install -d $(DESTDIR)/usr/share/applications
+ @install -m 0644 desktop
$(DESTDIR)/usr/share/applications/$(TARGET).desktop
+ @install -d $(DESTDIR)$(IMAGEDIR)
+--- /dev/null
++++ fbreader-0.99.4+dfsg/makefiles/arch/unix.mk
+@@ -0,0 +1 @@
++STRIP ?= strip
diff --minimal -Nru fbreader-0.99.4+dfsg/debian/patches/series
fbreader-0.99.4+dfsg/debian/patches/series
--- fbreader-0.99.4+dfsg/debian/patches/series 2023-09-07 17:41:50.000000000
+0200
+++ fbreader-0.99.4+dfsg/debian/patches/series 2023-09-08 10:01:15.000000000
+0200
@@ -6,3 +6,4 @@
0009-fbreader-Makefile-do-not-try-to-install-empty-format.patch
0011-zlibrary-unix-curl-avoid-duplicate-case-in-a-switch.patch
0013-fbreader-Makefile-make-linking-order-reproducible.patch
+nostrip.patch
diff --minimal -Nru fbreader-0.99.4+dfsg/debian/rules
fbreader-0.99.4+dfsg/debian/rules
--- fbreader-0.99.4+dfsg/debian/rules 2023-09-07 17:41:50.000000000 +0200
+++ fbreader-0.99.4+dfsg/debian/rules 2023-09-08 10:04:51.000000000 +0200
@@ -37,7 +37,7 @@
$(MAKE) -C zlibrary/core TARGET_ARCH=desktop UI_TYPE=dummy
DESTDIR=$(DEB_DIR)/libzlcore-dev do_install_dev
$(MAKE) -C zlibrary/text TARGET_ARCH=desktop UI_TYPE=dummy
DESTDIR=$(DEB_DIR)/libzltext-dev do_install_dev
$(MAKE) -C zlibrary/ui TARGET_ARCH=desktop UI_TYPE=qt4
DESTDIR=$(DEB_DIR)/fbreader do_install
- $(MAKE) -C fbreader TARGET_ARCH=desktop UI_TYPE=dummy
DESTDIR=$(DEB_DIR)/fbreader do_install
+ dh_auto_install -D fbreader -- TARGET_ARCH=desktop UI_TYPE=dummy
DESTDIR=$(DEB_DIR)/fbreader do_install
override_dh_makeshlibs:
dh_makeshlibs -plibzlcore0.13
