[viewmol] 01/01: Pre-apply debian/patches/150-getmachine_multiarch.patch. Update debian/rules: configure during the build-arch target. That's definitely no clean packaging but due to freeze policy which forbids changes in source format and debhelper compat version this seems to be the only chance

[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 8b3863b8ac53fdd1e075dd90a71f7e3d6d1bdfd5
Author: Andreas Tille <tille at debian.org>
Date:   Thu Nov 6 07:05:30 2014 +0100

    Pre-apply debian/patches/150-getmachine_multiarch.patch. Update debian/rules: configure during the build-arch target.  That's definitely no clean packaging but due to freeze policy which forbids changes in source format and debhelper compat version this seems to be the only chance
---
 debian/changelog      | 10 ++++++++--
 debian/patches/series |  2 +-
 debian/rules          |  4 ++--
 source/getmachine     | 12 ++++++------
 4 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 70f2a28..e51a1a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,16 @@
-viewmol (2.4.1-22) UNRELEASED; urgency=medium
+viewmol (2.4.1-22) unstable; urgency=medium
 
+  [ Andreas Tille ]
   * Team upload.
   * Add debian/gbp.conf
   * Add Homepage and Vcs fields
 
- -- Andreas Tille <tille at debian.org>  Mon, 03 Nov 2014 20:58:59 +0100
+  [ Graham Inggs ]
+  * Pre-apply debian/patches/150-getmachine_multiarch.patch.
+  * Update debian/rules: configure during the build-arch target.
+    Closes: #763909
+
+ -- Graham Inggs <graham at nerve.org.za>  Wed, 05 Nov 2014 11:59:03 +0200
 
 viewmol (2.4.1-21) unstable; urgency=medium
 
diff --git a/debian/patches/series b/debian/patches/series
index c039694..659753b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,4 @@
 120_PyObject.diff
 130_DEFAULTPATH.diff
 140_bin_awk.diff
-150-getmachine_multiarch.patch
+#150-getmachine_multiarch.patch  # already applied pre-quilt
diff --git a/debian/rules b/debian/rules
index 34bb95d..26f75b9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,8 +19,8 @@ configure-stamp:
 	# Add here commands to configure the package.
 	touch configure-stamp
 
-build: configure build-arch build-indep
-build-arch: build-stamp
+build: build-arch build-indep
+build-arch: configure build-stamp
 build-indep: build-stamp
 build-stamp:
 	dh_testdir
diff --git a/source/getmachine b/source/getmachine
index 5c9671f..51aa924 100755
--- a/source/getmachine
+++ b/source/getmachine
@@ -84,9 +84,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"
@@ -102,12 +102,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 ]
@@ -121,9 +121,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"

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