[Debian GNUstep maintainers] Bug#963081: src:camera.app: Please switch to using pkg-config for libgphoto2

[Ferenc Wágner]

Package: src:camera.app
Version: 0.8.0-12
Severity: normal

Dear Maintainer,

I plan to upload libgphoto2 2.5.25 without the config scripts,
which upstream considers obsolete and hurt the multi-arch effort.
It's easy to switch to using pkg-config instead, see the attached
debdiff.  Please consider applying something along these lines so
that the incoming libgphoto2 upload does not make camera.app FTBFS.
Or I can do this NMU or send a Salsa MR if you prefer, just holler.

Thanks,
Feri.

$ debdiff camera.app_0.8.0-12.dsc camera.app_0.8.0-12.1.dsc
gpgv: Signature made Thu 07 Nov 2019 04:57:15 PM CET
gpgv:                using RSA key 9236557B170C87F8821C0AC3C1E0D92E986F7C7E
gpgv: Can't check signature: No public key
dpkg-source: warning: failed to verify signature on /home/wferi/phototools/libgphoto2/rdeps/camera.app_0.8.0-12.dsc
dpkg-source: warning: extracting unsigned source package (/home/wferi/phototools/libgphoto2/rdeps/camera.app_0.8.0-12.1.dsc)
diff -Nru camera.app-0.8.0/debian/changelog camera.app-0.8.0/debian/changelog
--- camera.app-0.8.0/debian/changelog	2019-11-01 13:36:00.000000000 +0100
+++ camera.app-0.8.0/debian/changelog	2020-06-18 18:16:16.000000000 +0200
@@ -1,3 +1,10 @@
+camera.app (0.8.0-12.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * libgphoto_2.5.25-1 dropped the config scripts, switch to pkg-config.
+
+ -- Ferenc Wágner <wferi at debian.org>  Thu, 18 Jun 2020 18:16:16 +0200
+
 camera.app (0.8.0-12) unstable; urgency=medium
 
   * Fix Vcs fields.
diff -Nru camera.app-0.8.0/debian/control camera.app-0.8.0/debian/control
--- camera.app-0.8.0/debian/control	2019-11-01 13:36:00.000000000 +0100
+++ camera.app-0.8.0/debian/control	2020-06-18 18:16:10.000000000 +0200
@@ -7,7 +7,8 @@
 Build-Depends: debhelper (>= 11),
 	       gnustep-make (>= 2.6.6),
 	       libgnustep-gui-dev (>= 0.24.0),
-	       libgphoto2-dev (>= 2.5.10)
+	       libgphoto2-dev (>= 2.5.10),
+	       pkg-config,
 Standards-Version: 4.4.1
 Vcs-Git: https://salsa.debian.org/gnustep-team/camera.app.git
 Vcs-Browser: https://salsa.debian.org/gnustep-team/camera.app
diff -Nru camera.app-0.8.0/debian/patches/series camera.app-0.8.0/debian/patches/series
--- camera.app-0.8.0/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ camera.app-0.8.0/debian/patches/series	2020-06-18 18:16:16.000000000 +0200
@@ -0,0 +1 @@
+Use-pkg-config-for-libgphoto2.patch
diff -Nru camera.app-0.8.0/debian/patches/Use-pkg-config-for-libgphoto2.patch camera.app-0.8.0/debian/patches/Use-pkg-config-for-libgphoto2.patch
--- camera.app-0.8.0/debian/patches/Use-pkg-config-for-libgphoto2.patch	1970-01-01 01:00:00.000000000 +0100
+++ camera.app-0.8.0/debian/patches/Use-pkg-config-for-libgphoto2.patch	2020-06-18 18:16:16.000000000 +0200
@@ -0,0 +1,9 @@
+--- a/GNUmakefile.preamble
++++ b/GNUmakefile.preamble
+@@ -1,3 +1,3 @@
+-ADDITIONAL_INCLUDE_DIRS += `gphoto2-config --cflags`
++ADDITIONAL_INCLUDE_DIRS += `pkg-config libgphoto2 --cflags`
+ ADDITIONAL_OBJCFLAGS += -g -Wall
+-ADDITIONAL_GUI_LIBS += `gphoto2-config --libs`
+\ No newline at end of file
++ADDITIONAL_GUI_LIBS += `pkg-config libgphoto2 --libs`
diff -Nru camera.app-0.8.0/debian/rules camera.app-0.8.0/debian/rules
--- camera.app-0.8.0/debian/rules	2018-02-07 13:12:59.000000000 +0100
+++ camera.app-0.8.0/debian/rules	2020-06-18 18:16:16.000000000 +0200
@@ -15,11 +15,6 @@
 # import GNUstep settings for Debian
 include /usr/share/GNUstep/debian/config.mk
 
-# override GNUmakefile.preamble
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-export ADDITIONAL_INCLUDE_DIRS += `/usr/lib/$(DEB_HOST_MULTIARCH)/libgphoto2-dev/bin/gphoto2-config --cflags`
-export ADDITIONAL_GUI_LIBS += `/usr/lib/$(DEB_HOST_MULTIARCH)/libgphoto2-dev/bin/gphoto2-config --libs`
-
 %:
 	dh $@