[med-svn] [mauve] 03/03: We can also replace unix-0.5.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 6f0f38a8792b5863748b8393cd061f44d16601a4
Author: Andreas Tille <tille at debian.org>
Date:   Mon Apr 27 21:42:00 2015 +0200

    We can also replace unix-0.5.jar
---
 debian/control                      |  4 +++-
 debian/get-orig-source              |  5 ++---
 debian/mauve.manifest               |  2 +-
 debian/patches/debian_classes.patch | 27 +++++++++++++++++++++------
 4 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/debian/control b/debian/control
index e636869..3f6a32f 100644
--- a/debian/control
+++ b/debian/control
@@ -8,12 +8,14 @@ Build-Depends: debhelper (>= 9),
                default-jdk,
                ant,
                ant-contrib,
+               junit,
                libbiojava-java,
                libcommons-cli-java,
                libdbus-java,
                libjebl2-java,
                libzeus-jscl-java,
-               icedtea-netx-common
+               icedtea-netx-common,
+               libunixsocket-java
 Standards-Version: 3.9.6
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/mauve.git
 Vcs-Git: git://anonscm.debian.org/debian-med/mauve.git
diff --git a/debian/get-orig-source b/debian/get-orig-source
index 3920178..e0b7a45 100755
--- a/debian/get-orig-source
+++ b/debian/get-orig-source
@@ -28,11 +28,10 @@ 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 core dbus gui jebl jnlp postgres zeus-jscl ; do
+for libjava in ant bytecode commons-cli core dbus gui jebl jnlp postgres unix zeus-jscl ; do
    find . -name "*${libjava}*.jar" -delete
 done
-rm -rf build_support/retroweaver
-rm -rf build_support/[b-z]*
+rm -rf build_support
 cd ..
 
 tar --owner=root --group=root --mode=a+rX -caf "$NAME"_"$VERSION".orig.tar.xz "${TARDIR}"
diff --git a/debian/mauve.manifest b/debian/mauve.manifest
index 4c242f4..b1ea92f 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/Mauve/ext/unix-0.5.jar /usr/share/Mauve/ext/jsc.jar /usr/share/Mauve/ext/goose.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/jsc.jar /usr/share/Mauve/ext/goose.jar
diff --git a/debian/patches/debian_classes.patch b/debian/patches/debian_classes.patch
index de7ee3a..eaa590e 100644
--- a/debian/patches/debian_classes.patch
+++ b/debian/patches/debian_classes.patch
@@ -4,15 +4,26 @@ Description: Use Debian packaged classes
 
 --- a/build.xml
 +++ b/build.xml
-@@ -30,6 +30,7 @@
+@@ -30,7 +30,8 @@
  	<property name="build" location="bin"/>
  	<property name="dist"  location="dist"/>
  	<property name="ext" location="ext"/>
+- 	<property name="support" location="build_support"/>
 +        <property name="deblib" location="/usr/share/java" />
-  	<property name="support" location="build_support"/>
++ 	<property name="support" location="/usr/share/java"/>
  
  	<!-- Make datestamp for update checks -->
-@@ -77,16 +78,14 @@
+ 	<tstamp>
+@@ -45,7 +46,7 @@
+ 
+ 	<taskdef resource="net/sf/antcontrib/antcontrib.properties">
+ 		<classpath>
+-			<pathelement path="${support}/ant-contrib-1.0b3.jar"/>
++			<pathelement path="${support}/ant-contrib.jar"/>
+ 		</classpath>
+ 	</taskdef>
+ 	
+@@ -77,17 +78,15 @@
  		<!-- Build all java source files -->
  		<javac
  			classpath="
@@ -26,14 +37,17 @@ Description: Use Debian packaged classes
 -				${ext}/zeus-jscl.jar;
 +				${deblib}/zeus-jscl.jar;
  				${ext}/goose.jar;
- 				${ext}/ant-1.7.1.jar;
+-				${ext}/ant-1.7.1.jar;
 -				${ext}/dbus-2.6.jar;
 -				${ext}/jebl-0.4.jar;
+-				${ext}/unix-0.5.jar"
++				${deblib}/ant.jar;
 +				${deblib}/dbus.jar;
 +				${deblib}/jebl.jar;
- 				${ext}/unix-0.5.jar"
++				${deblib}/unix.jar"
  			srcdir="${src}"
  			destdir="${build}"
+ 			target="1.6"
 --- a/.classpath
 +++ b/.classpath
 @@ -3,18 +3,16 @@
@@ -49,9 +63,10 @@ Description: Use Debian packaged classes
  	<classpathentry kind="src" path="test"/>
 -	<classpathentry kind="lib" path="ext/zeus-jscl.jar"/>
 -	<classpathentry kind="lib" path="ext/dbus-2.6.jar"/>
+-	<classpathentry kind="lib" path="ext/unix-0.5.jar"/>
 +	<classpathentry kind="lib" path="/usr/share/java/zeus-jscl.jar"/>
 +	<classpathentry kind="lib" path="/usr/share/java/dbus.jar"/>
- 	<classpathentry kind="lib" path="ext/unix-0.5.jar"/>
++	<classpathentry kind="lib" path="/usr/share/java/unix.jar"/>
  	<classpathentry kind="lib" path="ext/jsc.jar"/>
  	<classpathentry kind="lib" path="ext/goose.jar"/>
 -	<classpathentry kind="lib" path="ext/jnlp.jar"/>

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