Make libsane-dev fit for multiarch

4 files changed, 21 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index fb494ce..76f7efd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+sane-backends (1.0.24-13) UNRELEASED; urgency=medium
+
+  * debian/rules:
+    - Move architecture dependent file sane-config to 
+      sane-config.${DEB_HOST_MULTIARCH} (Closes: #786923).
+  * debian/control:
+    - Add "dh-exec (>=0.3)" to Build-depends. Dh-exec is required
+      for the new libsane-dev.links.
+  * New debian/libsane-dev.links:
+    - Create link from sane-config.${DEB_HOST_MULTIARCH} to
+      sane-config.
+
+ -- Jörg Frings-Fürst <debian@jff-webhosting.net>  Wed, 27 May 2015 09:51:34 +0200
+
 sane-backends (1.0.24-12) unstable; urgency=medium
 
   * debian/sane-utils.postinst:
diff --git a/debian/control b/debian/control
index eb8bd0f..847b503 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Build-Depends:
  autoconf,
  chrpath,
  debhelper (>= 9),
+ dh-exec (>=0.3),
  dh-systemd,
  gettext,
  libavahi-client-dev,
diff --git a/debian/libsane-dev.links b/debian/libsane-dev.links
new file mode 100755
index 0000000..1e2797b
--- /dev/null
+++ b/debian/libsane-dev.links
@@ -0,0 +1,3 @@
+#! /usr/bin/dh-exec
+
+usr/bin/sane-config.${DEB_HOST_MULTIARCH} usr/bin/sane-config
diff --git a/debian/rules b/debian/rules
index 062c99d..b387128 100755
--- a/debian/rules
+++ b/debian/rules
@@ -92,6 +92,9 @@ override_dh_install:
 	#
 	mkdir -p $(CURDIR)/debian//sane-utils/usr/share/man/man5/
 	cp $(CURDIR)/doc/sane-umax_pp.man $(CURDIR)/debian/sane-utils/usr/share/man/man5/umax_pp.5
+	#
+	mv ${CURDIR}/debian/libsane-dev/usr/bin/sane-config ${CURDIR}/debian/libsane-dev/usr/bin/sane-config.${DEB_HOST_MULTIARCH}
+
 
 override_dh_installdocs:
 	dh_installdocs