Author: tille Date: 2012-08-02 13:58:27 +0000 (Thu, 02 Aug 2012) New Revision: 11975
Modified: trunk/packages/imagej/trunk/debian/changelog trunk/packages/imagej/trunk/debian/compat trunk/packages/imagej/trunk/debian/control trunk/packages/imagej/trunk/debian/get-orig-source trunk/packages/imagej/trunk/debian/patches/exclude-quilt-from-ant.patch trunk/packages/imagej/trunk/debian/rules Log: New upsrteam version; ease Java transition; some general packaging updates; Fix build problem Modified: trunk/packages/imagej/trunk/debian/changelog =================================================================== --- trunk/packages/imagej/trunk/debian/changelog 2012-08-02 13:00:26 UTC (rev 11974) +++ trunk/packages/imagej/trunk/debian/changelog 2012-08-02 13:58:27 UTC (rev 11975) @@ -1,12 +1,20 @@ -imagej (1.46o-1) UNRELEASED; urgency=low +imagej (1.47a-1) unstable; urgency=low * New upstream version * debian/get-orig-source: Better handling when called via watch file * debian/watch: call get-orig-source * debian/upstream: citations - * debian/control: Standards-Version: 3.9.3 (no changes needed) + * debian/control: + - Standards-Version: 3.9.3 (no changes needed) + - Apply patch by James Page <[email protected]> to ease Java + transition (thanks to James) + Closes: #683539 + * debhelper 9 (control+compat) + * debian/rules: prevent dh_auto_build from trying to run the program + which would end up in a failure because of a lack of a valid display + * debian/get-orig-source: Use xz compression - -- Andreas Tille <[email protected]> Fri, 01 Jun 2012 12:17:40 +0200 + -- Andreas Tille <[email protected]> Thu, 02 Aug 2012 15:37:48 +0200 imagej (1.46a-1) unstable; urgency=low Modified: trunk/packages/imagej/trunk/debian/compat =================================================================== --- trunk/packages/imagej/trunk/debian/compat 2012-08-02 13:00:26 UTC (rev 11974) +++ trunk/packages/imagej/trunk/debian/compat 2012-08-02 13:58:27 UTC (rev 11975) @@ -1 +1 @@ -8 +9 Modified: trunk/packages/imagej/trunk/debian/control =================================================================== --- trunk/packages/imagej/trunk/debian/control 2012-08-02 13:00:26 UTC (rev 11974) +++ trunk/packages/imagej/trunk/debian/control 2012-08-02 13:58:27 UTC (rev 11975) @@ -5,7 +5,7 @@ DM-Upload-Allowed: yes Uploaders: Paolo Ariano <[email protected]>, Andreas Tille <[email protected]> -Build-Depends: openjdk-6-jdk, debhelper (>=8), ant, javahelper +Build-Depends: default-jdk, debhelper (>=9), ant, javahelper Standards-Version: 3.9.3 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/imagej/trunk/ Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/imagej/trunk/ @@ -13,7 +13,7 @@ Package: imagej Architecture: all -Depends: ${java:Depends}, ${misc:Depends}, openjdk-6-jre | sun-java6-jre +Depends: ${java:Depends}, ${misc:Depends}, default-jre | java6-runtime Suggests: java-virtual-machine Description: Image processing program inspired by NIH Image for the Macintosh It can display, edit, analyze, process, save and print 8-bit, 16-bit and Modified: trunk/packages/imagej/trunk/debian/get-orig-source =================================================================== --- trunk/packages/imagej/trunk/debian/get-orig-source 2012-08-02 13:00:26 UTC (rev 11974) +++ trunk/packages/imagej/trunk/debian/get-orig-source 2012-08-02 13:58:27 UTC (rev 11975) @@ -37,5 +37,5 @@ cd .. mv "$UPSTREAMDIR" "$NAME"-"$DVERSION" -GZIP="--best --no-name" tar --owner=root --group=root --mode=a+rX -czf "$NAME"_"$DVERSION".orig.tar.gz "$NAME"-"$DVERSION" +GZIP="--best --no-name" tar --owner=root --group=root --mode=a+rX -caf "$NAME"_"$DVERSION".orig.tar.xz "$NAME"-"$DVERSION" rm -rf "$NAME"-"$DVERSION" Modified: trunk/packages/imagej/trunk/debian/patches/exclude-quilt-from-ant.patch =================================================================== --- trunk/packages/imagej/trunk/debian/patches/exclude-quilt-from-ant.patch 2012-08-02 13:00:26 UTC (rev 11974) +++ trunk/packages/imagej/trunk/debian/patches/exclude-quilt-from-ant.patch 2012-08-02 13:58:27 UTC (rev 11975) @@ -2,8 +2,8 @@ See http://bugs.debian.org/600997 Author: Miguel Landaeta <[email protected]> Forwarded: no ---- imagej-1.45e.orig/build.xml -+++ imagej-1.45e/build.xml +--- imagej-1.47a.orig/build.xml ++++ imagej-1.47a/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 2012-08-02 13:00:26 UTC (rev 11974) +++ trunk/packages/imagej/trunk/debian/rules 2012-08-02 13:58:27 UTC (rev 11975) @@ -8,5 +8,8 @@ override_dh_auto_install: cp -a $(CURDIR)/debian/imagej.sh $(CURDIR)/debian/imagej/usr/bin/imagej +override_dh_auto_build: + ant build + get-orig-source: . debian/get-orig-source _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
