Author: malat Date: 2014-04-09 20:41:12 +0000 (Wed, 09 Apr 2014) New Revision: 16641
Removed: trunk/packages/pixelmed/trunk/debian/patches/fix_xslt.patch trunk/packages/pixelmed/trunk/debian/patches/remove_x_test.patch Modified: trunk/packages/pixelmed/trunk/debian/changelog trunk/packages/pixelmed/trunk/debian/patches/DicomImageViewer.properties.patch trunk/packages/pixelmed/trunk/debian/patches/addmanifest.patch trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch trunk/packages/pixelmed/trunk/debian/patches/fixdoc.patch trunk/packages/pixelmed/trunk/debian/patches/makefile.patch trunk/packages/pixelmed/trunk/debian/patches/removetest.patch trunk/packages/pixelmed/trunk/debian/patches/series Log: prepare next upload Modified: trunk/packages/pixelmed/trunk/debian/changelog =================================================================== --- trunk/packages/pixelmed/trunk/debian/changelog 2014-04-09 19:49:36 UTC (rev 16640) +++ trunk/packages/pixelmed/trunk/debian/changelog 2014-04-09 20:41:12 UTC (rev 16641) @@ -1,10 +1,11 @@ -pixelmed (20140128-1) unstable; urgency=low +pixelmed (20140326-1) unstable; urgency=low * New upstream * Add missing man pages * Bump Std-Vers to 3.9.5, no changes needed + * Explicitly depends on java-wrappers. Closes: #742592 - -- Mathieu Malaterre <[email protected]> Fri, 14 Feb 2014 10:51:14 +0100 + -- Mathieu Malaterre <[email protected]> Wed, 09 Apr 2014 22:36:42 +0200 pixelmed (20131018-1) unstable; urgency=low Modified: trunk/packages/pixelmed/trunk/debian/patches/DicomImageViewer.properties.patch =================================================================== --- trunk/packages/pixelmed/trunk/debian/patches/DicomImageViewer.properties.patch 2014-04-09 19:49:36 UTC (rev 16640) +++ trunk/packages/pixelmed/trunk/debian/patches/DicomImageViewer.properties.patch 2014-04-09 20:41:12 UTC (rev 16641) @@ -3,10 +3,10 @@ Author: Mathieu Malaterre <[email protected]> Last-Update: 2012-05-05 -Index: pixelmed-20130220/com/pixelmed/display/DicomImageViewer.java +Index: pixelmed-20140326/com/pixelmed/display/DicomImageViewer.java =================================================================== ---- pixelmed-20130220.orig/com/pixelmed/display/DicomImageViewer.java 2013-02-20 19:27:29.000000000 +0100 -+++ pixelmed-20130220/com/pixelmed/display/DicomImageViewer.java 2013-04-24 15:24:56.210587461 +0200 +--- pixelmed-20140326.orig/com/pixelmed/display/DicomImageViewer.java 2013-02-20 19:27:29.000000000 +0100 ++++ pixelmed-20140326/com/pixelmed/display/DicomImageViewer.java 2014-04-09 22:30:06.805214974 +0200 @@ -63,7 +63,7 @@ static final char screenSnapShotKeyChar = 'K'; @@ -16,11 +16,11 @@ // property names ... -Index: pixelmed-20130220/com/pixelmed/utils/FileUtilities.java +Index: pixelmed-20140326/com/pixelmed/utils/FileUtilities.java =================================================================== ---- pixelmed-20130220.orig/com/pixelmed/utils/FileUtilities.java 2012-11-18 11:25:36.000000000 +0100 -+++ pixelmed-20130220/com/pixelmed/utils/FileUtilities.java 2013-04-24 15:24:56.210587461 +0200 -@@ -226,7 +226,8 @@ +--- pixelmed-20140326.orig/com/pixelmed/utils/FileUtilities.java 2013-12-11 15:04:05.000000000 +0100 ++++ pixelmed-20140326/com/pixelmed/utils/FileUtilities.java 2014-04-09 22:30:06.809214974 +0200 +@@ -234,7 +234,8 @@ * @param fileName the file name to make a path to */ static public final String makePathToFileInUsersHomeDirectory(String fileName) { Modified: trunk/packages/pixelmed/trunk/debian/patches/addmanifest.patch =================================================================== --- trunk/packages/pixelmed/trunk/debian/patches/addmanifest.patch 2014-04-09 19:49:36 UTC (rev 16640) +++ trunk/packages/pixelmed/trunk/debian/patches/addmanifest.patch 2014-04-09 20:41:12 UTC (rev 16641) @@ -3,11 +3,11 @@ Author: Mathieu Malaterre <[email protected]> Last-Update: 2012-05-05 -Index: pixelmed-20130426/Makefile +Index: pixelmed-20140326/Makefile =================================================================== ---- pixelmed-20130426.orig/Makefile 2013-06-03 09:31:41.821247614 +0200 -+++ pixelmed-20130426/Makefile 2013-06-03 09:31:46.057247566 +0200 -@@ -345,7 +345,8 @@ +--- pixelmed-20140326.orig/Makefile 2014-04-09 22:30:13.269215181 +0200 ++++ pixelmed-20140326/Makefile 2014-04-09 22:30:16.009215268 +0200 +@@ -360,7 +360,8 @@ (cd com/pixelmed/apps; make all) (cd com/pixelmed/test; make all) date >BUILDDATE Modified: trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch =================================================================== --- trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch 2014-04-09 19:49:36 UTC (rev 16640) +++ trunk/packages/pixelmed/trunk/debian/patches/commons-net-ftp.patch 2014-04-09 20:41:12 UTC (rev 16641) @@ -3,11 +3,11 @@ Author: Mathieu Malaterre <[email protected]> Last-Update: 2012-05-05 -Index: pixelmed-20131018/Makefile +Index: pixelmed-20140326/Makefile =================================================================== ---- pixelmed-20131018.orig/Makefile 2013-12-10 17:50:21.226149732 +0100 -+++ pixelmed-20131018/Makefile 2013-12-10 17:50:22.098149722 +0100 -@@ -168,7 +168,7 @@ +--- pixelmed-20140326.orig/Makefile 2014-04-09 22:30:11.197215114 +0200 ++++ pixelmed-20140326/Makefile 2014-04-09 22:30:13.269215181 +0200 +@@ -183,7 +183,7 @@ WEBSTARTFILES = \ webstart/pixelmed.jar \ webstart/commons-codec-1.3.jar \ @@ -16,7 +16,7 @@ webstart/hsqldb.jar \ webstart/jmdns.jar \ webstart/excalibur-bzip2-1.0.jar \ -@@ -208,7 +208,7 @@ +@@ -223,7 +223,7 @@ DEPENDENCYRELEASEFILESWITHOUTREADME = \ lib/additional/commons-codec-1.3.jar \ @@ -25,7 +25,7 @@ lib/additional/excalibur-bzip2-1.0.jar \ lib/additional/hsqldb.jar \ lib/additional/vecmath1.2-1.14.jar \ -@@ -232,7 +232,7 @@ +@@ -247,7 +247,7 @@ DOSEUTILITYDEPENDENCYRELEASEFILES = \ lib/additional/commons-codec-1.3.jar \ @@ -34,7 +34,7 @@ lib/additional/excalibur-bzip2-1.0.jar \ lib/additional/hsqldb.jar \ lib/additional/vecmath1.2-1.14.jar \ -@@ -299,7 +299,7 @@ +@@ -314,7 +314,7 @@ DoseUtility.app/Contents/Resources/Java/hsqldb.jar \ DoseUtility.app/Contents/Resources/Java/excalibur-bzip2-1.0.jar \ DoseUtility.app/Contents/Resources/Java/commons-codec-1.3.jar \ @@ -43,7 +43,7 @@ DoseUtility.app/Contents/Resources/Java/jmdns.jar \ DoseUtility.app/Contents/Resources/Java/jai_imageio.jar \ DoseUtility.app/Contents/Resources/DoseUtility.icns \ -@@ -456,7 +456,7 @@ +@@ -472,7 +472,7 @@ cp $< $@ jarsigner -keystore ${PIXELMEDCODESIGNERKEYSTORE} ${PIXELMEDCODESIGNEROPTIONS} $@ ${PIXELMEDCODESIGNERALIAS} @@ -52,7 +52,7 @@ mkdir -p webstart cp $< $@ jarsigner -keystore ${PIXELMEDCODESIGNERKEYSTORE} ${PIXELMEDCODESIGNEROPTIONS} $@ ${PIXELMEDCODESIGNERALIAS} -@@ -711,7 +711,7 @@ +@@ -727,7 +727,7 @@ mkdir -p DoseUtility.app/Contents/Resources/Java cp $< $@ @@ -61,7 +61,7 @@ mkdir -p DoseUtility.app/Contents/Resources/Java cp $< $@ -@@ -912,7 +912,7 @@ +@@ -928,7 +928,7 @@ javadoc: rm -rf docs/javadoc javadoc \ @@ -70,10 +70,10 @@ -link http://download.oracle.com/javase/1.5.0/docs/api/ \ -link http://jpedal.org/javadoc/ \ -link http://www.hsqldb.org/doc/src/ \ -Index: pixelmed-20131018/Makefile.common.mk +Index: pixelmed-20140326/Makefile.common.mk =================================================================== ---- pixelmed-20131018.orig/Makefile.common.mk 2013-12-10 17:50:13.462149836 +0100 -+++ pixelmed-20131018/Makefile.common.mk 2013-12-10 17:50:22.098149722 +0100 +--- pixelmed-20140326.orig/Makefile.common.mk 2014-04-09 22:30:04.469214899 +0200 ++++ pixelmed-20140326/Makefile.common.mk 2014-04-09 22:30:13.269215181 +0200 @@ -35,7 +35,7 @@ DATABASEADDITIONALJARS = ${PATHTOADDITIONAL}/hsqldb.jar @@ -83,10 +83,10 @@ VIEWERADDITIONALJARS = ${DISPLAYADDITIONALJARS}:${DATABASEADDITIONALJARS}:${PATHTOADDITIONAL}/jmdns.jar -Index: pixelmed-20131018/webstart/DoseUtility.jnlp +Index: pixelmed-20140326/webstart/DoseUtility.jnlp =================================================================== ---- pixelmed-20131018.orig/webstart/DoseUtility.jnlp 2011-12-08 14:10:09.000000000 +0100 -+++ pixelmed-20131018/webstart/DoseUtility.jnlp 2013-12-10 17:50:22.098149722 +0100 +--- pixelmed-20140326.orig/webstart/DoseUtility.jnlp 2011-12-08 14:10:09.000000000 +0100 ++++ pixelmed-20140326/webstart/DoseUtility.jnlp 2014-04-09 22:30:13.269215181 +0200 @@ -19,7 +19,7 @@ <j2se version="1.5+" java-vm-args="-Xmx768m -Xss2m"/> <jar href="pixelmed.jar"/> Deleted: trunk/packages/pixelmed/trunk/debian/patches/fix_xslt.patch =================================================================== --- trunk/packages/pixelmed/trunk/debian/patches/fix_xslt.patch 2014-04-09 19:49:36 UTC (rev 16640) +++ trunk/packages/pixelmed/trunk/debian/patches/fix_xslt.patch 2014-04-09 20:41:12 UTC (rev 16641) @@ -1,17 +0,0 @@ -Description: remove failing test -Author: Mathieu Malaterre <[email protected]> -Bug-Debian: http://bugs.debian.org/706132 - -Index: pixelmed-20131018/com/pixelmed/test/Makefile -=================================================================== ---- pixelmed-20131018.orig/com/pixelmed/test/Makefile 2013-12-10 18:17:31.000000000 +0100 -+++ pixelmed-20131018/com/pixelmed/test/Makefile 2013-12-10 18:18:09.000000000 +0100 -@@ -103,7 +103,7 @@ - clean: - rm -f *~ *.class core *.bak ${OBJS} testcleanerfile.dcm - --alltests: testcolorconv testsr testdatetime testsuv testfloatformatter testdecimalstring testunkown testctdose testcompositecontext testremoveid testattributelist \ -+alltests: testcolorconv testsr testdatetime testsuv testfloatformatter testdecimalstring testunkown testcompositecontext testremoveid testattributelist \ - testcontentitem testcodingscheme testcharset testanatomy testgeometry testdicomdir testuuid testbase64 testdates testsequence \ - testthread testmultiframe - Modified: trunk/packages/pixelmed/trunk/debian/patches/fixdoc.patch =================================================================== --- trunk/packages/pixelmed/trunk/debian/patches/fixdoc.patch 2014-04-09 19:49:36 UTC (rev 16640) +++ trunk/packages/pixelmed/trunk/debian/patches/fixdoc.patch 2014-04-09 20:41:12 UTC (rev 16641) @@ -1,11 +1,11 @@ Description: fix doc generation Author: Mathieu Malaterre <[email protected]> -Index: pixelmed-20131018/Makefile +Index: pixelmed-20140326/Makefile =================================================================== ---- pixelmed-20131018.orig/Makefile 2013-12-10 17:50:26.138149668 +0100 -+++ pixelmed-20131018/Makefile 2013-12-10 17:50:41.330149467 +0100 -@@ -913,7 +913,7 @@ +--- pixelmed-20140326.orig/Makefile 2014-04-09 22:30:16.009215268 +0200 ++++ pixelmed-20140326/Makefile 2014-04-09 22:33:55.373222288 +0200 +@@ -929,7 +929,7 @@ javadoc: rm -rf docs/javadoc javadoc \ Modified: trunk/packages/pixelmed/trunk/debian/patches/makefile.patch =================================================================== --- trunk/packages/pixelmed/trunk/debian/patches/makefile.patch 2014-04-09 19:49:36 UTC (rev 16640) +++ trunk/packages/pixelmed/trunk/debian/patches/makefile.patch 2014-04-09 20:41:12 UTC (rev 16641) @@ -3,11 +3,11 @@ Author: Mathieu Malaterre <[email protected]> Last-Update: 2012-05-05 -Index: pixelmed-20130426/Makefile +Index: pixelmed-20140326/Makefile =================================================================== ---- pixelmed-20130426.orig/Makefile 2013-04-07 15:02:01.000000000 +0200 -+++ pixelmed-20130426/Makefile 2013-06-03 09:31:38.105247656 +0200 -@@ -351,7 +351,7 @@ +--- pixelmed-20140326.orig/Makefile 2014-03-25 00:49:40.000000000 +0100 ++++ pixelmed-20140326/Makefile 2014-04-09 22:30:11.197215114 +0200 +@@ -366,7 +366,7 @@ com/pixelmed/event/*.class \ com/pixelmed/display/event/*.class \ com/pixelmed/geometry/*.class \ Deleted: trunk/packages/pixelmed/trunk/debian/patches/remove_x_test.patch =================================================================== --- trunk/packages/pixelmed/trunk/debian/patches/remove_x_test.patch 2014-04-09 19:49:36 UTC (rev 16640) +++ trunk/packages/pixelmed/trunk/debian/patches/remove_x_test.patch 2014-04-09 20:41:12 UTC (rev 16641) @@ -1,17 +0,0 @@ -Description: Remove test that need X running -Forwarded: not-needed -Author: Mathieu Malaterre <[email protected]> - -Index: pixelmed-20131018/com/pixelmed/test/Makefile -=================================================================== ---- pixelmed-20131018.orig/com/pixelmed/test/Makefile 2013-12-10 18:18:09.000000000 +0100 -+++ pixelmed-20131018/com/pixelmed/test/Makefile 2013-12-10 18:18:44.118126918 +0100 -@@ -105,7 +105,7 @@ - - alltests: testcolorconv testsr testdatetime testsuv testfloatformatter testdecimalstring testunkown testcompositecontext testremoveid testattributelist \ - testcontentitem testcodingscheme testcharset testanatomy testgeometry testdicomdir testuuid testbase64 testdates testsequence \ -- testthread testmultiframe -+ testmultiframe - - testcolorconv: ${OBJS} - java -cp ${PATHTOROOT}:${JUNITJAR} -Djava.awt.headless=true org.junit.runner.JUnitCore com.pixelmed.test.TestColorConversions_AllTests Modified: trunk/packages/pixelmed/trunk/debian/patches/removetest.patch =================================================================== --- trunk/packages/pixelmed/trunk/debian/patches/removetest.patch 2014-04-09 19:49:36 UTC (rev 16640) +++ trunk/packages/pixelmed/trunk/debian/patches/removetest.patch 2014-04-09 20:41:12 UTC (rev 16641) @@ -3,24 +3,24 @@ Author: Mathieu Malaterre <[email protected]> Last-Update: 2012-05-05 -Index: pixelmed-20131018/com/pixelmed/test/Makefile +Index: pixelmed-20140326/com/pixelmed/test/Makefile =================================================================== ---- pixelmed-20131018.orig/com/pixelmed/test/Makefile 2013-12-10 18:02:20.066140105 +0100 -+++ pixelmed-20131018/com/pixelmed/test/Makefile 2013-12-10 18:17:31.134127896 +0100 -@@ -103,9 +103,9 @@ +--- pixelmed-20140326.orig/com/pixelmed/test/Makefile 2014-04-09 22:34:55.825224223 +0200 ++++ pixelmed-20140326/com/pixelmed/test/Makefile 2014-04-09 22:35:53.821226080 +0200 +@@ -110,9 +110,9 @@ clean: rm -f *~ *.class core *.bak ${OBJS} testcleanerfile.dcm -alltests: testcolorconv testsr testdatetime testsuv testfloatformatter testdecimalstring testunkown testctdose testcompositecontext testsafeprivate testremoveid testattributelist \ - testcontentitem testcodingscheme testcharset testcleaner testanatomy testgeometry testdicomdir testnetwork testuuid testbase64 testdates testsequence \ -- testthread testdatabase testmultiframe -+alltests: testcolorconv testsr testdatetime testsuv testfloatformatter testdecimalstring testunkown testctdose testcompositecontext testremoveid testattributelist \ -+ testcontentitem testcodingscheme testcharset testanatomy testgeometry testdicomdir testuuid testbase64 testdates testsequence \ -+ testthread testmultiframe +- testthread testdatabase testmultiframe testrepair testcodedsequenceitem testpackbits ++alltests: testcolorconv testsr testdatetime testsuv testfloatformatter testdecimalstring testunkown testcompositecontext testremoveid testattributelist \ ++ testcontentitem testcodingscheme testcharset testcleaner testgeometry testdicomdir testuuid testbase64 testdates testsequence \ ++ testmultiframe testrepair testcodedsequenceitem testpackbits - testcolorconv: ${OBJS} - java -cp ${PATHTOROOT}:${JUNITJAR} -Djava.awt.headless=true org.junit.runner.JUnitCore com.pixelmed.test.TestColorConversions_AllTests -@@ -196,7 +196,7 @@ + testpackbits: ${OBJS} + java -cp ${PATHTOROOT}:${JUNITJAR} -Djava.awt.headless=true org.junit.runner.JUnitCore com.pixelmed.test.TestPackBits_AllTests +@@ -209,7 +209,7 @@ java -cp ${PATHTOROOT}:${JUNITJAR} -Djava.awt.headless=true org.junit.runner.JUnitCore com.pixelmed.test.TestAnatomy_AllTests testgeometry: ${OBJS} Modified: trunk/packages/pixelmed/trunk/debian/patches/series =================================================================== --- trunk/packages/pixelmed/trunk/debian/patches/series 2014-04-09 19:49:36 UTC (rev 16640) +++ trunk/packages/pixelmed/trunk/debian/patches/series 2014-04-09 20:41:12 UTC (rev 16641) @@ -7,9 +7,7 @@ commons-net-ftp.patch addmanifest.patch fixfonts.patch -removetest.patch fixdoc.patch -fix_xslt.patch -remove_x_test.patch fix_jnlp.patch add_usage.patch +removetest.patch _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
