Bug#763909: viewmol: /usr/bin/viewmol missing for most archs

2014-11-03 Thread Graham Inggs
reopen 763909
thanks

Hi Andreas

Thanks for the upload.  Unfortunately it didn't seem to work.  :(
From the i386 buildlog, it appears that getmachine runs before
dh_quilt_patch, so the patch hasn't been applied yet.
I'll see if I can convert the package to source format 3.0 (dquilt)
and I should be able to fix the kfreebsd builds as well.

Regards
Graham


-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#763909: viewmol: /usr/bin/viewmol missing for most archs

2014-11-03 Thread Andreas Tille
Hi Graham,

it would be great if you could revise the patch.  I admit that the
package is in a quite outdated packaging state. :-(

Just ping me if you found a better solution and I'll do my best
to upload quickly.

Kind regards

  Andreas.

On Mon, Nov 03, 2014 at 09:30:59PM +0200, Graham Inggs wrote:
 reopen 763909
 thanks
 
 Hi Andreas
 
 Thanks for the upload.  Unfortunately it didn't seem to work.  :(
 From the i386 buildlog, it appears that getmachine runs before
 dh_quilt_patch, so the patch hasn't been applied yet.
 I'll see if I can convert the package to source format 3.0 (dquilt)
 and I should be able to fix the kfreebsd builds as well.
 
 Regards
 Graham
 

-- 
http://fam-tille.de


-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org



Bug#763909: viewmol: /usr/bin/viewmol missing for most archs

2014-11-03 Thread Graham Inggs
Hi Andreas

I attach a debdiff switching viewmol to source format 3.0 (quilt) and
debhelper 9.
This does the right thing on the Ubuntu PPA builders, at least for the
i386 and amd64 builds I tested.
I also attach my debian.tar.xz, as it may be easier to extract the
original source tarball followed by debian.tar.xz, rather than deal
with the direct changes to source/getmachine (documented in
debian/source.lintian-overrides and debian/patches/series).

If you feel the changes I have made are too drastic so close to
freeze, I'm sure that 150-getmachine_multiarch.patch can be
pre-applied in much the same way as 011_getmachine_HURD.diff, and
viewmol can remain in source format 1.0 for now.

I have not looked at a fix for kfreebsd yet, perhaps that should wait
until these changes are in testing first.

Regards
Graham


source-format-3-debhelper-9.debdiff
Description: Binary data


viewmol_2.4.1-22.debian.tar.xz
Description: application/xz


Bug#763909: viewmol: /usr/bin/viewmol missing for most archs

2014-10-27 Thread Graham Inggs
tags 763909 patch
thanks

So 'getmachine' is looking in the non-multiarch directories for
libtiff, libpng, etc.
The attached patch works for me locally, but probably needs some more work.
If nobody takes this, I'll prepare an NMU at the end of this week.
--- a/source/getmachine
+++ b/source/getmachine
@@ -117,9 +117,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
@@ -135,12 +135,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 ]
@@ -154,9 +154,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


Bug#763909: viewmol: /usr/bin/viewmol missing for most archs

2014-10-03 Thread Graham Inggs
Source: viewmol
Version: 2.4.1-20
Severity: serious

Hi Maintainer

I noticed that /usr/bin/viewmol is only present in the amd64 viewmol package.
For all other archs built on the buildds, /usr/bin/viewmol is missing.

Excerpt from the i386 build log:

make[1]: Entering directory `/«PKGBUILDDIR»/source'
/bin/sh getmachine viewmol
If you want to use environment variables in any of the following
paths, do it like this: $(HOME)
Please enter the name of the directory where libtiff.a can be found:
Please enter the name of the directory where the include file for
libtiff can be found: Please enter the name of the directory where
libpng.a can be found: make[2]: Entering directory
`/«PKGBUILDDIR»/source/Linux'
makefile:8: *** missing separator.  Stop.
...

# install the package into debian/viewmol.
cd source; ./install /«PKGBUILDDIR»/debian/viewmol/usr
cp: cannot stat 'Linux/viewmol': No such file or directory
chmod: cannot access '/«PKGBUILDDIR»/debian/viewmol/usr/bin/viewmol':
No such file or directory

Regards
Graham


--
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org