Author: malat Date: 2013-06-03 09:26:46 +0000 (Mon, 03 Jun 2013) New Revision: 13813
Added: trunk/packages/pixelmed/trunk/debian/patches/encoding_issues.patch trunk/packages/pixelmed/trunk/debian/source/options Modified: trunk/packages/pixelmed/trunk/debian/changelog trunk/packages/pixelmed/trunk/debian/get-orig-source trunk/packages/pixelmed/trunk/debian/patches/series trunk/packages/pixelmed/trunk/debian/patches/target_java_1.7.patch trunk/packages/pixelmed/trunk/debian/rules Log: Fix javadoc execution + add xz compression Modified: trunk/packages/pixelmed/trunk/debian/changelog =================================================================== --- trunk/packages/pixelmed/trunk/debian/changelog 2013-06-03 08:57:12 UTC (rev 13812) +++ trunk/packages/pixelmed/trunk/debian/changelog 2013-06-03 09:26:46 UTC (rev 13813) @@ -1,9 +1,13 @@ pixelmed (20130426-1) unstable; urgency=low * New upstream + Split pixelmed-java into libpixelmed-java and pixelmed-apps * Provides webapps as command line utils. Closes: #657354 + See pixelmed-webstart-apps package * Add command line tools. Closes: #664087 + See pixelmed-apps package * FTBFS with Java7 (uses internal Java API). Closes: #678383 + * Switch to XZ compression -- Mathieu Malaterre <[email protected]> Mon, 03 Jun 2013 09:33:37 +0200 Modified: trunk/packages/pixelmed/trunk/debian/get-orig-source =================================================================== --- trunk/packages/pixelmed/trunk/debian/get-orig-source 2013-06-03 08:57:12 UTC (rev 13812) +++ trunk/packages/pixelmed/trunk/debian/get-orig-source 2013-06-03 09:26:46 UTC (rev 13813) @@ -14,7 +14,7 @@ if [ -z ${TARFILE}]; then -TARFILE=${PACKAGE}_${VERSION}.orig.tar.gz +TARFILE=${PACKAGE}_${VERSION}.orig.tar.xz fi FOLDER=${PACKAGE}-${VERSION} @@ -43,6 +43,6 @@ bzcat CHANGES.bz2 > ${FOLDER}/CHANGES rm CHANGES.bz2 -GZIP="--best --no-name" tar czf ${TARFILE} ${FOLDER} +GZIP="--best --no-name" tar cJf ${TARFILE} ${FOLDER} rm -rf ${FOLDER} rm ${UPSTREAM_SRC}.tar.bz2 Added: trunk/packages/pixelmed/trunk/debian/patches/encoding_issues.patch =================================================================== --- trunk/packages/pixelmed/trunk/debian/patches/encoding_issues.patch (rev 0) +++ trunk/packages/pixelmed/trunk/debian/patches/encoding_issues.patch 2013-06-03 09:26:46 UTC (rev 13813) @@ -0,0 +1,14 @@ +Description: javadoc fails when encoding is not set +Author: Mathieu Malaterre <[email protected]> +Forwarded: not-needed + +--- pixelmed-20130426.orig/Makefile ++++ pixelmed-20130426/Makefile +@@ -918,6 +918,7 @@ javadoc: + -link http://www.hsqldb.org/doc/src/ \ + -link http://javasourcecode.org/html/open-source/junit/junit-4.8.1/ \ + -protected -d docs/javadoc \ ++ -encoding "UTF-8" \ + ${SUBPACKAGES} + + doxygen: Modified: trunk/packages/pixelmed/trunk/debian/patches/series =================================================================== --- trunk/packages/pixelmed/trunk/debian/patches/series 2013-06-03 08:57:12 UTC (rev 13812) +++ trunk/packages/pixelmed/trunk/debian/patches/series 2013-06-03 09:26:46 UTC (rev 13813) @@ -14,3 +14,4 @@ remove_x_test.patch fix_jnlp.patch add_usage.patch +encoding_issues.patch Modified: trunk/packages/pixelmed/trunk/debian/patches/target_java_1.7.patch =================================================================== --- trunk/packages/pixelmed/trunk/debian/patches/target_java_1.7.patch 2013-06-03 08:57:12 UTC (rev 13812) +++ trunk/packages/pixelmed/trunk/debian/patches/target_java_1.7.patch 2013-06-03 09:26:46 UTC (rev 13813) @@ -1,20 +1,18 @@ Description: Update java to use version 1.7 instead of 1.5. -This patch updates the Makefiles to use Java 1.7. This fixes some issues -but causes an issue in com.pixelmed.display.ApplicationFrame. This issue -is due to a deprecated library to be used when writing and encoding files. -This has been updated to use the ImageIO library. - + This patch updates the Makefiles to use Java 1.7. This fixes some issues + but causes an issue in com.pixelmed.display.ApplicationFrame. This issue + is due to a deprecated library to be used when writing and encoding files. + This has been updated to use the ImageIO library. Author: Chris J Arges <[email protected]> Bug-Debian: http://bugs.debian.org/678383 Bug-Ubuntu: https://launchpad.net/bugs/888993 Last-Update: 2012-06-28 +Reviewed-By: Mathieu Malaterre <[email protected]> ---- - -Index: pixelmed-20130220/com/pixelmed/display/ApplicationFrame.java +Index: pixelmed-20130426/com/pixelmed/display/ApplicationFrame.java =================================================================== ---- pixelmed-20130220.orig/com/pixelmed/display/ApplicationFrame.java 2013-04-25 10:18:12.000000000 +0200 -+++ pixelmed-20130220/com/pixelmed/display/ApplicationFrame.java 2013-04-25 10:18:23.521821760 +0200 +--- pixelmed-20130426.orig/com/pixelmed/display/ApplicationFrame.java 2013-06-03 11:25:12.729170930 +0200 ++++ pixelmed-20130426/com/pixelmed/display/ApplicationFrame.java 2013-06-03 11:25:12.773170929 +0200 @@ -9,6 +9,7 @@ import java.awt.event.*; import java.util.*; @@ -32,16 +30,3 @@ } catch (Exception ex) { ex.printStackTrace(); -Index: pixelmed-20130220/Makefile.common.mk -=================================================================== ---- pixelmed-20130220.orig/Makefile.common.mk 2013-04-25 10:18:10.000000000 +0200 -+++ pixelmed-20130220/Makefile.common.mk 2013-04-25 10:20:10.789820553 +0200 -@@ -41,7 +41,7 @@ - - SERVERADDITIONALJARS = ${VIEWERADDITIONALJARS} - --JAVAVERSIONTARGET=1.5 -+JAVAVERSIONTARGET=1.5 - - JAVACTARGETOPTIONS=-target ${JAVAVERSIONTARGET} -source ${JAVAVERSIONTARGET} - Modified: trunk/packages/pixelmed/trunk/debian/rules =================================================================== --- trunk/packages/pixelmed/trunk/debian/rules 2013-06-03 08:57:12 UTC (rev 13812) +++ trunk/packages/pixelmed/trunk/debian/rules 2013-06-03 09:26:46 UTC (rev 13813) @@ -12,8 +12,11 @@ $(MAKE) all $(MAKE) javadoc +# See #568897 +ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) override_dh_auto_test: $(MAKE) -C com/pixelmed/test alltests +endif override_dh_auto_install: # FIXME: isn't there something easier: Added: trunk/packages/pixelmed/trunk/debian/source/options =================================================================== --- trunk/packages/pixelmed/trunk/debian/source/options (rev 0) +++ trunk/packages/pixelmed/trunk/debian/source/options 2013-06-03 09:26:46 UTC (rev 13813) @@ -0,0 +1,3 @@ +compression = xz +compression-level = 9 + _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
