[med-svn] [mauve] 01/01: Remove dependency from jebl.jar as suggested by upstream

[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 8cd7a3a90d761276995702cf1155a5acb15d7e97
Author: Andreas Tille <tille at debian.org>
Date:   Thu Apr 30 12:30:07 2015 +0200

    Remove dependency from jebl.jar as suggested by upstream
---
 debian/control                      | 1 -
 debian/mauve.manifest               | 2 +-
 debian/patches/debian_classes.patch | 6 ++----
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index 7995bc3..fecfa8f 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,6 @@ Build-Depends: debhelper (>= 9),
                libbiojava-java,
                libcommons-cli-java,
                libdbus-java,
-               libjebl2-java,
                libzeus-jscl-java,
                icedtea-netx-common,
                libunixsocket-java
diff --git a/debian/mauve.manifest b/debian/mauve.manifest
index 51ea86d..1c12b40 100644
--- a/debian/mauve.manifest
+++ b/debian/mauve.manifest
@@ -1,2 +1,2 @@
 usr/share/java/Mauve.jar:
- Class-Path: /usr/share/java/biojava.jar /usr/share/java/commons-cli.jar /usr/share/java/jebl.jar /usr/share/icedtea-web/netx.jar /usr/share/java/zeus-jscl.jar /usr/share/java/dbus.jar /usr/share/java/unix.jar /usr/share/Mauve/ext/goose.jar
+ Class-Path: /usr/share/java/biojava.jar /usr/share/java/commons-cli.jar /usr/share/icedtea-web/netx.jar /usr/share/java/zeus-jscl.jar /usr/share/java/dbus.jar /usr/share/java/unix.jar /usr/share/Mauve/ext/goose.jar
diff --git a/debian/patches/debian_classes.patch b/debian/patches/debian_classes.patch
index 2057a86..46153cd 100644
--- a/debian/patches/debian_classes.patch
+++ b/debian/patches/debian_classes.patch
@@ -23,7 +23,7 @@ Description: Use Debian packaged classes
  		</classpath>
  	</taskdef>
  	
-@@ -77,17 +78,15 @@
+@@ -77,17 +78,14 @@
  		<!-- Build all java source files -->
  		<javac
  			classpath="
@@ -43,14 +43,13 @@ Description: Use Debian packaged classes
 -				${ext}/unix-0.5.jar"
 +				${deblib}/ant.jar;
 +				${deblib}/dbus.jar;
-+				${deblib}/jebl.jar;
 +				${deblib}/unix.jar"
  			srcdir="${src}"
  			destdir="${build}"
  			target="1.6"
 --- a/.classpath
 +++ b/.classpath
-@@ -3,18 +3,15 @@
+@@ -3,18 +3,14 @@
  	<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"/>
@@ -59,7 +58,6 @@ Description: Use Debian packaged classes
 -	<classpathentry kind="lib" path="ext/jebl-0.4.jar" sourcepath="/jebl/src"/>
 +	<classpathentry kind="lib" path="/usr/share/java/commons-cli.jar"/>
 +	<classpathentry kind="lib" path="/usr/share/java/ant.jar"/>
-+	<classpathentry kind="lib" path="/usr/share/java/jebl.jar" >
  	<classpathentry kind="src" path="test"/>
 -	<classpathentry kind="lib" path="ext/zeus-jscl.jar"/>
 -	<classpathentry kind="lib" path="ext/dbus-2.6.jar"/>

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