[jabref] 02/05: clean up debian/control and debian/jabref-wrapper

[Tony Mancill]

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

tmancill pushed a commit to branch dev
in repository jabref.

commit 27636bae1d2374d13e8af173695804a6c420d98b
Author: tony mancill <tmancill at debian.org>
Date:   Sun Dec 4 16:32:56 2016 -0800

    clean up debian/control and debian/jabref-wrapper
---
 debian/control        | 22 +++++++++++-----------
 debian/jabref-wrapper | 30 ++++++++++++++++++++++--------
 2 files changed, 33 insertions(+), 19 deletions(-)

diff --git a/debian/control b/debian/control
index 5cc0485..cc2bb20 100644
--- a/debian/control
+++ b/debian/control
@@ -20,8 +20,6 @@ Build-Depends-Indep: ant,
                      libjgoodies-forms-java (>= 1.9.0),
                      libjgoodies-looks-java (>= 2.7.0),
                      libjgraph-java,
-                     libjpf-java,
-                     libjpfcodegen-java,
                      liblog4j2-java,
                      libmicroba-java,
                      libmysql-java,
@@ -42,27 +40,29 @@ Homepage: http://www.jabref.org/
 Package: jabref
 Architecture: all
 Depends: ${misc:Depends},
-         antlr,
-         antlr3,
-         antlr4,
          default-jre (>= 2:1.8) | java8-runtime,
          java-wrappers,
+         libantlr3-runtime-java,
+         libantlr4-runtime-java,
+         libbcprov-java,
+         libcommons-lang3-java,
          libcommons-logging-java,
          libglazedlists-java,
+         libguava-java,
          libjempbox-java,
+         libjava-string-similarity-java,
          libjgoodies-common-java (>= 1.8.1),
          libjgoodies-forms-java (>= 1.9.0),
          libjgoodies-looks-java (>= 2.7.0),
-         libjpf-java,
-         libjpfcodegen-java,
+         liblog4j2-java,
          libmicroba-java,
-         libmysql-java,
          libpdfbox-java,
-         libpostgresql-jdbc-java,
          libspin-java
 Recommends: xdg-utils,
-            libreoffice-java-common,
-            libreoffice-writer
+         libreoffice-java-common,
+         libreoffice-writer,
+         libmysql-java,
+         libpostgresql-jdbc-java
 Suggests: gv | postscript-viewer,
           xpdf-reader | pdf-viewer
 Breaks: jabref-plugin-oo (<< 2.9~beta1-1~)
diff --git a/debian/jabref-wrapper b/debian/jabref-wrapper
index 042f607..8a276d5 100644
--- a/debian/jabref-wrapper
+++ b/debian/jabref-wrapper
@@ -3,26 +3,40 @@
 # Include the wrappers utility script
 . /usr/lib/java-wrappers/java-wrappers.sh
 
-# We need a java6 runtime (openjdk[876], oracle[87], sun6).
-find_java_runtime java6
+# We need a java8 runtime
+find_java_runtime java8
 
 find_jars \
 	jabref \
-	JPFCodeGenerator-rt \
-	antlr \
-	antlr3 \
+	bcprov \
+	antlr3-runtime \
+	antlr4-runtime \
+	com.android.json \
+	commons-cli \
+	commons-lang3 \
 	commons-logging \
+	fontbox \
 	glazedlists \
+	guava \
+	java-string-similarity \
 	jempbox \
 	jgoodies-common \
 	jgoodies-forms \
 	jgoodies-looks \
-	jpf \
-	jpf-boot \
+	juh \
+	jurt \
+	log4j-api \
+	log4j-core \
+	log4j-jcl \
 	microba \
 	mysql-connector-java \
 	pdfbox \
 	postgresql \
-	spin
+	ridl \
+	spin \
+	swingx \
+	unirest-java \
+	unoil
+	# TODO: more testing with JabRef 3.6 to determine what else is needed
 
 run_java net.sf.jabref.JabRefMain "$@"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jabref.git