--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package viewmol
Applying existing patch to Close #763909
Debdiff is attached
unblock viewmol/2.4.1-21
-- System Information:
Debian Release: 7.7
APT prefers stable
APT policy: (500, 'stable')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-4-amd64 (SMP w/1 CPU core)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
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,12 @@
+viewmol (2.4.1-21) unstable; urgency=medium
+
+ * Team upload.
+ * Create executable on all architectures (Thanks for the patch to
+ Graham Inggs <graham@nerve.org.za>)
+ Closes: #763909
+
+ -- Andreas Tille <tille@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 -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
@@ -7,0 +8 @@
+150-getmachine_multiarch.patch
only in patch2:
unchanged:
--- viewmol-2.4.1.orig/debian/patches/150-getmachine_multiarch.patch
+++ viewmol-2.4.1/debian/patches/150-getmachine_multiarch.patch
@@ -0,0 +1,47 @@
+Author: Graham Inggs <graham@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"
--- End Message ---