Source: qrq
Version: 0.3.3-1
Tags: patch
User: debian-cr...@lists.debian.org
Usertags: ftcbfs
qrq fails to cross build from source, because it strips with the build
architecture strip during make install via the -s flag of the install
tool. Doing so also breaks DEB_BUILD_OPTIONS=nostrip and generation of
-dbgsym packages. It is best to defer stripping to dh_strip. Please
consider applying the attached patch.
Helmut
diff --minimal -Nru qrq-0.3.3/debian/changelog qrq-0.3.3/debian/changelog
--- qrq-0.3.3/debian/changelog 2019-06-30 21:15:45.000000000 +0200
+++ qrq-0.3.3/debian/changelog 2020-01-09 19:52:01.000000000 +0100
@@ -1,3 +1,10 @@
+qrq (0.3.3-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix FTCBFS: Defer stripping to dh_strip. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de> Thu, 09 Jan 2020 19:52:01 +0100
+
qrq (0.3.3-1) unstable; urgency=medium
* New upstream version.
diff --minimal -Nru qrq-0.3.3/debian/patches/cross.patch
qrq-0.3.3/debian/patches/cross.patch
--- qrq-0.3.3/debian/patches/cross.patch 1970-01-01 01:00:00.000000000
+0100
+++ qrq-0.3.3/debian/patches/cross.patch 2020-01-09 19:51:14.000000000
+0100
@@ -0,0 +1,104 @@
+--- qrq-0.3.3.orig/Makefile
++++ qrq-0.3.3/Makefile
+@@ -31,6 +31,8 @@
+ CC=gcc
+ endif
+
++INSTALL ?= install
++
+ # build information may be added by CI scripts and will be
+ # displayed in the help text (qrq -h)
+
+@@ -83,20 +85,20 @@
+ ifeq ($(OSX_BUNDLE), YES)
+
+ install: qrq
+- install -d -v
qrq.app/Contents
+- install -d -v
qrq.app/Contents/MacOS
+- install -d -v
qrq.app/Contents/Resources
+- install -d -v
qrq.app/Contents/Resources/share/qrq/
+- install -d -v
qrq.app/Contents/Resources/share/man/man1/
+- install -m 0755 qrq
qrq.app/Contents/MacOS/
+- install -m 0755 qrqscore
qrq.app/Contents/MacOS/
+- install -m 0644 qrq.1
qrq.app/Contents/Resources/share/man/man1/
+- install -m 0644 callbase.qcb
qrq.app/Contents/Resources/share/qrq/
+- install -m 0644 english.qcb
qrq.app/Contents/Resources/share/qrq/
+- install -m 0644 qrqrc
qrq.app/Contents/Resources/share/qrq/
+- install -m 0644 toplist
qrq.app/Contents/Resources/share/qrq/
+- install -m 0644 OSXExtras/qrq.icns qrq.app/Contents/Resources/
+- install -m 0755 OSXExtras/qrqsh qrq.app/Contents/MacOS/
++ ${INSTALL} -d -v
qrq.app/Contents
++ ${INSTALL} -d -v
qrq.app/Contents/MacOS
++ ${INSTALL} -d -v
qrq.app/Contents/Resources
++ ${INSTALL} -d -v
qrq.app/Contents/Resources/share/qrq/
++ ${INSTALL} -d -v
qrq.app/Contents/Resources/share/man/man1/
++ ${INSTALL} -m 0755 qrq
qrq.app/Contents/MacOS/
++ ${INSTALL} -m 0755 qrqscore
qrq.app/Contents/MacOS/
++ ${INSTALL} -m 0644 qrq.1
qrq.app/Contents/Resources/share/man/man1/
++ ${INSTALL} -m 0644 callbase.qcb
qrq.app/Contents/Resources/share/qrq/
++ ${INSTALL} -m 0644 english.qcb
qrq.app/Contents/Resources/share/qrq/
++ ${INSTALL} -m 0644 qrqrc
qrq.app/Contents/Resources/share/qrq/
++ ${INSTALL} -m 0644 toplist
qrq.app/Contents/Resources/share/qrq/
++ ${INSTALL} -m 0644 OSXExtras/qrq.icns
qrq.app/Contents/Resources/
++ ${INSTALL} -m 0755 OSXExtras/qrqsh qrq.app/Contents/MacOS/
+ sed 's/VERSION/$(VERSION)/' OSXExtras/Info.plist >
qrq.app/Contents/Info.plist
+
+ uninstall:
+@@ -105,16 +107,16 @@
+ else
+
+ install: qrq
+- install -d -v $(DESTDIR)/share/qrq/
+- install -d -v $(DESTDIR)/share/man/man1/
+- install -d -v $(DESTDIR)/bin/
+- install -s -m 0755 qrq $(DESTDIR)/bin/
+- install -m 0755 qrqscore $(DESTDIR)/bin/
+- install -m 0644 qrq.1 $(DESTDIR)/share/man/man1/
+- install -m 0644 callbase.qcb $(DESTDIR)/share/qrq/
+- install -m 0644 english.qcb $(DESTDIR)/share/qrq/
+- install -m 0644 qrqrc $(DESTDIR)/share/qrq/
+- install -m 0644 toplist $(DESTDIR)/share/qrq/
++ ${INSTALL} -d -v $(DESTDIR)/share/qrq/
++ ${INSTALL} -d -v $(DESTDIR)/share/man/man1/
++ ${INSTALL} -d -v $(DESTDIR)/bin/
++ ${INSTALL} -s -m 0755 qrq $(DESTDIR)/bin/
++ ${INSTALL} -m 0755 qrqscore $(DESTDIR)/bin/
++ ${INSTALL} -m 0644 qrq.1 $(DESTDIR)/share/man/man1/
++ ${INSTALL} -m 0644 callbase.qcb $(DESTDIR)/share/qrq/
++ ${INSTALL} -m 0644 english.qcb $(DESTDIR)/share/qrq/
++ ${INSTALL} -m 0644 qrqrc $(DESTDIR)/share/qrq/
++ ${INSTALL} -m 0644 toplist $(DESTDIR)/share/qrq/
+
+
+ uninstall:
+@@ -132,18 +134,18 @@
+ package: qrq
+ export
CODESIGN_ALLOCATE=/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/codesign_allocate;
ldid -s qrq
+ rm -rf qrq-pkg
+- install -d -v qrq-pkg/$(DESTDIR)/share/qrq/
+- install -d -v qrq-pkg/$(DESTDIR)/share/man/man1/
+- install -d -v qrq-pkg/$(DESTDIR)/bin/
+- install -d -v qrq-pkg/DEBIAN/
+- install -s -m 0755 qrq qrq-pkg/$(DESTDIR)/bin/
+- install -m 0755 qrqscore qrq-pkg/$(DESTDIR)/bin/
+- install -m 0644 qrq.1 qrq-pkg/$(DESTDIR)/share/man/man1/
+- install -m 0644 callbase.qcb qrq-pkg/$(DESTDIR)/share/qrq/
+- install -m 0644 english.qcb qrq-pkg/$(DESTDIR)/share/qrq/
+- install -m 0644 qrqrc qrq-pkg/$(DESTDIR)/share/qrq/
+- install -m 0644 toplist qrq-pkg/$(DESTDIR)/share/qrq/
+- install -m 0644 control qrq-pkg/DEBIAN/
++ ${INSTALL} -d -v qrq-pkg/$(DESTDIR)/share/qrq/
++ ${INSTALL} -d -v qrq-pkg/$(DESTDIR)/share/man/man1/
++ ${INSTALL} -d -v qrq-pkg/$(DESTDIR)/bin/
++ ${INSTALL} -d -v qrq-pkg/DEBIAN/
++ ${INSTALL} -s -m 0755 qrq qrq-pkg/$(DESTDIR)/bin/
++ ${INSTALL} -m 0755 qrqscore qrq-pkg/$(DESTDIR)/bin/
++ ${INSTALL} -m 0644 qrq.1 qrq-pkg/$(DESTDIR)/share/man/man1/
++ ${INSTALL} -m 0644 callbase.qcb qrq-pkg/$(DESTDIR)/share/qrq/
++ ${INSTALL} -m 0644 english.qcb qrq-pkg/$(DESTDIR)/share/qrq/
++ ${INSTALL} -m 0644 qrqrc qrq-pkg/$(DESTDIR)/share/qrq/
++ ${INSTALL} -m 0644 toplist qrq-pkg/$(DESTDIR)/share/qrq/
++ ${INSTALL} -m 0644 control qrq-pkg/DEBIAN/
+ export COPYFILE_DISABLE=1; export COPY_EXTENDED_ATTRIBUTES_DISABLE=1;
dpkg-deb -b qrq-pkg cydiastore_com.kb1ooo.qrq_v$(shell grep ^Version: control |
cut -d ' ' -f 2).deb
+ $(SCP) cydiastore_com.kb1ooo.qrq_v$(shell grep ^Version: control | cut
-d ' ' -f 2).deb $(IPHONE_HOST):/tmp
+ $(SSH) $(IPHONE_HOST) "dpkg -i /tmp/cydiastore_com.kb1ooo.qrq_v$(shell
grep ^Version: control | cut -d ' ' -f 2).deb"
diff --minimal -Nru qrq-0.3.3/debian/patches/series
qrq-0.3.3/debian/patches/series
--- qrq-0.3.3/debian/patches/series 2019-06-30 21:08:20.000000000 +0200
+++ qrq-0.3.3/debian/patches/series 2020-01-09 17:52:43.000000000 +0100
@@ -1,3 +1,4 @@
no-readme-clean
no-buildinfo
cppflags
+cross.patch
diff --minimal -Nru qrq-0.3.3/debian/rules qrq-0.3.3/debian/rules
--- qrq-0.3.3/debian/rules 2019-06-30 21:08:20.000000000 +0200
+++ qrq-0.3.3/debian/rules 2020-01-09 19:51:56.000000000 +0100
@@ -5,4 +5,4 @@
override_dh_auto_install:
# quirk around the Makefile's DESTDIR?=/usr oddity
- dh_auto_install --destdir debian/qrq/usr
+ dh_auto_install --destdir debian/qrq/usr -- INSTALL='install
--strip-program=true'
