[med-svn] r10358 - trunk/packages/bio-formats/trunk/debian

[Mathieu Malaterre]

Author: malat
Date: 2012-04-10 15:16:14 +0000 (Tue, 10 Apr 2012)
New Revision: 10358

Added:
   trunk/packages/bio-formats/trunk/debian/orig-tar.sh
Removed:
   trunk/packages/bio-formats/trunk/debian/get-orig-source
Modified:
   trunk/packages/bio-formats/trunk/debian/changelog
   trunk/packages/bio-formats/trunk/debian/rules
   trunk/packages/bio-formats/trunk/debian/watch
Log:
Use github tag

Modified: trunk/packages/bio-formats/trunk/debian/changelog
===================================================================
--- trunk/packages/bio-formats/trunk/debian/changelog	2012-04-10 14:48:30 UTC (rev 10357)
+++ trunk/packages/bio-formats/trunk/debian/changelog	2012-04-10 15:16:14 UTC (rev 10358)
@@ -1,9 +1,5 @@
-bio-formats (4.3.1-1) UNRELEASED; urgency=low
+bio-formats (4.3.3-1) UNRELEASED; urgency=low
 
-  * Initial Debian Upload (Closes: #??????)
+  * Initial Debian Upload (Closes: #641448)
 
-  [ Thorsten Alteholz ]
-  * debian/get-orig-source: put orig.tar.gz in ../tarballs to allow
-    automatic build with svn-buildpackage
-
  -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Wed, 07 Sep 2011 17:46:40 +0200

Deleted: trunk/packages/bio-formats/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/bio-formats/trunk/debian/get-orig-source	2012-04-10 14:48:30 UTC (rev 10357)
+++ trunk/packages/bio-formats/trunk/debian/get-orig-source	2012-04-10 15:16:14 UTC (rev 10358)
@@ -1,41 +0,0 @@
-#!/bin/sh
-set -ex
-
-PACKAGE=bio-formats
-
-VERSION=${VERSION:-$2}
-TARFILE=${TARFILE:-$3}
-
-if [ -z ${VERSION}]; then
-VERSION=`dpkg-parsechangelog | sed -n -e 's/^Version: \(.*\)-[^-]*$/\1/p'`
-fi
-
-REVISION=`echo $VERSION | sed -e 's/^.*svn//g'`
-
-
-if [ -z ${TARFILE}]; then
-TARFILE=${PACKAGE}_${VERSION}.orig.tar.gz
-fi
-
-#
-# put orig.tar in ../tarballs (-> default location for svn-buildpackage)
-mkdir -p ../tarballs
-cd ../tarballs
-
-FOLDER=${PACKAGE}-${VERSION}
-
-#git clone git://dev.loci.wisc.edu/bio-formats.git ${FOLDER}
-# new git rep is on github:
-git clone git://github.com/openmicroscopy/bioformats.git ${FOLDER}
-cd ${FOLDER}
-git checkout v${REVISION}
-# some kind of dll ?
-rm -rf lib
-# source less jars:
-rm -rf jar
-#
-rm -rf .git
-cd ..
-
-GZIP="--best --no-name" tar czf ${TARFILE} ${FOLDER}
-rm -rf ${FOLDER}

Added: trunk/packages/bio-formats/trunk/debian/orig-tar.sh
===================================================================
--- trunk/packages/bio-formats/trunk/debian/orig-tar.sh	                        (rev 0)
+++ trunk/packages/bio-formats/trunk/debian/orig-tar.sh	2012-04-10 15:16:14 UTC (rev 10358)
@@ -0,0 +1,21 @@
+#!/bin/sh -ex
+
+# called by uscan with '--upstream-version' <version> <file>
+TAR=../bio-formats-java_$2.orig.tar.gz
+DIR=bio-formats-$2
+
+# clean up the upstream tarball
+tar -zxf $3
+mv openmicroscopy-bioformats-* $DIR
+# remaining *.jar
+find $DIR -name *.jar -delete
+find $DIR -name *.dll -delete
+tar -czf $TAR $DIR
+rm -rf $DIR $3
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+    . .svn/deb-layout
+    mv $TAR $origDir
+    echo "moved $TAR to $origDir"
+fi


Property changes on: trunk/packages/bio-formats/trunk/debian/orig-tar.sh
___________________________________________________________________
Added: svn:executable
   + *

Modified: trunk/packages/bio-formats/trunk/debian/rules
===================================================================
--- trunk/packages/bio-formats/trunk/debian/rules	2012-04-10 14:48:30 UTC (rev 10357)
+++ trunk/packages/bio-formats/trunk/debian/rules	2012-04-10 15:16:14 UTC (rev 10358)
@@ -19,4 +19,4 @@
 	ant $(ANT_OPTS) -f build.xml
 
 get-orig-source:
-	./debian/get-orig-source
+	uscan --verbose --force-download

Modified: trunk/packages/bio-formats/trunk/debian/watch
===================================================================
--- trunk/packages/bio-formats/trunk/debian/watch	2012-04-10 14:48:30 UTC (rev 10357)
+++ trunk/packages/bio-formats/trunk/debian/watch	2012-04-10 15:16:14 UTC (rev 10358)
@@ -1,3 +1,3 @@
 version=3
-#http://githubredir.debian.net/github/openmicroscopy/bioformats
-https://github.com/openmicroscopy/bioformats/tags .*/tarball/v(\d.\d.\d)
+https://github.com/openmicroscopy/bioformats/tags .*/tarball/v(\d.\d.\d) \
+debian debian/orig-tar.sh