[pkg-java] r15223 - in trunk/libjaba-client-java/debian: . patches

[Vincent Fourmond]

Author: fourmond
Date: 2011-10-22 08:34:58 +0000 (Sat, 22 Oct 2011)
New Revision: 15223

Added:
   trunk/libjaba-client-java/debian/patches/
   trunk/libjaba-client-java/debian/patches/series
   trunk/libjaba-client-java/debian/patches/strip-annotations.diff
Modified:
   trunk/libjaba-client-java/debian/changelog
   trunk/libjaba-client-java/debian/javabuild
   trunk/libjaba-client-java/debian/rules
Log:
[libjaba-client-java] Strip the (accidentally) non-free *ThreadSafe files and their use

Modified: trunk/libjaba-client-java/debian/changelog
===================================================================
--- trunk/libjaba-client-java/debian/changelog	2011-10-21 23:08:39 UTC (rev 15222)
+++ trunk/libjaba-client-java/debian/changelog	2011-10-22 08:34:58 UTC (rev 15223)
@@ -1,3 +1,11 @@
+libjaba-client-java (0+dfsg-1) unstable; urgency=low
+
+  * Strip the *ThreadSafe class files from the source code, they are hardly
+    used anyway.
+  * strip-annotations.diff: to remove the only use of those
+
+ -- Vincent Fourmond <fourmond at debian.org>  Sat, 22 Oct 2011 09:06:48 +0200
+
 libjaba-client-java (0-1) unstable; urgency=low
 
   * Initial release. (Closes: #623030)

Modified: trunk/libjaba-client-java/debian/javabuild
===================================================================
--- trunk/libjaba-client-java/debian/javabuild	2011-10-21 23:08:39 UTC (rev 15222)
+++ trunk/libjaba-client-java/debian/javabuild	2011-10-22 08:34:58 UTC (rev 15223)
@@ -1 +1 @@
-min-jaba-client.jar .
+min-jaba-client.jar src

Added: trunk/libjaba-client-java/debian/patches/series
===================================================================
--- trunk/libjaba-client-java/debian/patches/series	                        (rev 0)
+++ trunk/libjaba-client-java/debian/patches/series	2011-10-22 08:34:58 UTC (rev 15223)
@@ -0,0 +1 @@
+strip-annotations.diff

Added: trunk/libjaba-client-java/debian/patches/strip-annotations.diff
===================================================================
--- trunk/libjaba-client-java/debian/patches/strip-annotations.diff	                        (rev 0)
+++ trunk/libjaba-client-java/debian/patches/strip-annotations.diff	2011-10-22 08:34:58 UTC (rev 15223)
@@ -0,0 +1,20 @@
+Index: libjaba-client-java-0+dfsg/compbio/metadata/RunnerConfig.java
+===================================================================
+--- libjaba-client-java-0+dfsg.orig/compbio/metadata/RunnerConfig.java	2010-11-18 15:37:12.000000000 +0100
++++ libjaba-client-java-0+dfsg/compbio/metadata/RunnerConfig.java	2011-10-22 09:06:15.465134107 +0200
+@@ -28,7 +28,6 @@
+ import javax.xml.bind.annotation.XmlTransient;
+ 
+ import compbio.util.SysPrefs;
+-import compbio.util.annotation.NotThreadSafe;
+ 
+ /**
+  * The list of {@link Parameter}s and {@link Option}s supported by executable.
+@@ -41,7 +40,6 @@
+  *            type of an Executable
+  */
+ @XmlRootElement
+- at NotThreadSafe
+ public class RunnerConfig<T> {
+ 
+ 	/*

Modified: trunk/libjaba-client-java/debian/rules
===================================================================
--- trunk/libjaba-client-java/debian/rules	2011-10-21 23:08:39 UTC (rev 15222)
+++ trunk/libjaba-client-java/debian/rules	2011-10-22 08:34:58 UTC (rev 15223)
@@ -7,5 +7,11 @@
 	dh $@ --with javahelper
 
 override_dh_auto_clean:
+	rm -Rf src
 
-override_dh_auto_build:
\ No newline at end of file
+override_dh_auto_build:
+
+override_jh_build:
+	mkdir -p src;
+	cp -af compbio src/
+	jh_build
\ No newline at end of file