[Debian-med-packaging] Bug#600997: Bug#600997: imagej: cannot quit imagej when an image was changed

[Charles Plessy]

severity 600997 serious
thanks

Dear release team,

the version of ImageJ distributed in Squeeze can not save the files it modified
when it is used with OpenJDK (but does with the Sun version).

Thanks to the tremendous help of Frédéric Mothe and Miguel Landaeta, it would
be possible to solve this by a patch (the alternative being to upgrade to
version 1.44i, not yet packaged, which is not affected).

I attached the debdiff. Would it be suitable for an upload to
testing-proposed-updates ? Version 1.44e, still affected, is already in
Unstable…

Have a nice day,

-- 
Charles Plessy
Debian Med packaging team,
http://www.debian.org/devel/debian-med
Tsurumi, Kanagawa, Japan
-------------- next part --------------
diff -Nru imagej-1.44c/debian/changelog imagej-1.44c/debian/changelog
--- imagej-1.44c/debian/changelog	2010-07-08 23:37:54.000000000 +0900
+++ imagej-1.44c/debian/changelog	2010-10-28 00:13:51.000000000 +0900
@@ -1,3 +1,13 @@
+imagej (1.44c-3) UNRELEASED; urgency=low
+
+  * Team upload, see http://bugs.debian.org/600997
+  * debian/600997.patch: patch to allow to close ImageJ after modifying an
+    image.
+  * debian/exclude-quilt-from-ant.patch: excludes the .pc directory
+    (otherwise the package fails to build)
+
+ -- Charles Plessy <plessy at debian.org>  Thu, 28 Oct 2010 00:11:24 +0900
+
 imagej (1.44c-2) unstable; urgency=low
 
   * Drop java2-runtime as alternative dependency
diff -Nru imagej-1.44c/debian/patches/600997.patch imagej-1.44c/debian/patches/600997.patch
--- imagej-1.44c/debian/patches/600997.patch	1970-01-01 09:00:00.000000000 +0900
+++ imagej-1.44c/debian/patches/600997.patch	2010-10-28 00:09:40.000000000 +0900
@@ -0,0 +1,17 @@
+Description: Allows to close ImageJ after modifying an image.
+Author: Frederic Mothe <mothe at nancy.inra.fr>
+Bug: http://bugs.debian.org/600997
+Forwarded: yes
+diff --git a/ij/gui/YesNoCancelDialog.java b/ij/gui/YesNoCancelDialog.java
+index 3a44f7c..fdb7c79 100644
+--- a/ij/gui/YesNoCancelDialog.java
++++ b/ij/gui/YesNoCancelDialog.java
+@@ -72,7 +72,7 @@ public class YesNoCancelDialog extends Dialog implements ActionListener, KeyList
+ 	}
+ 	
+ 	void closeDialog() {
+-		setVisible(false);
++		// useless, and raises a bug with openjdk 6: setVisible(false);
+ 		dispose();
+ 	}
+ 
diff -Nru imagej-1.44c/debian/patches/exclude-quilt-from-ant.patch imagej-1.44c/debian/patches/exclude-quilt-from-ant.patch
--- imagej-1.44c/debian/patches/exclude-quilt-from-ant.patch	1970-01-01 09:00:00.000000000 +0900
+++ imagej-1.44c/debian/patches/exclude-quilt-from-ant.patch	2010-10-28 00:29:09.000000000 +0900
@@ -0,0 +1,18 @@
+Description: Excludes the quilt management directory from the build system.
+ See http://bugs.debian.org/600997
+Author: Miguel Landaeta <miguel at miguel.cc>
+Forwarded: no
+Index: imagej-1.44c/build.xml
+===================================================================
+--- imagej-1.44c.orig/build.xml
++++ imagej-1.44c/build.xml
+@@ -10,6 +10,9 @@
+       <!-- The plugins directory only needs to be 

+              present at runtime, not at build time. -->

+       <exclude name="plugins/**"/>

++      <!-- The quilt management directory needs to be excluded

++             or some classes will not build due to duplicated classes errors -->

++      <exclude name=".pc/**"/>

+     </javac>

+   </target>

+   

diff -Nru imagej-1.44c/debian/patches/series imagej-1.44c/debian/patches/series
--- imagej-1.44c/debian/patches/series	1970-01-01 09:00:00.000000000 +0900
+++ imagej-1.44c/debian/patches/series	2010-10-28 00:09:59.000000000 +0900
@@ -0,0 +1,2 @@
+600997.patch
+exclude-quilt-from-ant.patch