This is an automated email from the git hooks/post-receive script. gregoa pushed a commit to branch master in repository jabref.
commit 9be18f8ac3c7b09ff1590db5a128d0a48ac66042 Author: gregor herrmann <[email protected]> Date: Mon Apr 7 19:34:21 2008 +0000 a step towards building with debian packages --- debian/changelog | 8 ++++++++ debian/control | 4 +++- debian/patches/00list | 1 + debian/patches/02_libs.dpatch | 34 ++++++++++++---------------------- 4 files changed, 24 insertions(+), 23 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0559819..cd23739 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +jabref (2.3.1-3) UNRELEASED; urgency=low + + * Build against Debian libraries instead of pre-packaged ones + (closes: #389068). Adapt and reactivate patch 02_libs.dpatch, add + necessary packages to Build-Depends-Indep. + + -- gregor herrmann <[email protected]> Mon, 07 Apr 2008 21:30:48 +0200 + jabref (2.3.1-2) unstable; urgency=low * Change pdfviewer to pdf-viewer in Suggests:. diff --git a/debian/control b/debian/control index 31960de..7bae484 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,9 @@ Priority: optional Maintainer: gregor herrmann <[email protected]> Uploaders: tony mancill <[email protected]> Build-Depends: debhelper (>= 6), dpatch, ant -Build-Depends-Indep: java-gcj-compat-dev, imagemagick, liblog4j1.2-java +Build-Depends-Indep: java-gcj-compat-dev, 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) Standards-Version: 3.7.3 Homepage: http://jabref.sourceforge.net/ Vcs-Svn: http://svn.toastfreeware.priv.at/debian/jabref/trunk/ diff --git a/debian/patches/00list b/debian/patches/00list index 4626e1d..4b8f598 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,3 +1,4 @@ 01_free_javac +02_libs 03_external_apps 04_HONOR_DISPLAY_PROPERTIES diff --git a/debian/patches/02_libs.dpatch b/debian/patches/02_libs.dpatch index 49c3926..4f107ff 100755 --- a/debian/patches/02_libs.dpatch +++ b/debian/patches/02_libs.dpatch @@ -5,9 +5,9 @@ ## DP: Use debian packages of libraries instead of shipped ones. @DPATCH@ -diff -urNad jabref~/build.xml jabref/build.xml ---- jabref~/build.xml 2007-10-01 00:34:10.000000000 +0200 -+++ jabref/build.xml 2007-10-01 22:10:26.000000000 +0200 +diff -urNad jabref-2.3~/build.xml jabref-2.3/build.xml +--- jabref-2.3~/build.xml 2008-04-07 20:25:04.000000000 +0200 ++++ jabref-2.3/build.xml 2008-04-07 20:35:39.000000000 +0200 @@ -87,6 +87,7 @@ <!-- Set the properties for library directories --> @@ -15,21 +15,22 @@ diff -urNad jabref~/build.xml jabref/build.xml + <property name="library.directory.debian" value="/usr/share/java" /> <!-- <property name="nsis.executable" value="makensis.exe"/> --> - -@@ -111,15 +112,14 @@ + <property name="nsis.executable.linux" value="makensis"/> +@@ -112,15 +113,15 @@ <path id="classpath"> <pathelement path="${build.classes}" /> <pathelement path="${build.dir}" /> - <pathelement location="${library.directory}/antlr.jar" /> - <pathelement location="${library.directory}/antlr-3.0b5.jar" /> - <pathelement location="${library.directory}/looks-2.0.4.jar" /> -- <pathelement location="${library.directory}/forms-1.0.4.jar" /> +- <pathelement location="${library.directory}/forms-1.1.0.jar" /> - <pathelement location="${library.directory}/spin.jar" /> - <pathelement location="${library.directory}/glazedlists-1.7.0_java15.jar" /> - <pathelement location="${library.directory}/microba.jar" /> - <pathelement location="${library.directory}/PDFBox-0.7.3-dev-reduced.jar" /> - <pathelement location="${library.directory}/JempBox-0.1.0-dev.jar" /> + <pathelement location="${library.directory.debian}/antlr.jar" /> ++ <pathelement location="${library.directory.debian}/antlr3.jar" /> + <pathelement location="${library.directory.debian}/looks.jar" /> + <pathelement location="${library.directory.debian}/forms.jar" /> + <pathelement location="${library.directory.debian}/spin.jar" /> @@ -40,22 +41,23 @@ diff -urNad jabref~/build.xml jabref/build.xml </path> <target name="run" depends="build"> -@@ -356,15 +356,14 @@ +@@ -363,15 +364,15 @@ <!-- Unpacks jar needed jar files from lib directory into temp directory. --> <target name="unjarlib" description="Unpacks jars from library"> <mkdir dir="${build.tmp}" /> - <unjar src="${library.directory}/antlr.jar" dest="${build.tmp}" /> - <unjar src="${library.directory}/antlr-3.0b5.jar" dest="${build.tmp}" /> - <unjar src="${library.directory}/looks-2.0.4.jar" dest="${build.tmp}" /> -- <unjar src="${library.directory}/forms-1.0.4.jar" dest="${build.tmp}" /> +- <unjar src="${library.directory}/forms-1.1.0.jar" dest="${build.tmp}" /> - <unjar src="${library.directory}/spin.jar" dest="${build.tmp}" /> - <unjar src="${library.directory}/glazedlists-1.7.0_java15.jar" dest="${build.tmp}" /> - <unjar src="${library.directory}/microba.jar" dest="${build.tmp}" /> - <unjar src="${library.directory}/PDFBox-0.7.3-dev-reduced.jar" dest="${build.tmp}" /> - <unjar src="${library.directory}/JempBox-0.1.0-dev.jar" dest="${build.tmp}" /> + <unjar src="${library.directory.debian}/antlr.jar" dest="${build.tmp}" /> -+ <unjar src="${library.directory.debian}/looks" dest="${build.tmp}" /> -+ <unjar src="${library.directory.debian}/forms" dest="${build.tmp}" /> ++ <unjar src="${library.directory.debian}/antlr.jar" dest="${build.tmp}" /> ++ <unjar src="${library.directory.debian}/looks.jar" dest="${build.tmp}" /> ++ <unjar src="${library.directory.debian}/forms.jar" dest="${build.tmp}" /> + <unjar src="${library.directory.debian}/spin.jar" dest="${build.tmp}" /> + <unjar src="${library.directory.debian}/glazedlists.jar" dest="${build.tmp}" /> + <unjar src="${library.directory.debian}/microba.jar" dest="${build.tmp}" /> @@ -64,15 +66,3 @@ diff -urNad jabref~/build.xml jabref/build.xml <delete dir="${build.tmp}/META-INF" /> <!-- rename the microba license file --> <move file="${build.tmp}/license.txt" tofile="${build.tmp}/microba-license.txt" /> -diff -urNad jabref~/src/java/net/sf/jabref/EntryEditorTab.java jabref/src/java/net/sf/jabref/EntryEditorTab.java ---- jabref~/src/java/net/sf/jabref/EntryEditorTab.java 2007-08-29 22:33:52.000000000 +0200 -+++ jabref/src/java/net/sf/jabref/EntryEditorTab.java 2007-10-01 22:10:47.000000000 +0200 -@@ -133,7 +133,7 @@ - String rowSpec = sb.toString(); - - DefaultFormBuilder builder = new DefaultFormBuilder -- (panel, new FormLayout(colSpec, rowSpec)); -+ (new FormLayout(colSpec, rowSpec), panel); - - for (int i = 0; i < fields.length; i++) { - // Create the text area: -- 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
