Author: fourmond
Date: 2011-09-29 21:31:49 +0000 (Thu, 29 Sep 2011)
New Revision: 15137
Added:
trunk/jalview/debian/jalview.install
trunk/jalview/debian/jalview.jlibs
trunk/jalview/debian/patches/mutilate-build-system.diff
trunk/jalview/debian/patches/series
Removed:
trunk/jalview/debian/javabuild
Modified:
trunk/jalview/debian/control
trunk/jalview/debian/rules
trunk/jalview/debian/wrappers/jalview
Log:
[jalview] Switch to the original build system - now building and working fine
(but still with a binary-only jar, vamsas-client)
Modified: trunk/jalview/debian/control
===================================================================
--- trunk/jalview/debian/control 2011-09-29 20:39:05 UTC (rev 15136)
+++ trunk/jalview/debian/control 2011-09-29 21:31:49 UTC (rev 15137)
@@ -7,7 +7,7 @@
libaxis-java, libwsdl4j-java, libgnujaf-java,
libgnumail-java, liblog4j1.2-java, javahelp2,
libcommons-discovery-java, libcommons-logging-java,
- libstevesoft-regex-java, libjmol-java (>= 12.1.42),
+ libjmol-java (>= 12.1.42),
libcastor-xml-java,
libjaba-client-java, libaxis-java,
jmol-applet (>= 12.1.42),
@@ -17,7 +17,6 @@
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jalview
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/jalview
-
Package: jalview
Architecture: all
Depends: ${misc:Depends}, openjdk-6-jre | cacao-oj6-jre | java6-runtime,
Added: trunk/jalview/debian/jalview.install
===================================================================
--- trunk/jalview/debian/jalview.install (rev 0)
+++ trunk/jalview/debian/jalview.install 2011-09-29 21:31:49 UTC (rev
15137)
@@ -0,0 +1,2 @@
+lib/vamsas-client.jar usr/share/jalview
+debian/wrappers/jalview usr/bin
\ No newline at end of file
Added: trunk/jalview/debian/jalview.jlibs
===================================================================
--- trunk/jalview/debian/jalview.jlibs (rev 0)
+++ trunk/jalview/debian/jalview.jlibs 2011-09-29 21:31:49 UTC (rev 15137)
@@ -0,0 +1 @@
+dist/jalview.jar
Deleted: trunk/jalview/debian/javabuild
===================================================================
--- trunk/jalview/debian/javabuild 2011-09-29 20:39:05 UTC (rev 15136)
+++ trunk/jalview/debian/javabuild 2011-09-29 21:31:49 UTC (rev 15137)
@@ -1 +0,0 @@
-jalview.jar src
Added: trunk/jalview/debian/patches/mutilate-build-system.diff
===================================================================
--- trunk/jalview/debian/patches/mutilate-build-system.diff
(rev 0)
+++ trunk/jalview/debian/patches/mutilate-build-system.diff 2011-09-29
21:31:49 UTC (rev 15137)
@@ -0,0 +1,38 @@
+Index: jalview-2.6.1.dfsg/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
+@@ -18,13 +18,6 @@
+ -->
+ <project name="jalviewX" default="usage" basedir=".">
+ <!-- we use jalopy to format our sources -->
+- <taskdef name="jalopy"
classname="de.hunsicker.jalopy.plugin.ant.AntPlugin">
+- <classpath>
+- <fileset dir="utils/jalopy/lib">
+- <include name="*.jar" />
+- </fileset>
+- </classpath>
+- </taskdef>
+
+ <target name="help" depends="usage" />
+ <target name="usage">
+@@ -114,10 +107,6 @@
+ <property name="wsdl.ClientNS" value="ext.vamsas" />
+ <!-- the class path for building the application -->
+ <path id="build.classpath">
+- <fileset dir="utils">
+- <include name="*.jar" />
+- <include name="**/*.jar" />
+- </fileset>
+ <fileset dir="${libDir}">
+ <include name="*.jar" />
+ <include name="**/*.jar" />
+@@ -397,7 +386,7 @@
+ </axis-wsdl2java>
+ </target>
+
+- <target name="makedist" depends="build, buildPropertiesFile,
buildindices">
++ <target name="makedist" depends="build, buildindices">
+ <!-- make the package jar if not already existing -->
+ <mkdir dir="${packageDir}" />
+ <!-- clean dir if it already existed -->
Added: trunk/jalview/debian/patches/series
===================================================================
--- trunk/jalview/debian/patches/series (rev 0)
+++ trunk/jalview/debian/patches/series 2011-09-29 21:31:49 UTC (rev 15137)
@@ -0,0 +1 @@
+mutilate-build-system.diff
Modified: trunk/jalview/debian/rules
===================================================================
--- trunk/jalview/debian/rules 2011-09-29 20:39:05 UTC (rev 15136)
+++ trunk/jalview/debian/rules 2011-09-29 21:31:49 UTC (rev 15137)
@@ -1,11 +1,26 @@
#!/usr/bin/make -f
-export JAVA_HOME=/usr/lib/jvm/default-java
-export
CLASSPATH=/usr/share/java/castor-xml.jar:/usr/share/java/commons-logging.jar:/usr/share/java/log4j-1.2.jar:/usr/share/java/castor-core.jar:/usr/share/java/Jmol.jar:/usr/share/java/vamsas-client.jar:/usr/share/java/min-jaba-client.jar:/usr/share/java/axis-jaxrpc.jar:/usr/share/java/axis.jar:/usr/share/jmol-applet/JmolApplet.jar:/usr/share/java/jh.jar:lib/vamsas-client.jar
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
-%:
- dh $@ --with javahelper
+VERSION = $(shell dpkg-parsechangelog | egrep '^Version' | \
+ sed -r 's/Version:\s*//' | sed -r 's/^[0-9]+://' | \
+ sed -r 's/(\.dfsg)?-[0-9.]+//')
-override_dh_auto_build:
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/javahelper.mk
+include /usr/share/cdbs/1/class/ant.mk
-override_dh_auto_clean:
+JAVA_HOME_DIRS := /usr/lib/jvm/default-java
+ANT_HOME := /usr/share/ant
+DEB_ANT_COMPILER := modern
+DEB_BUILDDIR := .
+DEB_ANT_CLEAN_TARGET := clean
+DEB_ANT_BUILD_TARGET := makedist
+DEB_JARS := castor-xml commons-logging log4j-1.2 \
+ castor-core Jmol min-jaba-client axis-jaxrpc \
+ axis jh lib/vamsas-client.jar /usr/share/jmol-applet/JmolApplet.jar
+
+
+ANT_OPTS := -Dbuild.sysclasspath=last -DPACKAGE_VERSION=$(VERSION)
+
Modified: trunk/jalview/debian/wrappers/jalview
===================================================================
--- trunk/jalview/debian/wrappers/jalview 2011-09-29 20:39:05 UTC (rev
15136)
+++ trunk/jalview/debian/wrappers/jalview 2011-09-29 21:31:49 UTC (rev
15137)
@@ -6,11 +6,10 @@
# We need openjdk or sun6
find_java_runtime openjdk sun6
-find_jars activation axis jalview-castor-1.1-cycle-xml \
- commons-discovery commons-logging jaxrpc \
- jhall Jmol log4j-1.2 \
- gnumail regex saaj jalview-vamsas-client \
- wsdl4j xercesImpl xml-apis \
+find_jars castor-xml commons-logging log4j-1.2 \
+ castor-core Jmol min-jaba-client axis-jaxrpc \
+ axis jh /usr/share/jalview/vamsas-client.jar \
+ /usr/share/jmol-applet/JmolApplet.jar \
jalview
run_java jalview.bin.Jalview "$@"
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
