[viewmol] 01/01: Create executable on all architectures

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch debian-unstable
in repository viewmol.

commit 162b955bdadd15174f8129c9a0aab3220772be1a
Author: Andreas Tille <tille at debian.org>
Date:   Mon Nov 3 14:24:10 2014 +0100

    Create executable on all architectures
---
 debian/changelog                              |  9 +++++
 debian/patches/150-getmachine_multiarch.patch | 47 +++++++++++++++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 57 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ac76a3a..7c09ea2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+viewmol (2.4.1-21) unstable; urgency=medium
+
+  * Team upload.
+  * Create executable on all architectures (Thanks for the patch to
+    Graham Inggs <graham at nerve.org.za>)
+    Closes: #763909
+
+ -- Andreas Tille <tille at debian.org>  Mon, 03 Nov 2014 13:52:40 +0100
+
 viewmol (2.4.1-20) unstable; urgency=low
 
   * Use dh_quilt_patch instead of the xsfbs scripts.
diff --git a/debian/patches/150-getmachine_multiarch.patch b/debian/patches/150-getmachine_multiarch.patch
new file mode 100644
index 0000000..5b5c5f8
--- /dev/null
+++ b/debian/patches/150-getmachine_multiarch.patch
@@ -0,0 +1,47 @@
+Author: Graham Inggs <graham at nerve.org.za>
+Last-Updated: Mon, 27 Oct 2014 21:23:26 +0200
+Bug-Debian: http://bugs.debian.org/763909
+Desccription: 'getmachine' should look in multiarch directories for
+ libtiff, libpng, etc.
+
+--- a/source/getmachine
++++ b/source/getmachine
+@@ -117,9 +117,9 @@ then
+   hint=1
+ 
+   # TIFF library
+-  if [ -f /usr/lib/libtiff.a ]
++  if [ -f /usr/lib/$DEB_HOST_MULTIARCH/libtiff.a ]
+   then
+-    libtiff="-L/usr/lib"
++    libtiff="-L/usr/lib/$DEB_HOST_MULTIARCH"
+   elif [ -f /usr/local/lib/libtiff.a ]
+   then
+     libtiff="-L/usr/local/lib"
+@@ -135,12 +135,12 @@ then
+   echo "LIBTIFF = ${libtiff}" > .config.$os
+ 
+   # TIFF include file
+-  if [ -f /usr/include/tiff.h ]
++  if [ -f /usr/include/$DEB_HOST_MULTIARCH/tiff.h ]
+   then
+     case $os in
+       CYGWIN*) tiffinclude="."
+                ;;
+-      *)       tiffinclude="/usr/include"
++      *)       tiffinclude="/usr/include/$DEB_HOST_MULTIARCH"
+                ;;
+     esac
+   elif [ -f /usr/local/include/tiff.h ]
+@@ -154,9 +154,9 @@ then
+   echo "TIFFINCLUDE = $tiffinclude" >> .config.$os
+ 
+   # PNG library
+-  if [ -f /usr/lib/libpng.a -o -f /usr/lib/libpng12.a ]
++  if [ -f /usr/lib/$DEB_HOST_MULTIARCH/libpng.a -o -f /usr/lib/$DEB_HOST_MULTIARCH/libpng12.a ]
+   then
+-    libpng="-L/usr/lib"
++    libpng="-L/usr/lib/$DEB_HOST_MULTIARCH"
+   elif [ -f /usr/local/lib/libpng.a ]
+   then
+     libpng="-L/usr/local/lib"
diff --git a/debian/patches/series b/debian/patches/series
index 012eaee..c039694 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 120_PyObject.diff
 130_DEFAULTPATH.diff
 140_bin_awk.diff
+150-getmachine_multiarch.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/viewmol.git