[med-svn] [mauve] 04/04: Try to use libzeus-jscl-java which was just created in pkg-java Git but this does not seem to work :-(

[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 0e9ac58ffbe26658937f90ac9161ea11d7007038
Author: Andreas Tille <tille at debian.org>
Date:   Wed Apr 22 14:11:44 2015 +0200

    Try to use libzeus-jscl-java which was just created in pkg-java Git but this does not seem to work :-(
---
 debian/bin/mauve                    | 2 +-
 debian/control                      | 2 +-
 debian/get-orig-source              | 3 ++-
 debian/patches/debian_classes.patch | 3 ++-
 debian/rules                        | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/debian/bin/mauve b/debian/bin/mauve
index 7ff0258..33d01a2 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}/bytecode.jar:${DEBJAR}/commons-cli.jar:${DEBJAR}/jebl.jar" -jar ${DEBJAR}/Mauve.jar $@
+$JAVA_CMD $JAVA_ARGS -DmauveDir=${DEBJAR}/ -classpath "${CLASSPATH}:${DEBJAR}/bytecode.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 5af45ef..f671751 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 9),
                libcommons-cli-java,
                libdbus-java,
                libjebl2-java,
-               libpostgresql-jdbc-java
+               libzeus-jscl-java
 Standards-Version: 3.9.6
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/mauve/
 Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/mauve/trunk/
diff --git a/debian/get-orig-source b/debian/get-orig-source
index d9e55f5..0d97cff 100755
--- a/debian/get-orig-source
+++ b/debian/get-orig-source
@@ -28,7 +28,8 @@ LC_ALL=C svn export ${SVNURI} ${TARDIR} >/dev/null 2>/dev/null
 cd ${TARDIR}
 rm -rf osx win32 win64
 rm -rf linux-x64/mauveAligner linux-x86/mauveAligner linux-x64/progressiveMauve linux-x86/progressiveMauve
-for libjava in ant bytecode commons-cli dbus jebl postgres ; do
+# zeus-jscl should be removable as well but when using libzeus-jscl-java the build fails ...
+for libjava in ant bytecode commons-cli dbus jebl postgres  ; do
    find . -name "*${libjava}*.jar" -delete
 done
 rm -rf build_support/retroweaver
diff --git a/debian/patches/debian_classes.patch b/debian/patches/debian_classes.patch
index 2291120..7669fb3 100644
--- a/debian/patches/debian_classes.patch
+++ b/debian/patches/debian_classes.patch
@@ -22,7 +22,8 @@ Description: Use Debian packaged classes
 -				${ext}/commons-cli-1.2.jar;
 +				${deblib}/commons-cli.jar;
  				${support}/junit.jar;
- 				${ext}/zeus-jscl.jar;
+-				${ext}/zeus-jscl.jar;
++				${deblib}/zeus-jscl.jar;
  				${ext}/goose.jar;
  				${ext}/ant-1.7.1.jar;
 -				${ext}/dbus-2.6.jar;
diff --git a/debian/rules b/debian/rules
index 89ef888..c649bb4 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)/bytecode.jar:$(DEBJAR)/commons-cli.jar:$(DEBJAR)/dbus.jar:$(DEBJAR)/jebl.jar
+CLASS_PATH := $(DEBJAR)/bytecode.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