[med-svn] r2100 - trunk/packages/muscle/branches/libmuscle/debian

[tille at alioth.debian.org]

Author: tille
Date: 2008-06-26 05:23:14 +0000 (Thu, 26 Jun 2008)
New Revision: 2100

Modified:
   trunk/packages/muscle/branches/libmuscle/debian/changelog
   trunk/packages/muscle/branches/libmuscle/debian/control
   trunk/packages/muscle/branches/libmuscle/debian/get-orig-source
   trunk/packages/muscle/branches/libmuscle/debian/rules
   trunk/packages/muscle/branches/libmuscle/debian/watch
Log:
This would be ready for upload from a paackaging point of view but unfortunately upstream build system links muscle binary statically instead against the dynamic library which is builded.  I tried to fix this but failed and contacted upstream.  Any hints are welcome.


Modified: trunk/packages/muscle/branches/libmuscle/debian/changelog
===================================================================
--- trunk/packages/muscle/branches/libmuscle/debian/changelog	2008-06-26 04:12:29 UTC (rev 2099)
+++ trunk/packages/muscle/branches/libmuscle/debian/changelog	2008-06-26 05:23:14 UTC (rev 2100)
@@ -1,9 +1,9 @@
-libmuscle (1:3.7.20080422-1) UNRELEASED; urgency=low
+libmuscle (1:3.7.0.1-1) UNRELEASED; urgency=low
 
   * New packaging with separate dynamical library based on the work
     of Aaron Darling
 
- -- Andreas Tille <tille at debian.org>  Tue, 22 Apr 2008 14:35:32 +0200
+ -- Andreas Tille <tille at debian.org>  Wed, 25 Jun 2008 15:03:15 +0200
 
 muscle (3.70+fix1-2) unstable; urgency=low
 

Modified: trunk/packages/muscle/branches/libmuscle/debian/control
===================================================================
--- trunk/packages/muscle/branches/libmuscle/debian/control	2008-06-26 04:12:29 UTC (rev 2099)
+++ trunk/packages/muscle/branches/libmuscle/debian/control	2008-06-26 05:23:14 UTC (rev 2100)
@@ -26,7 +26,7 @@
 Package: libmuscle-3.7-1
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}
 Description: multiple alignment of protein sequences library
  libMUSCLE is library that is used by MUSCLE a multiple alignment program
  for protein sequences. MUSCLE stands for multiple sequence comparison by
@@ -38,7 +38,7 @@
 
 Package: muscle
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}
 Conflicts: muscle-doc
 Replaces: muscle-doc
 Provides: muscle-doc

Modified: trunk/packages/muscle/branches/libmuscle/debian/get-orig-source
===================================================================
--- trunk/packages/muscle/branches/libmuscle/debian/get-orig-source	2008-06-26 04:12:29 UTC (rev 2099)
+++ trunk/packages/muscle/branches/libmuscle/debian/get-orig-source	2008-06-26 05:23:14 UTC (rev 2100)
@@ -1,11 +1,13 @@
 #!/bin/sh -e
 set -x
-
-URL="http://gel.ahabs.wisc.edu/mauve/source/snapshots/"
+# MAUVEVERSION=snapshots
+MAUVEVERSION=mauve_2.2.0
+URL="http://gel.ahabs.wisc.edu/mauve/source/${MAUVEVERSION}/"
 NAME=libmuscle
-UVERSION=snapshot
+UNAME=libMUSCLE
+UVERSION=1.0.0
 DVERSION=3.7
-UPSTREAMTAR=muscle-"$UVERSION".tar.gz
+UPSTREAMTAR="$UNAME"-"$UVERSION".tar.gz
 UPSTREAMDIR=muscle
 
 # To rebuild the new upstream tarball you need these
@@ -34,16 +36,32 @@
 if [ ! -f "$UPSTREAMTAR" ] ; then
     wget "$URL"/"$UPSTREAMTAR"
 fi
+
 tar -xzf "$UPSTREAMTAR"
 
+if [ ! -d "$UPSTREAMDIR" ] ; then
+    if [ -d "${UNAME}-${UVERSION}" ] ; then
+	UPSTREAMDIR="${UNAME}-${UVERSION}"
+    else
+	echo "UPSTREAMDIR ${UPSTREAMDIR} not found - please verify version numbers in $0"
+	exit -1
+    fi
+fi
 cd "$UPSTREAMDIR"
 
+# when downloading a snapshot release
 autogen.sh
 ./configure
 make dist
 
-DISTTAR="libMUSCLE-1.0.0.tar.gz"
-DVERSION="${DVERSION}."`date +%Y%m%d`
+    DISTTAR="$UPSTREAMTAR"
+
+if [ "$MAUVEVERSION" = "snapshots" ] ; then
+    DVERSION="${DVERSION}."`date +%Y%m%d`
+else
+    DVERSION="${DVERSION}.0.1"
+fi
+
 mv "$DISTTAR" ../"$NAME"_"$DVERSION".orig.tar.gz
 cd ..
 # rm -rf "$UPSTREAMDIR"

Modified: trunk/packages/muscle/branches/libmuscle/debian/rules
===================================================================
--- trunk/packages/muscle/branches/libmuscle/debian/rules	2008-06-26 04:12:29 UTC (rev 2099)
+++ trunk/packages/muscle/branches/libmuscle/debian/rules	2008-06-26 05:23:14 UTC (rev 2100)
@@ -15,7 +15,7 @@
 	# /bin/sh debian/debug/
 	mv debian/tmp/usr/include/*/* debian/tmp/usr/include/
 	# cp -a doc/html/* debian/tmp/usr/share/doc/html
-	/bin/bash debian/d-shlibmove --commit \
+	/bin/bash debian/d-shlibmove  --override s/libstdc++6-dev/libstdc++6-4.3-dev/ --commit \
 		    --movedev "debian/tmp/usr/include/$(name)" usr/include/$(name)-$(version) \
 		    --movedev "$(name)-$(version).pc" usr/share/pkgconfig \
 		    debian/tmp/usr/lib/$(name)-$(version).so

Modified: trunk/packages/muscle/branches/libmuscle/debian/watch
===================================================================
--- trunk/packages/muscle/branches/libmuscle/debian/watch	2008-06-26 04:12:29 UTC (rev 2099)
+++ trunk/packages/muscle/branches/libmuscle/debian/watch	2008-06-26 05:23:14 UTC (rev 2100)
@@ -1,3 +1,3 @@
 version=3
 
-http://gel.ahabs.wisc.edu/mauve/source/libGenome-(.*)\.tar\.gz
+http://gel.ahabs.wisc.edu/mauve/source/mauve_([\.\d]+)/ libMUSCLE-(.*)\.tar\.gz