[med-svn] r7307 - in trunk/packages/imagej/trunk/debian: . patches

[Andreas Tille]

Author: tille
Date: 2011-07-19 12:58:24 +0000 (Tue, 19 Jul 2011)
New Revision: 7307

Removed:
   trunk/packages/imagej/trunk/debian/patches/600997.patch
Modified:
   trunk/packages/imagej/trunk/debian/changelog
   trunk/packages/imagej/trunk/debian/control
   trunk/packages/imagej/trunk/debian/copyright
   trunk/packages/imagej/trunk/debian/patches/series
Log:
New upstream version


Modified: trunk/packages/imagej/trunk/debian/changelog
===================================================================
--- trunk/packages/imagej/trunk/debian/changelog	2011-07-19 11:37:33 UTC (rev 7306)
+++ trunk/packages/imagej/trunk/debian/changelog	2011-07-19 12:58:24 UTC (rev 7307)
@@ -1,3 +1,17 @@
+imagej (1.45k-1) unstable; urgency=low
+
+  * New upstream version
+    debian/patches/600997.patch was applied - so remove this patch
+  * Add sun-java6-jre as alternative Depends to openjdk6-jre.  It is not
+    a good idea to follow the suggestion of the bug reporter to enable
+    java6-runtime because other packages which are providing this virtual
+    package are known to fail running imagej
+    Closes: #633965
+  * Debian/control: Fixed Vcs fields
+  * debian/copyright: Format: http://dep.debian.net/deps/dep5
+
+ -- Andreas Tille <tille at debian.org>  Tue, 19 Jul 2011 14:43:06 +0200
+
 imagej (1.45e-1) unstable; urgency=low
 
   * New upstream version

Modified: trunk/packages/imagej/trunk/debian/control
===================================================================
--- trunk/packages/imagej/trunk/debian/control	2011-07-19 11:37:33 UTC (rev 7306)
+++ trunk/packages/imagej/trunk/debian/control	2011-07-19 12:58:24 UTC (rev 7307)
@@ -7,13 +7,13 @@
  Andreas Tille <tille at debian.org>
 Build-Depends: openjdk-6-jdk, debhelper (>=8), ant, javahelper
 Standards-Version: 3.9.2
-Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/imagej/trunk/?rev=0&sc=0
-Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/imagej/trunk/
+Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/imagej/trunk/
+Vcs-Svn: svn://svn.debian.org/debian-med/trunk/packages/imagej/trunk/
 Homepage: http://imagej.nih.gov/ij
 
 Package: imagej
 Architecture: all
-Depends: ${java:Depends}, ${misc:Depends}, openjdk-6-jre
+Depends: ${java:Depends}, ${misc:Depends}, openjdk-6-jre | sun-java6-jre
 Suggests: java-virtual-machine
 Description: Image processing program inspired by NIH Image for the Macintosh
  It can display, edit, analyze, process, save and print 8-bit, 16-bit and

Modified: trunk/packages/imagej/trunk/debian/copyright
===================================================================
--- trunk/packages/imagej/trunk/debian/copyright	2011-07-19 11:37:33 UTC (rev 7306)
+++ trunk/packages/imagej/trunk/debian/copyright	2011-07-19 12:58:24 UTC (rev 7307)
@@ -1,9 +1,7 @@
-X-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
-X-Debianized-By: Paolo Ariano <paolo.ariano at unito.it>,
- Andreas Tille <tille at debian.org>
-X-Debianized-Date: Fri, 28 Apr 2006 11:41:53 +0200.
-X-Source-Downloaded-From: http://imagej.nih.gov/ij/download/src/
-X-Upstream-Author: Wayne Rasband <wsr at nih.gov>, for the NIH
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: ImageJ
+Source: http://imagej.nih.gov/ij/download/src/
+Upstream-Contact: Wayne Rasband <wsr at nih.gov>, for the NIH
 
 Files: debian/*
 Copyright: © 2006-2007 Paolo Ariano <paolo.ariano at unito.it>

Deleted: trunk/packages/imagej/trunk/debian/patches/600997.patch
===================================================================
--- trunk/packages/imagej/trunk/debian/patches/600997.patch	2011-07-19 11:37:33 UTC (rev 7306)
+++ trunk/packages/imagej/trunk/debian/patches/600997.patch	2011-07-19 12:58:24 UTC (rev 7307)
@@ -1,15 +0,0 @@
-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
---- imagej-1.45e.orig/ij/gui/YesNoCancelDialog.java
-+++ imagej-1.45e/ij/gui/YesNoCancelDialog.java
-@@ -72,7 +72,7 @@
- 	}
- 	
- 	void closeDialog() {
--		setVisible(false);
-+		// useless, and raises a bug with openjdk 6: setVisible(false);
- 		dispose();
- 	}
- 

Modified: trunk/packages/imagej/trunk/debian/patches/series
===================================================================
--- trunk/packages/imagej/trunk/debian/patches/series	2011-07-19 11:37:33 UTC (rev 7306)
+++ trunk/packages/imagej/trunk/debian/patches/series	2011-07-19 12:58:24 UTC (rev 7307)
@@ -1,2 +1 @@
-600997.patch
 exclude-quilt-from-ant.patch