[pkg-java] r15206 - in trunk/jalview/debian: . patches

[Vincent Fourmond]

Author: fourmond
Date: 2011-10-15 22:46:49 +0000 (Sat, 15 Oct 2011)
New Revision: 15206

Modified:
   trunk/jalview/debian/changelog
   trunk/jalview/debian/control
   trunk/jalview/debian/patches/mutilate-build-system.diff
   trunk/jalview/debian/rules
Log:
[jalview] build version 2.7

Modified: trunk/jalview/debian/changelog
===================================================================
--- trunk/jalview/debian/changelog	2011-10-15 20:57:58 UTC (rev 15205)
+++ trunk/jalview/debian/changelog	2011-10-15 22:46:49 UTC (rev 15206)
@@ -1,10 +1,10 @@
-jalview (2.6.1.dfsg~almost-1) unstable; urgency=low
+jalview (2.7.dfsg~almost-1) unstable; urgency=low
 
   * Initial release (Closes: #507436)
-  * Adding a debian/new-upstream script to repackage the original
-    tarball, getting rid of the bundled JAR file (I love JAR files)
+  * Adding a debian/new-upstream script to repackage the original tarball,
+    getting rid of the bundled precompiled JAR files (I love JAR files)
     (well, almost, which is why this goes in non-free for now)
   * Using dh 7 and javahelper
   * Using jh_build for building
 
- -- Vincent Fourmond <fourmond at debian.org>  Fri, 15 Apr 2011 00:28:48 +0200
+ -- Vincent Fourmond <fourmond at debian.org>  Sun, 16 Oct 2011 00:23:10 +0200

Modified: trunk/jalview/debian/control
===================================================================
--- trunk/jalview/debian/control	2011-10-15 20:57:58 UTC (rev 15205)
+++ trunk/jalview/debian/control	2011-10-15 22:46:49 UTC (rev 15206)
@@ -10,7 +10,10 @@
 	       libjmol-java (>= 12.1.42),
 	       jmol-applet (>= 12.1.42),
 	       libcastor-xml-java, libjaba-client-java, libaxis-java, 
-	       javahelper, javahelp2
+	       javahelper, javahelp2, libjswingreader-java,
+               libmiglayout-java, icedtea-netx-common,
+               libhttpmime-java, libhttpcore-java,
+               libapache-mime4j-java, libhttpclient-java
 Standards-Version: 3.9.2
 Homepage: http://www.jalview.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jalview

Modified: trunk/jalview/debian/patches/mutilate-build-system.diff
===================================================================
--- trunk/jalview/debian/patches/mutilate-build-system.diff	2011-10-15 20:57:58 UTC (rev 15205)
+++ trunk/jalview/debian/patches/mutilate-build-system.diff	2011-10-15 22:46:49 UTC (rev 15206)
@@ -1,7 +1,7 @@
-Index: jalview-2.6.1.dfsg/build.xml
+Index: jalview-2.7.dfsg~almost/build.xml
 ===================================================================
---- jalview-2.6.1.dfsg.orig/build.xml	2010-11-12 17:33:17.000000000 +0100
-+++ jalview-2.6.1.dfsg/build.xml	2011-09-29 22:47:54.117759830 +0200
+--- jalview-2.7.dfsg~almost.orig/build.xml	2011-09-27 16:50:20.000000000 +0200
++++ jalview-2.7.dfsg~almost/build.xml	2011-10-16 00:25:56.823058139 +0200
 @@ -18,13 +18,6 @@
  -->
  <project name="jalviewX" default="usage" basedir=".">
@@ -27,7 +27,7 @@
  			<fileset dir="${libDir}">
  				<include name="*.jar" />
  				<include name="**/*.jar" />
-@@ -397,7 +386,7 @@
+@@ -407,7 +396,7 @@
  		</axis-wsdl2java>
  	</target>
  

Modified: trunk/jalview/debian/rules
===================================================================
--- trunk/jalview/debian/rules	2011-10-15 20:57:58 UTC (rev 15205)
+++ trunk/jalview/debian/rules	2011-10-15 22:46:49 UTC (rev 15206)
@@ -19,7 +19,9 @@
 DEB_ANT_BUILD_TARGET := makedist
 DEB_JARS             := castor-xml commons-logging log4j-1.2 \
 	castor-core Jmol min-jaba-client axis-jaxrpc commons-discovery \
-	axis jh lib/vamsas-client.jar /usr/share/jmol-applet/JmolApplet.jar
+	axis jh lib/vamsas-client.jar /usr/share/jmol-applet/JmolApplet.jar \
+	jswingreader miglayout /usr/share/icedtea-web/plugin.jar \
+	httpmime httpcore apache-mime4j httpclient
 
 
 ANT_OPTS             := -Dbuild.sysclasspath=last \
@@ -28,3 +30,6 @@
 FINAL_CLASSPATH = $(subst lib/vamsas-client.jar, /usr/share/jalview/vamsas-client.jar, $(DEB_CLASSPATH))
 
 JH_CLASSPATH_ARGS := -c"$(shell echo $(FINAL_CLASSPATH) | sed 's/:/ /g')" debian/jalview/usr/share/java/jalview.jar 
+
+cp:
+	@echo $(DEB_CLASSPATH)
\ No newline at end of file