Bug#763909: Bug#767919: unblock: viewmol/2.4.1-21

[Graham Inggs]

On 05/11/2014 11:40, Andreas Tille wrote:
> To bad that we stumbled to late about this problem to block the way more
> simple solution sith source format and debhelper. :-)

Yeah, that would have been simpler.
Running configure in the build-arch target instead of the build target 
seems to have done the trick.

I attach a debdiff against 2.4.1-21 which pre-applies 
debian/patches/150-getmachine_multiarch.patch and modifies the 
build-arch target in debian/rules.
It also includes the minor changes from 
git://anonscm.debian.org/debian-science/packages/viewmol.git.
Please feel free to modify the changelog as you see fit (or anything 
else, for that matter).

-------------- next part --------------
diff -u viewmol-2.4.1/debian/changelog viewmol-2.4.1/debian/changelog
--- viewmol-2.4.1/debian/changelog
+++ viewmol-2.4.1/debian/changelog
@@ -1,3 +1,17 @@
+viewmol (2.4.1-22) unstable; urgency=medium
+
+  [ Andreas Tille ]
+  * Team upload.
+  * Add debian/gbp.conf
+  * Add Homepage and Vcs fields
+
+  [ 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
 
   * Team upload.
diff -u viewmol-2.4.1/debian/control viewmol-2.4.1/debian/control
--- viewmol-2.4.1/debian/control
+++ viewmol-2.4.1/debian/control
@@ -5,6 +5,9 @@
 Uploaders: Drew Parsons <dparsons at debian.org>
 Build-Depends: debhelper (>= 5.0.37.2), quilt, libtiff5-dev, libpng-dev, zlib1g-dev, libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev, libmotif-dev, libxmu-dev, libxi-dev, libxext-dev, libxt-dev, libx11-dev, python-dev, python-support (>= 0.3)
 Standards-Version: 3.9.4
+Homepage: http://viewmol.sourceforge.net/
+Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/viewmol.git
+Vcs-Git: git://anonscm.debian.org/debian-science/packages/viewmol.git
 
 Package: viewmol
 Architecture: any
diff -u viewmol-2.4.1/debian/patches/series viewmol-2.4.1/debian/patches/series
--- viewmol-2.4.1/debian/patches/series
+++ viewmol-2.4.1/debian/patches/series
@@ -8 +8 @@
-150-getmachine_multiarch.patch
+#150-getmachine_multiarch.patch  # already applied pre-quilt
diff -u viewmol-2.4.1/debian/rules viewmol-2.4.1/debian/rules
--- viewmol-2.4.1/debian/rules
+++ viewmol-2.4.1/debian/rules
@@ -19,8 +19,8 @@
 	# 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 -u viewmol-2.4.1/source/getmachine viewmol-2.4.1/source/getmachine
--- viewmol-2.4.1/source/getmachine
+++ viewmol-2.4.1/source/getmachine
@@ -84,9 +84,9 @@
   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 @@
   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 @@
   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"
only in patch2:
unchanged:
--- viewmol-2.4.1.orig/debian/gbp.conf
+++ viewmol-2.4.1/debian/gbp.conf
@@ -0,0 +1,3 @@
+[DEFAULT]
+upstream-branch = upstream
+debian-branch = debian-unstable