Author: malat-guest
Date: 2011-08-19 16:30:55 +0000 (Fri, 19 Aug 2011)
New Revision: 7497
Added:
trunk/packages/pixelmed/trunk/debian/patches/addmanifest.patch
Modified:
trunk/packages/pixelmed/trunk/debian/patches/ioexception.patch
trunk/packages/pixelmed/trunk/debian/patches/series
Log:
Fix lintian error. Fix compilation with newer jmdns API
Added: trunk/packages/pixelmed/trunk/debian/patches/addmanifest.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/addmanifest.patch
(rev 0)
+++ trunk/packages/pixelmed/trunk/debian/patches/addmanifest.patch
2011-08-19 16:30:55 UTC (rev 7497)
@@ -0,0 +1,14 @@
+Index: pixelmed-20110717/Makefile
+===================================================================
+--- pixelmed-20110717.orig/Makefile 2011-08-19 18:28:45.000000000 +0200
++++ pixelmed-20110717/Makefile 2011-08-19 18:29:08.000000000 +0200
+@@ -340,7 +340,8 @@
+ (cd com/pixelmed/apps; make all)
+ (cd com/pixelmed/test; make all)
+ date >BUILDDATE
+- jar -cvf $@ BUILDDATE COPYRIGHT \
++ echo "Class-Path: hsqldb.jar vecmath.jar commons-codec.jar bcprov.jar
commons-net2.jar" > manifest.txt
++ jar -cvfm $@ manifest.txt BUILDDATE COPYRIGHT \
+ com/pixelmed/display/*.class \
+ com/pixelmed/display/*.properties \
+ com/pixelmed/event/*.class \
Modified: trunk/packages/pixelmed/trunk/debian/patches/ioexception.patch
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/ioexception.patch
2011-08-19 15:57:46 UTC (rev 7496)
+++ trunk/packages/pixelmed/trunk/debian/patches/ioexception.patch
2011-08-19 16:30:55 UTC (rev 7497)
@@ -7,12 +7,12 @@
if (jmDNS != null) {
jmDNS.unregisterAllServices();
- jmDNS.close(); // needed, since otherwise
application will not exit when main thread finished
-+ //try {
++ try {
+ jmDNS.close(); // needed, since otherwise application
will not exit when main thread finished
-+ //} catch ( IOException e ) {
-+ // e.printStackTrace(System.err);
-+ // jmDNS = null;
-+ //}
++ } catch ( IOException e ) {
++ e.printStackTrace(System.err);
++ jmDNS = null;
++ }
}
}
Modified: trunk/packages/pixelmed/trunk/debian/patches/series
===================================================================
--- trunk/packages/pixelmed/trunk/debian/patches/series 2011-08-19 15:57:46 UTC
(rev 7496)
+++ trunk/packages/pixelmed/trunk/debian/patches/series 2011-08-19 16:30:55 UTC
(rev 7497)
@@ -6,3 +6,4 @@
dicomimageviewer.jnlp.patch
makefile.patch
commons-net-ftp.patch
+addmanifest.patch
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
