[med-svn] r5384 - in trunk/packages/imagej: . branches branches/squeeze branches/squeeze/debian branches/squeeze/debian/patches

[Charles Plessy]

Author: plessy
Date: 2010-10-28 15:07:40 +0000 (Thu, 28 Oct 2010)
New Revision: 5384

Added:
   trunk/packages/imagej/branches/
   trunk/packages/imagej/branches/squeeze/
   trunk/packages/imagej/branches/squeeze/debian/
   trunk/packages/imagej/branches/squeeze/debian/patches/
   trunk/packages/imagej/branches/squeeze/debian/patches/600997.patch
   trunk/packages/imagej/branches/squeeze/debian/patches/exclude-quilt-from-ant.patch
   trunk/packages/imagej/branches/squeeze/debian/patches/series
Modified:
   trunk/packages/imagej/branches/squeeze/debian/changelog
Log:
Corrects bug #600997 in Squeeze.


Modified: trunk/packages/imagej/branches/squeeze/debian/changelog
===================================================================
--- trunk/packages/imagej/tags/1.44c-2/changelog	2010-10-27 12:27:54 UTC (rev 5383)
+++ trunk/packages/imagej/branches/squeeze/debian/changelog	2010-10-28 15:07:40 UTC (rev 5384)
@@ -1,3 +1,13 @@
+imagej (1.44c-3) testing; urgency=low
+
+  * Team upload, see <http://bugs.debian.org/600997>.
+  * debian/600997.patch: patch to allow to close ImageJ after modifying an
+    image (thanks to Frédéric Mothe).
+  * debian/exclude-quilt-from-ant.patch: excludes the .pc directory,
+    otherwise the package fails to build. Thanks to Miguel Landaeta.
+
+ -- Charles Plessy <plessy at debian.org>  Thu, 28 Oct 2010 23:35:59 +0900
+
 imagej (1.44c-2) unstable; urgency=low
 
   * Drop java2-runtime as alternative dependency

Added: trunk/packages/imagej/branches/squeeze/debian/patches/600997.patch
===================================================================
--- trunk/packages/imagej/branches/squeeze/debian/patches/600997.patch	                        (rev 0)
+++ trunk/packages/imagej/branches/squeeze/debian/patches/600997.patch	2010-10-28 15:07:40 UTC (rev 5384)
@@ -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();
+ 	}
+ 

Added: trunk/packages/imagej/branches/squeeze/debian/patches/exclude-quilt-from-ant.patch
===================================================================
--- trunk/packages/imagej/branches/squeeze/debian/patches/exclude-quilt-from-ant.patch	                        (rev 0)
+++ trunk/packages/imagej/branches/squeeze/debian/patches/exclude-quilt-from-ant.patch	2010-10-28 15:07:40 UTC (rev 5384)
@@ -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>
+   

Added: trunk/packages/imagej/branches/squeeze/debian/patches/series
===================================================================
--- trunk/packages/imagej/branches/squeeze/debian/patches/series	                        (rev 0)
+++ trunk/packages/imagej/branches/squeeze/debian/patches/series	2010-10-28 15:07:40 UTC (rev 5384)
@@ -0,0 +1,2 @@
+600997.patch
+exclude-quilt-from-ant.patch