[med-svn] r3837 - in trunk/packages/theseus/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2009-08-31 12:57:40 +0000 (Mon, 31 Aug 2009)
New Revision: 3837

Added:
   trunk/packages/theseus/trunk/debian/README.source
Modified:
   trunk/packages/theseus/trunk/debian/changelog
   trunk/packages/theseus/trunk/debian/control
   trunk/packages/theseus/trunk/debian/patches/200-make.inc.patch
Log:
Fix library building and compilation options; add README.source to mention quilt; some lintian issues


Added: trunk/packages/theseus/trunk/debian/README.source
===================================================================
--- trunk/packages/theseus/trunk/debian/README.source	                        (rev 0)
+++ trunk/packages/theseus/trunk/debian/README.source	2009-08-31 12:57:40 UTC (rev 3837)
@@ -0,0 +1,4 @@
+This packages uses the quilt patch system. Please read
+/usr/share/doc/quilt/README.source for more information.
+
+ -- Andreas Tille <tille at debian.org>  Mon, 31 Aug 2009 14:50:19 +0200

Modified: trunk/packages/theseus/trunk/debian/changelog
===================================================================
--- trunk/packages/theseus/trunk/debian/changelog	2009-08-31 10:57:50 UTC (rev 3836)
+++ trunk/packages/theseus/trunk/debian/changelog	2009-08-31 12:57:40 UTC (rev 3837)
@@ -13,10 +13,13 @@
     because these are called in theseus_align
   * Use debian/{docs,manpages, examples} instead of arguments of
     the debhelper installers to enable short rules file
-  * Reenabled patch for theseus_align and do not tweak upstream
+  * Re-enabled patch for theseus_align and do not tweak upstream
     tarball just to s?usr/local/bin?usr/bin?
+  * debian/patches/200-make.inc.patch: Use ar directly to to avoid
+    problems with libtool, drop -arch command line options to gcc
+    which let compilation fail
 
- -- Andreas Tille <tille at debian.org>  Mon, 17 Aug 2009 15:50:19 +0200
+ -- Andreas Tille <tille at debian.org>  Mon, 31 Aug 2009 14:50:19 +0200
 
 theseus (1.3.9-2) UNRELEASED; urgency=low
 

Modified: trunk/packages/theseus/trunk/debian/control
===================================================================
--- trunk/packages/theseus/trunk/debian/control	2009-08-31 10:57:50 UTC (rev 3836)
+++ trunk/packages/theseus/trunk/debian/control	2009-08-31 12:57:40 UTC (rev 3837)
@@ -5,7 +5,7 @@
 Uploaders: Morten Kjeldgaard <mok0 at ubuntu.com>,
  Andreas Tille <tille at debian.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 7), quilt, libgsl0-dev, liblapack-dev, libtool
+Build-Depends: debhelper (>= 7.1), quilt, libgsl0-dev, liblapack-dev, libtool
 Standards-Version: 3.8.3
 Homepage: http://www.theseus3d.org
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/theseus/trunk/
@@ -13,7 +13,7 @@
 
 Package: theseus
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: muscle, clustlaw, mafft, t-coffee, kalign, dialign
 Description: superimpose macromolecules using maximum likelihood
  Theseus is a program that simultaneously superimposes multiple

Modified: trunk/packages/theseus/trunk/debian/patches/200-make.inc.patch
===================================================================
--- trunk/packages/theseus/trunk/debian/patches/200-make.inc.patch	2009-08-31 10:57:50 UTC (rev 3836)
+++ trunk/packages/theseus/trunk/debian/patches/200-make.inc.patch	2009-08-31 12:57:40 UTC (rev 3837)
@@ -1,10 +1,37 @@
-Add Ububtu specific build options which work for Debian as well
+1. Use ar instead of libtool because of "libtool: unrecognized option `-o'" error
+   when using libtool (Andreas Tille)
+2. Remove -arch options which let gcc fail (Andreas Tille)
+3. Add Ubuntu specific build options which work for Debian as well (Morten Kjeldgaard)
 Author: Morten Kjeldgaard <mok at bioxray.dk>
 Switched to quilt: Andreas Tille <tille at debian.org>
 
---- theseus-1.3.4~/make.inc	2008-11-17 12:52:53.000000000 +0100
-+++ theseus-1.3.4/make.inc	2008-11-17 12:53:04.000000000 +0100
-@@ -195,3 +195,16 @@
+--- theseus.orig/make.inc
++++ theseus/make.inc
+@@ -2,10 +2,10 @@
+ #  The archiver and the flag(s) to use when building archive (library)
+ #  If you system has no ranlib, set RANLIB = echo.
+ #
+-#ARCH     = ar
+-ARCH = libtool
+-ARCHFLAGS = -o
+-#ARCHFLAGS= -rvs
++ARCH     = ar
++#ARCH = libtool
++#ARCHFLAGS = -o
++ARCHFLAGS= -rvs
+ RANLIB   = ranlib
+ 
+ #MACOSX_DEPLOYMENT_TARGET=10.4
+@@ -21,7 +21,7 @@
+ INSTALLDIR = /usr/local/bin
+ OPT = -O3 -ffast-math -fstrict-aliasing -funroll-loops -fomit-frame-pointer 
+ WARN = -Wall -Werror -pedantic -std=c99 -Wstrict-aliasing=2
+-CFLAGS = $(WARN) -force_cpusubtype_ALL -mmacosx-version-min=10.4 -arch ppc -arch i386 -DNDEBUG
++CFLAGS = $(WARN) -DNDEBUG
+ CC = /usr/bin/gcc
+ 
+ 
+@@ -241,3 +241,16 @@
  # CFLAGS = $(WARN)
  # CC = cc