This is an automated email from the git hooks/post-receive script. gregoa pushed a commit to branch master in repository jabref.
commit f8f6b6398342ea45c906a84d03f768b69e007b0e Author: gregor herrmann <[email protected]> Date: Fri Sep 29 21:32:25 2006 +0000 * Fix typo in long description. * Build against Debian packages of libraries instead of pre-built jar files (closes: #389068). --- build.number | 4 +- debian/changelog | 8 ++ debian/control | 4 +- debian/patches/00list | 1 + debian/patches/03_libs.dpatch | 205 ++++++++++++++++++++++++++++++++++++++++++ src/resource/build.properties | 4 +- 6 files changed, 220 insertions(+), 6 deletions(-) diff --git a/build.number b/build.number index 691512d..bf7054b 100644 --- a/build.number +++ b/build.number @@ -1,3 +1,3 @@ #Build Number for ANT. Do not edit! -#Wed Aug 09 18:35:54 CEST 2006 -build.number=570 +#Fri Sep 29 12:09:19 CEST 2006 +build.number=571 diff --git a/debian/changelog b/debian/changelog index 1b3583e..81fd918 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +jabref (2.1-5) unstable; urgency=low + + * Fix typo in long description. + * Build against Debian packages of libraries instead of pre-built jar files + (closes: #389068). + + -- gregor herrmann <[email protected]> Fri, 29 Sep 2006 23:29:17 +0200 + jabref (2.1-4) unstable; urgency=low * Apply patch from Matthias Klose to enable building with a free java compiler - diff --git a/debian/control b/debian/control index 3c46bb3..8998736 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: gregor herrmann <[email protected]> Uploaders: tony mancill <[email protected]> Build-Depends: debhelper (>= 5.0.0), dpatch -Build-Depends-Indep: java-gcj-compat-dev, ant, imagemagick +Build-Depends-Indep: java-gcj-compat-dev, ant, imagemagick, libjgoodies-forms-java, libjgoodies-looks-java, libmicroba-java, libglazedlists-java, libspin-java Standards-Version: 3.7.2 Package: jabref @@ -12,7 +12,7 @@ Architecture: all Depends: sun-java5-jre | j2re1.4 | j2re1.5 | sun-j2sdk1.5 Description: graphical frontend to manage BibTeX databases JabRef is a GUI to manage BibTeX databases, the standard LaTeX bibliography - reference format. JabRef is build to be platform independent (requires Java + reference format. JabRef is built to be platform independent (requires Java 1.4.2 or newer). It merges and extends the functionalities of BibKeeper (Morten O. Alver) and JBibtexManager (Nizar Batada). . diff --git a/debian/patches/00list b/debian/patches/00list index 00fb374..4a17e3a 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -1,2 +1,3 @@ 01_free_javac 02_button +03_libs diff --git a/debian/patches/03_libs.dpatch b/debian/patches/03_libs.dpatch new file mode 100755 index 0000000..8331903 --- /dev/null +++ b/debian/patches/03_libs.dpatch @@ -0,0 +1,205 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_libs.dpatch by <[email protected]> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Replace pre-compiled libs by Debian packages + +@DPATCH@ +diff -urNad jabref~/build.xml jabref/build.xml +--- jabref~/build.xml 2006-08-10 21:39:16.000000000 +0200 ++++ jabref/build.xml 2006-09-29 23:24:50.000000000 +0200 +@@ -86,6 +86,7 @@ + + <!-- Set the properties for library directories --> + <property name="library.directory" value="lib" /> ++ <property name="library.directory.debian" value="/usr/share/java" /> + + + <taskdef name="jarbundler" +@@ -101,6 +102,9 @@ + <fileset dir="${library.directory}"> + <include name="*.jar" /> + </fileset> ++ <fileset dir="${library.directory.debian}"> ++ <include name="*.jar" /> ++ </fileset> + </path> + + <!-- Runs project (e.g. in NetBeans 4) --> +@@ -110,12 +114,12 @@ + <pathelement location="${build.lib}/jabref.jar"/> + <!--<pathelement location="${library.directory}/commons-httpclient-2.0.jar" /> + <pathelement location="${library.directory}/commons-logging.jar" />--> +- <pathelement location="${library.directory}/antlr.jar" /> +- <pathelement location="${library.directory}/looks-2.0.4.jar" /> +- <pathelement location="${library.directory}/forms-1.0.4.jar" /> +- <pathelement location="${library.directory}/spin-1.4.jar" /> +- <pathelement location="${library.directory}/glazedlists-1.5.0_java14.jar" /> +- <pathelement location="${library.directory}/microba.jar" /> ++ <pathelement location="${library.directory.debian}/antlr.jar" /> ++ <pathelement location="${library.directory.debian}/looks.jar" /> ++ <pathelement location="${library.directory.debian}/forms.jar" /> ++ <pathelement location="${library.directory.debian}/spin.jar" /> ++ <pathelement location="${library.directory.debian}/glazedlists.jar" /> ++ <pathelement location="${library.directory.debian}/microba.jar" /> + </classpath> + </java> + </target> +@@ -139,11 +143,11 @@ + <nbprofiledirect> + <classpath> + <pathelement location="${build.lib}/jabref.jar"/> +- <pathelement location="${library.directory}/antlr.jar" /> +- <pathelement location="${library.directory}/looks-2.0.4.jar" /> +- <pathelement location="${library.directory}/forms-1.0.4.jar" /> +- <pathelement location="${library.directory}/spin-1.4.jar" /> +- <pathelement location="${library.directory}/glazedlists-1.5.0_java14.jar" /> ++ <pathelement location="${library.directory.debian}/antlr.jar" /> ++ <pathelement location="${library.directory.debian}/looks.jar" /> ++ <pathelement location="${library.directory.debian}/forms.jar" /> ++ <pathelement location="${library.directory.debian}/spin.jar" /> ++ <pathelement location="${library.directory.debian}/glazedlists.jar" /> + </classpath> + </nbprofiledirect> + +@@ -155,11 +159,11 @@ + <env key="LD_LIBRARY_PATH" path="${profiler.info.agentpath}:${env.LD_LIBRARY_PATH}"/> + <classpath> + <pathelement location="${build.lib}/jabref.jar"/> +- <pathelement location="${library.directory}/antlr.jar" /> +- <pathelement location="${library.directory}/looks-2.0.4.jar" /> +- <pathelement location="${library.directory}/forms-1.0.4.jar" /> +- <pathelement location="${library.directory}/spin-1.4.jar" /> +- <pathelement location="${library.directory}/glazedlists-1.5.0_java14.jar" /> ++ <pathelement location="${library.directory.debian}/antlr.jar" /> ++ <pathelement location="${library.directory.debian}/looks.jar" /> ++ <pathelement location="${library.directory.debian}/forms.jar" /> ++ <pathelement location="${library.directory.debian}/spin.jar" /> ++ <pathelement location="${library.directory.debian}/glazedlists.jar" /> + + </classpath> + </java> +@@ -175,12 +179,12 @@ + <pathelement path="${build.classes}" /> + <!--<pathelement location="${library.directory}/commons-httpclient-2.0.jar" /> + <pathelement location="${library.directory}/commons-logging.jar" />--> +- <pathelement location="${library.directory}/antlr.jar" /> +- <pathelement location="${library.directory}/looks-2.0.4.jar" /> +- <pathelement location="${library.directory}/forms-1.0.4.jar" /> +- <pathelement location="${library.directory}/spin-1.4.jar" /> +- <pathelement location="${library.directory}/glazedlists-1.5.0_java14.jar" /> +- <pathelement location="${library.directory}/microba.jar" /> ++ <pathelement location="${library.directory.debian}/antlr.jar" /> ++ <pathelement location="${library.directory.debian}/looks.jar" /> ++ <pathelement location="${library.directory.debian}/forms.jar" /> ++ <pathelement location="${library.directory.debian}/spin.jar" /> ++ <pathelement location="${library.directory.debian}/glazedlists.jar" /> ++ <pathelement location="${library.directory.debian}/microba.jar" /> + </classpath> + </javac> + </target> +@@ -194,9 +198,9 @@ + <pathelement path="${build.classes}" /> + <!--<pathelement location="${library.directory}/commons-httpclient-2.0.jar" /> + <pathelement location="${library.directory}/commons-logging.jar" />--> +- <pathelement location="${library.directory}/antlr.jar" /> +- <pathelement location="${library.directory}/looks-2.0.4.jar" /> +- <pathelement location="${library.directory}/spin-1.4.jar" /> ++ <pathelement location="${library.directory.debian}/antlr.jar" /> ++ <pathelement location="${library.directory.debian}/looks.jar" /> ++ <pathelement location="${library.directory.debian}/spin.jar" /> + </classpath> + </javac> + +@@ -409,16 +413,16 @@ + <mkdir dir="${build.tmp}"/> + <!--<unjar src="${library.directory}/commons-httpclient-2.0.jar" dest="${build.tmp}" /> + <unjar src="${library.directory}/commons-logging.jar" dest="${build.tmp}" />--> +- <unjar src="${library.directory}/antlr.jar" dest="${build.tmp}" /> ++ <unjar src="${library.directory.debian}/antlr.jar" dest="${build.tmp}" /> + <!-- <unjar src="${library.directory}/plastic-1.2.1.jar" dest="${build.classes}" />--> +- <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}/spin-1.4.jar" dest="${build.tmp}" /> +- <unjar src="${library.directory}/glazedlists-1.5.0_java14.jar" dest="${build.tmp}" /> +- <unjar src="${library.directory}/microba.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}" /> + <delete dir="${build.tmp}/META-INF"/> + <!-- rename the microba license file --> +- <move file="${build.tmp}/license.txt" tofile="${build.tmp}/microba-license.txt"/> ++ <!-- <move file="${build.tmp}/license.txt" tofile="${build.tmp}/microba-license.txt"/> --> + </target> + + +@@ -447,6 +451,9 @@ + <fileset dir="${library.directory}"> + <include name="*.jar" /> + </fileset> ++ <fileset dir="${library.directory.debian}"> ++ <include name="*.jar" /> ++ </fileset> + </classpath> + </taskdef> + <!-- allowed Pretty Much Done rulsets --> +@@ -483,6 +490,9 @@ + <fileset dir="${library.directory}"> + <include name="*.jar" /> + </fileset> ++ <fileset dir="${library.directory.debian}"> ++ <include name="*.jar" /> ++ </fileset> + </classpath> + </taskdef> + <cpd format="text" minimumTokenCount="100" outputFile="${build.dir}/duplicated_code_report.txt"> +@@ -500,6 +510,9 @@ + <fileset dir="${library.directory}"> + <include name="*.jar" /> + </fileset> ++ <fileset dir="${library.directory.debian}"> ++ <include name="*.jar" /> ++ </fileset> + </classpath> + </taskdef> + <echo>Cyclomatic +@@ -523,6 +536,9 @@ + <fileset dir="${library.directory}"> + <include name="*.jar" /> + </fileset> ++ <fileset dir="${library.directory.debian}"> ++ <include name="*.jar" /> ++ </fileset> + </classpath> + </taskdef> + <jalopy fileformat="unix" convention="${src.dir}/java/jalopy.format.convention.xml" history="file" historymethod="adler32" loglevel="error" threads="2" classpathref="classpath" backup="bak"> +@@ -545,10 +561,10 @@ + <pathelement location="${build.lib}/jabref.jar" /> + <!--<pathelement location="${library.directory}/commons-httpclient-2.0.jar" /> + <pathelement location="${library.directory}/commons-logging.jar" />--> +- <pathelement location="${library.directory}/antlr.jar" /> +- <pathelement location="${library.directory}/looks-2.0.4.jar" /> +- <pathelement location="${library.directory}/looks-2.0.4.jar" /> +- <pathelement location="${library.directory}/spin-1.4.jar" /> ++ <pathelement location="${library.directory.debian}/antlr.jar" /> ++ <pathelement location="${library.directory.debian}/looks.jar" /> ++ <pathelement location="${library.directory.debian}/forms.jar" /> ++ <pathelement location="${library.directory.debian}/spin.jar" /> + </classpath> + + <!--<test name="tests.net.sf.jabref.export.layout.format.AuthorLastFirstAbbreviatorTester"/>--> +diff -urNad jabref~/src/java/net/sf/jabref/gui/date/DatePickerButton.java jabref/src/java/net/sf/jabref/gui/date/DatePickerButton.java +--- jabref~/src/java/net/sf/jabref/gui/date/DatePickerButton.java 2006-05-20 17:05:24.000000000 +0200 ++++ jabref/src/java/net/sf/jabref/gui/date/DatePickerButton.java 2006-09-29 23:23:32.000000000 +0200 +@@ -53,7 +53,8 @@ + + public DatePickerButton(FieldEditor pEditor) + { +- datePicker.showButtonOnly( true ) ; ++ // showButtonOnly doesn't exist in current microba ++ // datePicker.showButtonOnly( true ) ; + datePicker.addActionListener( this ) ; + + editor = pEditor ; diff --git a/src/resource/build.properties b/src/resource/build.properties index 1172524..def7cd4 100644 --- a/src/resource/build.properties +++ b/src/resource/build.properties @@ -1,3 +1,3 @@ -builddate=August 9 2006 -build=569 +builddate=September 29 2006 +build=570 version=2.1 \ No newline at end of file -- 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
