This is an automated email from the git hooks/post-receive script. gregoa pushed a commit to branch master in repository jabref.
commit a792c9790c0b472bd68648d302c654ddd9eacb31 Author: gregor herrmann <[email protected]> Date: Wed Aug 12 20:18:42 2009 +0000 2 new patches from philip (missing dep in d/control, further cleanup in build.xml) --- debian/control | 5 +++-- debian/patches/02_libs.patch | 20 +++++++++++--------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/debian/control b/debian/control index 1a13394..3b8494c 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,8 @@ Build-Depends: debhelper (>= 6), quilt, ant Build-Depends-Indep: openjdk-6-jdk, imagemagick, liblog4j1.2-java, antlr, antlr3, libjgoodies-looks-java, libjgoodies-forms-java, libspin-java, libglazedlists-java, libmicroba-java, libpdfbox-java, libjempbox-java (>= 0.2.0), - libmysql-java, libcommons-logging-java, libjpf-java, libjpfcodegen-java + libmysql-java, libcommons-logging-java, libjpf-java, libjpfcodegen-java, + velocity (>=1.5) Standards-Version: 3.8.0 Homepage: http://jabref.sourceforge.net/ Vcs-Svn: http://svn.toastfreeware.priv.at/debian/jabref/trunk/ @@ -19,7 +20,7 @@ Depends: openjdk-6-jre | sun-java6-jre | sun-java5-jre, antlr, antlr3, libjgoodies-looks-java, libjgoodies-forms-java, libspin-java, libglazedlists-java, libmicroba-java, libpdfbox-java, libjempbox-java (>= 0.2.0), java-wrappers (>= 0.1.6), libmysql-java, - libcommons-logging-java, libjpf-java, libjpfcodegen-java + libcommons-logging-java, libjpf-java, libjpfcodegen-java, velocity (>=1.5) Suggests: gv | postscript-viewer, xpdf | pdf-viewer Description: graphical frontend to manage BibTeX databases JabRef is a GUI to manage BibTeX databases, the standard LaTeX bibliography diff --git a/debian/patches/02_libs.patch b/debian/patches/02_libs.patch index 105a59a..85c67b8 100644 --- a/debian/patches/02_libs.patch +++ b/debian/patches/02_libs.patch @@ -1,8 +1,10 @@ Author: Gerardo Curiel <[email protected]> Author: Philip Rinn <[email protected]> Description: Use debian libraries and disable unnecesary unjarlib target, ---- a/build.xml -+++ b/build.xml +Index: 2.5/build.xml +=================================================================== +--- 2.5.orig/build.xml 2009-08-12 21:47:37.000000000 +0200 ++++ 2.5/build.xml 2009-08-12 21:54:25.000000000 +0200 @@ -85,7 +85,7 @@ <property name="help.dir" value="${src.dir}/help" /> <property name="extensions.dir" value="${src.dir}/extensions" /> @@ -12,7 +14,7 @@ Description: Use debian libraries and disable unnecesary unjarlib target, <property name="tests.dir" value="${src.dir}/tests" /> <property name="nsis.executable" value="makensis.exe"/> -@@ -107,22 +107,22 @@ +@@ -107,22 +107,21 @@ <fileset id="jarsFileset" dir="${lib.dir}"> <include name="antlr.jar" /> @@ -28,10 +30,10 @@ Description: Use debian libraries and disable unnecesary unjarlib target, <include name="microba.jar" /> - <include name="PDFBox-0.7.3-dev-reduced.jar" /> - <include name="JempBox-0.2.0.jar" /> +- <include name="zoom-java.jar" /> +- <include name="mysql-connector-java-5.0.7-bin.jar" /> + <include name="pdfbox.jar" /> + <include name="jempbox.jar" /> - <include name="zoom-java.jar" /> -- <include name="mysql-connector-java-5.0.7-bin.jar" /> + <include name="mysql-connector-java.jar" /> <!--<include name="substance-4.1.jar" />--> <!-- Plugin runtime dependencies --> @@ -46,7 +48,7 @@ Description: Use debian libraries and disable unnecesary unjarlib target, </fileset> <!-- Build classpath --> -@@ -134,10 +134,10 @@ +@@ -134,10 +133,10 @@ <!-- Classpath for running the code generator --> <path id="codegenerator"> @@ -57,11 +59,11 @@ Description: Use debian libraries and disable unnecesary unjarlib target, + <pathelement location="${lib.dir}/JPFCodeGenerator.jar" /> + <pathelement location="${lib.dir}/jpf.jar" /> + <pathelement location="${lib.dir}/jpf-boot.jar" /> -+ <pathelement location="${lib.dir}/velocity-dep-1.5.jar" /> ++ <pathelement location="${lib.dir}/velocity.jar" /> </path> <!-- Classpath for tests --> -@@ -217,7 +217,7 @@ +@@ -217,7 +216,7 @@ </target> <!-- Jars up project --> @@ -70,7 +72,7 @@ Description: Use debian libraries and disable unnecesary unjarlib target, <mkdir dir="${build.lib}" /> <mkdir dir="${build.tmp}" /> <jar destfile="${build.lib}/${build.jar}"> -@@ -612,6 +612,6 @@ +@@ -612,6 +611,6 @@ </jalopy> </target> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jabref.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
