[med-svn] r8290 - in trunk/packages/pixelmed/trunk/debian: . patches
Mathieu Malaterre
malat-guest at alioth.debian.org
Wed Oct 26 14:21:58 UTC 2011
Author: malat-guest
Date: 2011-10-26 14:21:58 +0000 (Wed, 26 Oct 2011)
New Revision: 8290
Added:
trunk/packages/pixelmed/trunk/debian/patches/removetest.patch
Removed:
trunk/packages/pixelmed/trunk/debian/patches/ioexception.patch
trunk/packages/pixelmed/trunk/debian/patches/removetest.patch
Modified:
trunk/packages/pixelmed/trunk/debian/changelog
trunk/packages/pixelmed/trunk/debian/get-orig-source
trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch
trunk/packages/pixelmed/trunk/debian/patches/series
Log:
prepare for next upload
Modified: trunk/packages/pixelmed/trunk/debian/changelog
===================================================================
--- trunk/packages/pixelmed/trunk/debian/changelog 2011-10-26 13:56:46 UTC (rev 8289)
+++ trunk/packages/pixelmed/trunk/debian/changelog 2011-10-26 14:21:58 UTC (rev 8290)
@@ -1,3 +1,10 @@
+pixelmed (20110928-1) unstable; urgency=low
+
+ * New upstream
+ * remove ioexception.patch applied upstream
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Wed, 26 Oct 2011 15:58:36 +0200
+
pixelmed (20110901-1) unstable; urgency=low
* New upstream
Modified: trunk/packages/pixelmed/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/pixelmed/trunk/debian/get-orig-source 2011-10-26 13:56:46 UTC (rev 8289)
+++ trunk/packages/pixelmed/trunk/debian/get-orig-source 2011-10-26 14:21:58 UTC (rev 8290)
@@ -40,3 +40,4 @@
GZIP="--best --no-name" tar czf ${TARFILE} ${FOLDER}
rm -rf ${FOLDER}
+rm ${UPSTREAM_SRC}.tar.bz2
Modified: trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch 2011-10-26 13:56:46 UTC (rev 8289)
+++ trunk/packages/pixelmed/trunk/debian/patches/Makefile.common.mk.patch 2011-10-26 14:21:58 UTC (rev 8290)
@@ -1,10 +1,10 @@
Set include path according to debian layout
-Index: pixelmed-20110717/com/pixelmed/display/Makefile
+Index: pixelmed-20110928/com/pixelmed/display/Makefile
===================================================================
---- pixelmed-20110717.orig/com/pixelmed/display/Makefile 2010-04-09 12:36:49.000000000 +0200
-+++ pixelmed-20110717/com/pixelmed/display/Makefile 2011-08-19 16:52:07.000000000 +0200
-@@ -212,7 +212,7 @@
+--- pixelmed-20110928.orig/com/pixelmed/display/Makefile 2011-09-02 22:38:54.000000000 +0200
++++ pixelmed-20110928/com/pixelmed/display/Makefile 2011-10-26 16:00:27.000000000 +0200
+@@ -213,7 +213,7 @@
com.pixelmed.display.DicomImageViewer ${PATHTOHOME}/Pictures/Medical/NEMA97CD/DICOMDIR
testviewerontestimages:
@@ -13,10 +13,10 @@
testvieweronallmfmrimages:
(for i in ${PATHTOROOT}/../../nemamfmr/DISCIMG/IMAGES/*; do echo "$$i"; java -Xms512m -Xmx512m -cp ${PATHTOROOT}:${VIEWERADDITIONALJARS} com.pixelmed.display.DicomImageViewer "$$i"; done)
-Index: pixelmed-20110717/com/pixelmed/geometry/Makefile
+Index: pixelmed-20110928/com/pixelmed/geometry/Makefile
===================================================================
---- pixelmed-20110717.orig/com/pixelmed/geometry/Makefile 2007-07-27 18:43:36.000000000 +0200
-+++ pixelmed-20110717/com/pixelmed/geometry/Makefile 2011-08-19 16:52:07.000000000 +0200
+--- pixelmed-20110928.orig/com/pixelmed/geometry/Makefile 2007-07-27 18:43:36.000000000 +0200
++++ pixelmed-20110928/com/pixelmed/geometry/Makefile 2011-10-26 16:00:27.000000000 +0200
@@ -16,7 +16,7 @@
.SUFFIXES: .class .java
@@ -26,10 +26,10 @@
-sourcepath ${PATHTOROOT} $<
archive:
-Index: pixelmed-20110717/Makefile.common.mk
+Index: pixelmed-20110928/Makefile.common.mk
===================================================================
---- pixelmed-20110717.orig/Makefile.common.mk 2011-05-02 09:22:11.000000000 +0200
-+++ pixelmed-20110717/Makefile.common.mk 2011-08-19 16:52:07.000000000 +0200
+--- pixelmed-20110928.orig/Makefile.common.mk 2011-05-02 09:22:11.000000000 +0200
++++ pixelmed-20110928/Makefile.common.mk 2011-10-26 16:00:27.000000000 +0200
@@ -4,9 +4,10 @@
PATHTOHOME = /Users/dclunie
Deleted: trunk/packages/pixelmed/trunk/debian/patches/ioexception.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/ioexception.patch 2011-10-26 13:56:46 UTC (rev 8289)
+++ trunk/packages/pixelmed/trunk/debian/patches/ioexception.patch 2011-10-26 14:21:58 UTC (rev 8290)
@@ -1,19 +0,0 @@
-This looks like JmDNS API changes from 3.1 to 3.4
-Index: pixelmed-20110717/com/pixelmed/network/NetworkConfigurationFromMulticastDNS.java
-===================================================================
---- pixelmed-20110717.orig/com/pixelmed/network/NetworkConfigurationFromMulticastDNS.java 2011-08-19 17:33:10.000000000 +0200
-+++ pixelmed-20110717/com/pixelmed/network/NetworkConfigurationFromMulticastDNS.java 2011-08-19 17:35:09.000000000 +0200
-@@ -208,7 +208,12 @@
- if (debugLevel > 1) System.err.println("NetworkConfigurationFromMulticastDNS.deActivateDiscovery():");
- if (jmDNS != null) {
- jmDNS.unregisterAllServices();
-- jmDNS.close(); // needed, since otherwise application will not exit when main thread finished
-+ try {
-+ jmDNS.close(); // needed, since otherwise application will not exit when main thread finished
-+ } catch ( IOException e ) {
-+ e.printStackTrace(System.err);
-+ jmDNS = null;
-+ }
- }
- }
-
Deleted: trunk/packages/pixelmed/trunk/debian/patches/removetest.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/removetest.patch 2011-10-26 13:56:46 UTC (rev 8289)
+++ trunk/packages/pixelmed/trunk/debian/patches/removetest.patch 2011-10-26 14:21:58 UTC (rev 8290)
@@ -1,13 +0,0 @@
-Index: pixelmed-20110901/com/pixelmed/test/Makefile
-===================================================================
---- pixelmed-20110901.orig/com/pixelmed/test/Makefile 2011-09-24 21:22:56.000000000 +0200
-+++ pixelmed-20110901/com/pixelmed/test/Makefile 2011-09-24 21:23:15.000000000 +0200
-@@ -57,7 +57,7 @@
- clean:
- rm -f *~ *.class core *.bak ${OBJS} testcleanerfile.dcm
-
--alltests: testctdose testcompositecontext testsafeprivate testattributelist testcontentitem testcodingscheme testcharset testcleaner testgeometry
-+alltests: testctdose testcompositecontext testattributelist testcontentitem testcodingscheme testcharset
-
- testctdose: ${OBJS}
- java -cp ${PATHTOROOT}:${JUNITJAR} -Djava.awt.headless=true org.junit.runner.JUnitCore com.pixelmed.test.TestCTDose_AllTests
Added: trunk/packages/pixelmed/trunk/debian/patches/removetest.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/removetest.patch (rev 0)
+++ trunk/packages/pixelmed/trunk/debian/patches/removetest.patch 2011-10-26 14:21:58 UTC (rev 8290)
@@ -0,0 +1,13 @@
+Index: pixelmed-20110928/com/pixelmed/test/Makefile
+===================================================================
+--- pixelmed-20110928.orig/com/pixelmed/test/Makefile 2011-10-26 16:18:17.000000000 +0200
++++ pixelmed-20110928/com/pixelmed/test/Makefile 2011-10-26 16:18:44.000000000 +0200
+@@ -60,7 +60,7 @@
+ clean:
+ rm -f *~ *.class core *.bak ${OBJS} testcleanerfile.dcm
+
+-alltests: testctdose testcompositecontext testsafeprivate testattributelist testcontentitem testcodingscheme testcharset testcleaner testgeometry testdicomdir
++alltests: testctdose testcompositecontext testattributelist testcontentitem testcodingscheme testcharset testdicomdir
+
+ testctdose: ${OBJS}
+ java -cp ${PATHTOROOT}:${JUNITJAR} -Djava.awt.headless=true org.junit.runner.JUnitCore com.pixelmed.test.TestCTDose_AllTests
Modified: trunk/packages/pixelmed/trunk/debian/patches/series
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/series 2011-10-26 13:56:46 UTC (rev 8289)
+++ trunk/packages/pixelmed/trunk/debian/patches/series 2011-10-26 14:21:58 UTC (rev 8290)
@@ -1,4 +1,3 @@
-ioexception.patch
Makefile.common.mk.patch
dicomimageviewer.patch
ecgviewer.patch
More information about the debian-med-commit
mailing list