Author: tille Date: 2011-01-25 16:32:51 +0000 (Tue, 25 Jan 2011) New Revision: 5706
Modified: trunk/packages/imagej/trunk/debian/changelog trunk/packages/imagej/trunk/debian/control trunk/packages/imagej/trunk/debian/get-orig-source trunk/packages/imagej/trunk/debian/patches/600997.patch trunk/packages/imagej/trunk/debian/patches/exclude-quilt-from-ant.patch trunk/packages/imagej/trunk/debian/rules Log: New upstream version Modified: trunk/packages/imagej/trunk/debian/changelog =================================================================== --- trunk/packages/imagej/trunk/debian/changelog 2011-01-25 13:19:03 UTC (rev 5705) +++ trunk/packages/imagej/trunk/debian/changelog 2011-01-25 16:32:51 UTC (rev 5706) @@ -1,3 +1,13 @@ +imagej (1.44n-1) unstable; urgency=low + + * New upstream version + * debian/get-orig-source: Fetch latest upstream version rather + than currently packaged upstream tarball + * debian/rules: dh $@ --with javahelper + * debian/control: Build-Depends: javahelper + + -- Andreas Tille <ti...@debian.org> Tue, 25 Jan 2011 17:07:07 +0100 + imagej (1.44i-1) unstable; urgency=low * Team upload. Modified: trunk/packages/imagej/trunk/debian/control =================================================================== --- trunk/packages/imagej/trunk/debian/control 2011-01-25 13:19:03 UTC (rev 5705) +++ trunk/packages/imagej/trunk/debian/control 2011-01-25 16:32:51 UTC (rev 5706) @@ -5,7 +5,7 @@ DM-Upload-Allowed: yes Uploaders: Paolo Ariano <paolo.ari...@unito.it>, Andreas Tille <ti...@debian.org> -Build-Depends: openjdk-6-jdk, debhelper (>=7.1), ant +Build-Depends: openjdk-6-jdk, debhelper (>=7.1), ant, javahelper Standards-Version: 3.9.1 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/imagej/trunk/?rev=0&sc=0 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/imagej/trunk/ Modified: trunk/packages/imagej/trunk/debian/get-orig-source =================================================================== --- trunk/packages/imagej/trunk/debian/get-orig-source 2011-01-25 13:19:03 UTC (rev 5705) +++ trunk/packages/imagej/trunk/debian/get-orig-source 2011-01-25 16:32:51 UTC (rev 5706) @@ -4,7 +4,13 @@ NAME=imagej # Obtain upstream version number from changelog file -DVERSION=`grep "^${NAME} *(.\+)" debian/changelog | head -n 1 | sed "s/^${NAME} \+(\([^-]\+\)-[0-9]*) .*/\1/"` +# DVERSION=`grep "^${NAME} *(.\+)" debian/changelog | head -n 1 | sed "s/^${NAME} \+(\([^-]\+\)-[0-9]*) .*/\1/"` +# Find out latest upstream version +DVERSION=`uscan --verbose --force-download | \ + grep "Newest version on remote site is .* local version is .*" | \ + head -n 1 | \ + sed "s/Newest version on remote site is \([-0-9.]\+[a-z]*\),.*/\1/"` + UVERSION=ij`echo ${DVERSION} | sed 's/\.//'` UPSTREAMZIP=${UVERSION}-src.zip Modified: trunk/packages/imagej/trunk/debian/patches/600997.patch =================================================================== --- trunk/packages/imagej/trunk/debian/patches/600997.patch 2011-01-25 13:19:03 UTC (rev 5705) +++ trunk/packages/imagej/trunk/debian/patches/600997.patch 2011-01-25 16:32:51 UTC (rev 5706) @@ -2,11 +2,9 @@ Author: Frederic Mothe <mo...@nancy.inra.fr> Bug: http://bugs.debian.org/600997 Forwarded: yes -diff --git a/ij/gui/YesNoCancelDialog.java b/ij/gui/YesNoCancelDialog.java -index 3a44f7c..fdb7c79 100644 ---- a/ij/gui/YesNoCancelDialog.java -+++ b/ij/gui/YesNoCancelDialog.java -@@ -72,7 +72,7 @@ public class YesNoCancelDialog extends Dialog implements ActionListener, KeyList +--- imagej-1.44n.orig/ij/gui/YesNoCancelDialog.java ++++ imagej-1.44n/ij/gui/YesNoCancelDialog.java +@@ -72,7 +72,7 @@ } void closeDialog() { Modified: trunk/packages/imagej/trunk/debian/patches/exclude-quilt-from-ant.patch =================================================================== --- trunk/packages/imagej/trunk/debian/patches/exclude-quilt-from-ant.patch 2011-01-25 13:19:03 UTC (rev 5705) +++ trunk/packages/imagej/trunk/debian/patches/exclude-quilt-from-ant.patch 2011-01-25 16:32:51 UTC (rev 5706) @@ -2,10 +2,8 @@ See http://bugs.debian.org/600997 Author: Miguel Landaeta <mig...@miguel.cc> Forwarded: no -Index: imagej-1.44c/build.xml -=================================================================== ---- imagej-1.44c.orig/build.xml -+++ imagej-1.44c/build.xml +--- imagej-1.44n.orig/build.xml ++++ imagej-1.44n/build.xml @@ -10,6 +10,9 @@ <!-- The plugins directory only needs to be present at runtime, not at build time. --> Modified: trunk/packages/imagej/trunk/debian/rules =================================================================== --- trunk/packages/imagej/trunk/debian/rules 2011-01-25 13:19:03 UTC (rev 5705) +++ trunk/packages/imagej/trunk/debian/rules 2011-01-25 16:32:51 UTC (rev 5706) @@ -2,7 +2,7 @@ # debian/rules for imagej %: - dh $@ + dh $@ --with javahelper # install/imagej:: override_dh_auto_install: _______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit