[med-svn] [mauve] 04/04: Replace jnlp by icedtea-netx-common

[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 8004ce27bd77d6b45825ff91759aeeab8b8b3f35
Author: Andreas Tille <tille at debian.org>
Date:   Mon Apr 27 16:04:48 2015 +0200

    Replace jnlp by icedtea-netx-common
---
 debian/control                      | 6 ++++--
 debian/get-orig-source              | 2 +-
 debian/mauve.manifest               | 2 +-
 debian/patches/debian_classes.patch | 3 ++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index e0d5b11..42bad03 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,8 @@ Build-Depends: debhelper (>= 9),
                libcommons-cli-java,
                libdbus-java,
                libjebl2-java,
-               libzeus-jscl-java
+               libzeus-jscl-java,
+               icedtea-netx-common
 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
@@ -21,8 +22,9 @@ Homepage: http://darlinglab.org/mauve/
 
 Package: mauve
 Architecture: any
-Depends: ${shlibs:Depends},
+Depends: ${java:Depends},
          ${misc:Depends}
+Recommends: ${java:Recommends}
 Description: multiple genome alignment
  Mauve is a system for efficiently constructing multiple genome alignments
  in the presence of large-scale evolutionary events such as rearrangement
diff --git a/debian/get-orig-source b/debian/get-orig-source
index ea26fb9..3920178 100755
--- a/debian/get-orig-source
+++ b/debian/get-orig-source
@@ -28,7 +28,7 @@ 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 postgres zeus-jscl ; do
+for libjava in ant bytecode commons-cli core dbus gui jebl jnlp postgres zeus-jscl ; do
    find . -name "*${libjava}*.jar" -delete
 done
 rm -rf build_support/retroweaver
diff --git a/debian/mauve.manifest b/debian/mauve.manifest
index 9d0e766..4c242f4 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/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 /usr/share/Mauve/ext/jnlp.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
diff --git a/debian/patches/debian_classes.patch b/debian/patches/debian_classes.patch
index cf56d46..de7ee3a 100644
--- a/debian/patches/debian_classes.patch
+++ b/debian/patches/debian_classes.patch
@@ -54,10 +54,11 @@ Description: Use Debian packaged classes
  	<classpathentry kind="lib" path="ext/unix-0.5.jar"/>
  	<classpathentry kind="lib" path="ext/jsc.jar"/>
  	<classpathentry kind="lib" path="ext/goose.jar"/>
- 	<classpathentry kind="lib" path="ext/jnlp.jar"/>
+-	<classpathentry kind="lib" path="ext/jnlp.jar"/>
 -	<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/icedtea-web/netx.jar"/>
 +	<classpathentry kind="lib" path="/usr/share/java/biojava.jar"/>
  	<classpathentry kind="output" path="bin"/>
  </classpath>

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