[med-svn] [mauve] 01/01: The bytecode*.jar was not really libbytecode-java but rather a part of biojava - dropped this in favour of biojava.jar

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository mauve.

commit be8bac463312ff88608ac3cc7483a8506d66fc1b
Author: Andreas Tille <tille at debian.org>
Date:   Wed Apr 22 21:56:26 2015 +0200

    The bytecode*.jar was not really libbytecode-java but rather a part of biojava - dropped this in favour of biojava.jar
---
 debian/bin/mauve                                  | 2 +-
 debian/control                                    | 1 -
 debian/patches/debian_classes.patch               | 6 ++----
 debian/patches/revert_zeus-jscl_from_debian.patch | 4 ++--
 debian/rules                                      | 2 +-
 5 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/debian/bin/mauve b/debian/bin/mauve
index cbc9f6a..2129aec 100644
--- a/debian/bin/mauve
+++ b/debian/bin/mauve
@@ -5,5 +5,5 @@ JAVA_ARGS="-Xms200M -Xmx500M"
 
 DEBJAR="/usr/share/java"
 
-$JAVA_CMD $JAVA_ARGS -DmauveDir=${DEBJAR}/ -classpath "${CLASSPATH}:${DEBJAR}/biojava.jar:${DEBJAR}/bytecode.jar:${DEBJAR}/commons-cli.jar:${DEBJAR}/jebl.jar:${DEBJAR}/zeus-jscl.jar" -jar ${DEBJAR}/Mauve.jar $@
+$JAVA_CMD $JAVA_ARGS -DmauveDir=${DEBJAR}/ -classpath "${CLASSPATH}:${DEBJAR}/biojava.jar:${DEBJAR}/commons-cli.jar:${DEBJAR}/jebl.jar:${DEBJAR}/zeus-jscl.jar" -jar ${DEBJAR}/Mauve.jar $@
 ## :{DEBJAR}/postgresql-jdbc4.jar 
diff --git a/debian/control b/debian/control
index ed5dae1..c4228fa 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,6 @@ Build-Depends: debhelper (>= 9),
                ant,
                ant-contrib,
                libbiojava-java,
-               libbytecode-java,
                libcommons-cli-java,
                libdbus-java,
                libjebl2-java
diff --git a/debian/patches/debian_classes.patch b/debian/patches/debian_classes.patch
index 8839ba0..9545f26 100644
--- a/debian/patches/debian_classes.patch
+++ b/debian/patches/debian_classes.patch
@@ -12,7 +12,7 @@ Description: Use Debian packaged classes
   	<property name="support" location="build_support"/>
  
  	<!-- Make datestamp for update checks -->
-@@ -77,16 +78,15 @@
+@@ -77,16 +78,14 @@
  		<!-- Build all java source files -->
  		<javac
  			classpath="
@@ -21,7 +21,6 @@ Description: Use Debian packaged classes
 -				${ext}/gui-1.9.2-SNAPSHOT.jar;
 -				${ext}/commons-cli-1.2.jar;
 +				${deblib}/biojava.jar;
-+				${deblib}/bytecode.jar;
 +				${deblib}/commons-cli.jar;
  				${support}/junit.jar;
 -				${ext}/zeus-jscl.jar;
@@ -37,7 +36,7 @@ Description: Use Debian packaged classes
  			destdir="${build}"
 --- a/.classpath
 +++ b/.classpath
-@@ -3,18 +3,17 @@
+@@ -3,18 +3,16 @@
  	<classpathentry kind="src" path="src"/>
  	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
  	<classpathentry kind="var" path="JUNIT_HOME/junit.jar" sourcepath="ECLIPSE_HOME/plugins/org.eclipse.jdt.source_3.0.0/src/org.junit_3.8.1/junitsrc.zip"/>
@@ -58,7 +57,6 @@ Description: Use Debian packaged classes
 -	<classpathentry kind="lib" path="ext/bytecode-1.9.2-SNAPSHOT.jar"/>
 -	<classpathentry kind="lib" path="ext/core-1.9.2-SNAPSHOT.jar"/>
 -	<classpathentry kind="lib" path="ext/gui-1.9.2-SNAPSHOT.jar"/>
-+	<classpathentry kind="lib" path="/usr/share/java/bytecode.jar"/>
 +	<classpathentry kind="lib" path="/usr/share/java/biojava.jar"/>
  	<classpathentry kind="output" path="bin"/>
  </classpath>
diff --git a/debian/patches/revert_zeus-jscl_from_debian.patch b/debian/patches/revert_zeus-jscl_from_debian.patch
index 9e70241..22c722a 100644
--- a/debian/patches/revert_zeus-jscl_from_debian.patch
+++ b/debian/patches/revert_zeus-jscl_from_debian.patch
@@ -6,8 +6,8 @@ Description: Since the libzeus-jscl-java package does not (yet)
 
 --- a/build.xml
 +++ b/build.xml
-@@ -82,7 +82,7 @@
- 				${deblib}/bytecode.jar;
+@@ -81,7 +81,7 @@
+ 				${deblib}/biojava.jar;
  				${deblib}/commons-cli.jar;
  				${support}/junit.jar;
 -				${deblib}/zeus-jscl.jar;
diff --git a/debian/rules b/debian/rules
index ea279b3..68fadd2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,7 @@ PACKAGE := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
 JAVA_HOME  := /usr/lib/jvm/default-java
 
 DEBJAR    := /usr/share/java
-CLASS_PATH := $(DEBJAR)/biojava.jar:$(DEBJAR)/bytecode.jar:$(DEBJAR)/commons-cli.jar:$(DEBJAR)/dbus.jar:$(DEBJAR)/jebl.jar:$(DEBJAR)/zeus-jscl.jar
+CLASS_PATH := $(DEBJAR)/biojava.jar:$(DEBJAR)/commons-cli.jar:$(DEBJAR)/dbus.jar:$(DEBJAR)/jebl.jar:$(DEBJAR)/zeus-jscl.jar
 ## :$(DEBJAR)/postgresql-jdbc4.jar 
 
 # to run the test suite

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/mauve.git