diff -Nru dicomscope-3.6.0/debian/changelog dicomscope-3.6.0/debian/changelog --- dicomscope-3.6.0/debian/changelog 2011-12-08 11:07:19.000000000 +0000 +++ dicomscope-3.6.0/debian/changelog 2011-12-09 13:29:27.000000000 +0000 @@ -1,11 +1,8 @@ -dicomscope (3.6.0-7ubuntu1) precise; urgency=low +dicomscope (3.6.0-8) unstable; urgency=low - * Fix FTBFS with OpenJDK7 (LP: #888932): - - d/patches/java7-compat.patch: Patch build to specify source/target - as 1.5 to ensure backwards compatibility and work around Java 7 - encoding errors. + * Fix FTBFS with OpenJDK7. Closes: #651404 - -- James Page Thu, 08 Dec 2011 11:06:07 +0000 + -- Mathieu Malaterre Fri, 09 Dec 2011 14:29:15 +0100 dicomscope (3.6.0-7) unstable; urgency=low diff -Nru dicomscope-3.6.0/debian/control dicomscope-3.6.0/debian/control --- dicomscope-3.6.0/debian/control 2011-12-08 11:07:26.000000000 +0000 +++ dicomscope-3.6.0/debian/control 2011-11-23 11:55:44.000000000 +0000 @@ -1,7 +1,6 @@ Source: dicomscope Section: graphics -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Med Packaging Team +Maintainer: Debian Med Packaging Team DM-Upload-Allowed: yes Uploaders: Mathieu Malaterre Priority: extra diff -Nru dicomscope-3.6.0/debian/patches/cmakelists.txt.patch dicomscope-3.6.0/debian/patches/cmakelists.txt.patch --- dicomscope-3.6.0/debian/patches/cmakelists.txt.patch 2011-12-08 10:55:29.000000000 +0000 +++ dicomscope-3.6.0/debian/patches/cmakelists.txt.patch 2011-12-09 13:29:27.000000000 +0000 @@ -112,7 +112,7 @@ + +ADD_CUSTOM_COMMAND( + OUTPUT ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/DICOMscope.class -+ COMMAND ${JAVA_COMPILE} ARGS -d ../DICOMscope -classpath . dicomscope/DICOMscope.java ++ COMMAND ${JAVA_COMPILE} ARGS -d ../DICOMscope -classpath . -source 1.5 -target 1.5 dicomscope/DICOMscope.java + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + DEPENDS ${javafiles} + COMMENT "javac *.java" diff -Nru dicomscope-3.6.0/debian/patches/java7-compat.patch dicomscope-3.6.0/debian/patches/java7-compat.patch --- dicomscope-3.6.0/debian/patches/java7-compat.patch 2011-12-08 11:05:57.000000000 +0000 +++ dicomscope-3.6.0/debian/patches/java7-compat.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -Index: dicomscope/tkgui/CMakeLists.txt -=================================================================== ---- dicomscope.orig/tkgui/CMakeLists.txt 2011-12-08 10:55:29.070163000 +0000 -+++ dicomscope/tkgui/CMakeLists.txt 2011-12-08 11:05:55.217488642 +0000 -@@ -10,7 +10,7 @@ - - ADD_CUSTOM_COMMAND( - OUTPUT ${DICOMSCOPE_SOURCE_DIR}/DICOMscope/DICOMscope.class -- COMMAND ${JAVA_COMPILE} ARGS -d ../DICOMscope -classpath . dicomscope/DICOMscope.java -+ COMMAND ${JAVA_COMPILE} ARGS -d ../DICOMscope -classpath . -source 1.5 -target 1.5 dicomscope/DICOMscope.java - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS ${javafiles} - COMMENT "javac *.java" diff -Nru dicomscope-3.6.0/debian/patches/series dicomscope-3.6.0/debian/patches/series --- dicomscope-3.6.0/debian/patches/series 2011-12-08 11:05:24.000000000 +0000 +++ dicomscope-3.6.0/debian/patches/series 2011-11-23 12:12:34.000000000 +0000 @@ -8,4 +8,3 @@ DSRDocument.cpp.patch dicom_2009.patch log4cplus.patch -java7-compat.patch diff -Nru dicomscope-3.6.0/debian/README.source dicomscope-3.6.0/debian/README.source --- dicomscope-3.6.0/debian/README.source 2011-12-08 10:55:29.000000000 +0000 +++ dicomscope-3.6.0/debian/README.source 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -This packages uses the quilt patch system. Please read -/usr/share/doc/quilt/README.source for more information. - - -- Mathieu Malaterre (malat) Tue, 08 Sep 2009 09:23:36 +0200