[Pkg-phototools-devel] Bug#689083: libgphoto2-2-dev is not Multi-Arch compatible

[Francois Gouget]

Package: libgphoto2-dev
Version: 2.5.4-1.1+b2
Followup-For: Bug #689083

Dear Maintainer,

Here is a proposed patch to make it possible to make libgphoto2-dev as Multi-Arch: same.
The trick is that on Debian it's not necessary to use -L to link with libraries that
are in /usr/lib/<triplet>. This means it should be ok to remove this option from the
xxx-config scripts which in turn solves the conflict for libgphoto2-dev.

Is that approach ok?


diff -ur a/debian/control b/debian/control
--- a/debian/control	2014-08-25 21:47:22.000000000 +0200
+++ b/debian/control	2015-02-12 23:10:00.414367888 +0100
@@ -30,6 +30,7 @@
 Package: libgphoto2-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends:
  libgphoto2-6 (= ${binary:Version})
  , libexif-dev
diff -ur a/debian/patches/series b/debian/patches/series
--- a/debian/patches/series	2014-01-06 01:37:00.000000000 +0100
+++ b/debian/patches/series	2015-02-12 23:23:08.251291406 +0100
@@ -1,3 +1,4 @@
 #10_disable_cache
 #11_hurd_no_path_max_bsdsource
+30_multiarch.patch
 kFreeBSD-ENODATA.patch
--- /dev/null	2015-01-27 12:27:17.181130653 +0100
+++ b/debian/patches/30_multiarch.patch	2015-02-12 23:22:24.959450232 +0100
@@ -0,0 +1,40 @@
+--- a/gphoto2-config.in
++++ b/gphoto2-config.in
+@@ -2,7 +2,7 @@
+ 
+ # leave these definitions here
+ # they are required for correct interpolation of
+-# @libdir@ and @includedir@ later on
++# libdir and includedir later on
+ prefix="@prefix@"
+ exec_prefix="@exec_prefix@"
+ 
+@@ -59,7 +59,7 @@
+        	;;
+ 
+     --libs)
+-        echo "-L at libdir@" -lgphoto2 -lgphoto2_port -lm
++        echo -lgphoto2 -lgphoto2_port -lm
+        	;;
+ 
+     *)
+--- a/libgphoto2_port/gphoto2-port-config.in
++++ b/libgphoto2_port/gphoto2-port-config.in
+@@ -2,7 +2,7 @@
+ 
+ # leave these definitions here
+ # they are required for correct interpolation of
+-# @libdir@ and @includedir@ later on
++# libdir and includedir later on
+ prefix="@prefix@"
+ exec_prefix="@exec_prefix@"
+ 
+@@ -59,7 +59,7 @@
+        	;;
+ 
+     --libs)
+-       	echo "-L at libdir@" -lgphoto2_port
++       	echo -lgphoto2_port
+        	;;
+ 
+     *)


-- System Information:
Debian Release: 8.0
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'stable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.16.0-4-amd64 (SMP w/8 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)

Versions of packages libgphoto2-dev depends on:
ii  libexif-dev   0.6.21-2
ii  libgphoto2-6  2.5.4-1.1+b2
ii  pkg-config    0.28-1

libgphoto2-dev recommends no packages.

libgphoto2-dev suggests no packages.

-- no debconf information