[jabref] 186/459: add philip's changes as quilt patches, remove old dpatch patches, hook quilt into debian/rules
gregor herrmann
gregoa at debian.org
Thu Sep 15 20:40:19 UTC 2016
This is an automated email from the git hooks/post-receive script.
gregoa pushed a commit to branch master
in repository jabref.
commit 3b052f8eb89ddbe8d27eb739c66d1b179ff58d2b
Author: gregor herrmann <gregoa at debian.org>
Date: Tue Aug 11 16:15:27 2009 +0000
add philip's changes as quilt patches, remove old dpatch patches, hook quilt into debian/rules
---
debian/patches/00list | 4 --
debian/patches/02_libs.dpatch | 78 ----------------------
debian/patches/03_external_apps.dpatch | 22 ------
debian/patches/05_PrintStream_File.dpatch | 31 ---------
debian/patches/BibtexEntry.patch | 49 ++++++++++++++
debian/patches/BstLexer.patch | 30 +++++++++
...RTIES.dpatch => HONOR_DISPLAY_PROPERTIES.patch} | 12 +---
debian/patches/build_xml.patch | 77 +++++++++++++++++++++
.../{01_free_javac.dpatch => free_javac.patch} | 23 ++-----
debian/patches/preferences.patch | 14 ++++
debian/patches/series | 6 ++
debian/rules | 13 ++--
12 files changed, 189 insertions(+), 170 deletions(-)
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index a2d0cb3..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,4 +0,0 @@
-01_free_javac
-03_external_apps
-04_HONOR_DISPLAY_PROPERTIES
-05_PrintStream_File
diff --git a/debian/patches/02_libs.dpatch b/debian/patches/02_libs.dpatch
deleted file mode 100755
index 49c3926..0000000
--- a/debian/patches/02_libs.dpatch
+++ /dev/null
@@ -1,78 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_libs.dpatch by <gregor+debian at comodo.priv.at>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use debian packages of libraries instead of shipped ones.
-
- at 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
-@@ -87,6 +87,7 @@
-
- <!-- Set the properties for library directories -->
- <property name="library.directory" value="lib" />
-+ <property name="library.directory.debian" value="/usr/share/java" />
-
- <!-- <property name="nsis.executable" value="makensis.exe"/> -->
-
-@@ -111,15 +112,14 @@
- <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}/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}/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" />
-+ <pathelement location="${library.directory.debian}/pdfbox.jar" />
-+ <pathelement location="${library.directory.debian}/jempbox.jar" />
- </path>
-
- <target name="run" depends="build">
-@@ -356,15 +356,14 @@
- <!-- 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}/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}/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}" />
-+ <unjar src="${library.directory.debian}/pdfbox.jar" dest="${build.tmp}" />
-+ <unjar src="${library.directory.debian}/jempbox.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" />
-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:
diff --git a/debian/patches/03_external_apps.dpatch b/debian/patches/03_external_apps.dpatch
deleted file mode 100755
index cdab4a3..0000000
--- a/debian/patches/03_external_apps.dpatch
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_external_apps.dpatch by <gregor+debian at comodo.priv.at>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Change some external applications.
-
- at DPATCH@
-diff -urNad jabref~/src/java/net/sf/jabref/JabRefPreferences.java jabref/src/java/net/sf/jabref/JabRefPreferences.java
---- jabref~/src/java/net/sf/jabref/JabRefPreferences.java 2007-10-08 21:51:28.000000000 +0200
-+++ jabref/src/java/net/sf/jabref/JabRefPreferences.java 2007-10-09 18:32:25.000000000 +0200
-@@ -109,9 +109,9 @@
- defaults.put("winEdtPath", "C:\\Program Files\\WinEdt Team\\WinEdt\\WinEdt.exe");
- defaults.put("latexEditorPath", "C:\\Program Files\\LEd\\LEd.exe");
- } else {
-- defaults.put("pdfviewer", "evince");
-+ defaults.put("pdfviewer", "xpdf");
- defaults.put("psviewer", "gv");
-- defaults.put("htmlviewer", "mozilla");
-+ defaults.put("htmlviewer", "x-www-browser");
- defaults.put("lookAndFeel", "com.jgoodies.plaf.plastic.Plastic3DLookAndFeel");
- }
- defaults.put("useDefaultLookAndFeel", Boolean.TRUE);
diff --git a/debian/patches/05_PrintStream_File.dpatch b/debian/patches/05_PrintStream_File.dpatch
deleted file mode 100755
index 793a7f3..0000000
--- a/debian/patches/05_PrintStream_File.dpatch
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_PrintStream_File.dpatch by <gregor+debian at comodo.priv.at>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: "The constructor PrintStream(File) is undefined"
-## DP: Work around with a FileOutputStream.
-
- at DPATCH@
-diff -urNad jabref~/src/java/net/sf/jabref/sql/SQLutil.java jabref/src/java/net/sf/jabref/sql/SQLutil.java
---- jabref~/src/java/net/sf/jabref/sql/SQLutil.java 2008-03-16 17:01:04.000000000 +0100
-+++ jabref/src/java/net/sf/jabref/sql/SQLutil.java 2008-03-18 03:26:59.000000000 +0100
-@@ -11,6 +11,8 @@
-
- import java.io.File;
- import java.io.PrintStream;
-+import java.io.BufferedOutputStream;
-+import java.io.FileOutputStream;
- import java.sql.Connection;
- import java.sql.DriverManager;
- import java.sql.SQLException;
-@@ -261,8 +263,9 @@
- if (outfile.exists())
- outfile.delete();
-
-+ BufferedOutputStream writer = new BufferedOutputStream( new FileOutputStream( outfile ) );
- PrintStream fout = null;
-- fout = new PrintStream(outfile);
-+ fout = new PrintStream( writer );
-
- exportDatabase_worker(dbtype, database, metaData, keySet, fout);
-
diff --git a/debian/patches/BibtexEntry.patch b/debian/patches/BibtexEntry.patch
new file mode 100644
index 0000000..16d9ff5
--- /dev/null
+++ b/debian/patches/BibtexEntry.patch
@@ -0,0 +1,49 @@
+--- a/src/java/net/sf/jabref/gui/ImportInspectionDialog.java
++++ b/src/java/net/sf/jabref/gui/ImportInspectionDialog.java
+@@ -1319,7 +1319,7 @@
+ @SuppressWarnings("unchecked")
+ protected void setupComparatorChooser() {
+ // First column:
+- java.util.List<Comparator<BibtexEntry>> comparators = comparatorChooser
++ java.util.List<Comparator> comparators = comparatorChooser
+ .getComparatorsForColumn(0);
+ comparators.clear();
+
+@@ -1477,4 +1477,4 @@
+ public void toFront() {
+ super.toFront();
+ }
+-}
+\ No newline at end of file
++}
+--- a/src/java/net/sf/jabref/gui/MainTable.java
++++ b/src/java/net/sf/jabref/gui/MainTable.java
+@@ -319,7 +319,7 @@
+ @SuppressWarnings("unchecked")
+ private void setupComparatorChooser() {
+ // First column:
+- List<Comparator<BibtexEntry>> comparators = comparatorChooser.getComparatorsForColumn(0);
++ List<Comparator> comparators = comparatorChooser.getComparatorsForColumn(0);
+ comparators.clear();
+ comparators.add(new FirstColumnComparator(panel.database()));
+
+@@ -618,7 +618,7 @@
+ */
+ @SuppressWarnings("unchecked")
+ public Comparator<BibtexEntry> getComparatorForColumn(int index) {
+- List<Comparator<BibtexEntry>> l = comparatorChooser.getComparatorsForColumn(index);
++ List<Comparator> l = comparatorChooser.getComparatorsForColumn(index);
+ return l.size() == 0 ? null : l.get(0);
+ }
+
+--- a/src/java/net/sf/jabref/gui/SearchResultsDialog.java
++++ b/src/java/net/sf/jabref/gui/SearchResultsDialog.java
+@@ -166,7 +166,7 @@
+ @SuppressWarnings("unchecked")
+ protected void setupComparatorChooser(TableComparatorChooser<BibtexEntry> comparatorChooser) {
+ // First column:
+- java.util.List<Comparator<BibtexEntry>> comparators = comparatorChooser
++ java.util.List<Comparator> comparators = comparatorChooser
+ .getComparatorsForColumn(0);
+ comparators.clear();
+
diff --git a/debian/patches/BstLexer.patch b/debian/patches/BstLexer.patch
new file mode 100644
index 0000000..4e04812
--- /dev/null
+++ b/debian/patches/BstLexer.patch
@@ -0,0 +1,30 @@
+--- a/src/java/net/sf/jabref/bst/BstLexer.java
++++ b/src/java/net/sf/jabref/bst/BstLexer.java
+@@ -9,8 +9,9 @@
+ import org.antlr.runtime.NoViableAltException;
+ import org.antlr.runtime.RecognitionException;
+ import org.antlr.runtime.Token;
++import org.antlr.codegen.*;
+
+-public class BstLexer extends Lexer {
++public class BstLexer extends ActionTranslatorLexer {
+ public static final int LETTER=21;
+ public static final int T29=29;
+ public static final int T33=33;
+@@ -43,6 +44,9 @@
+ public static final int IDLIST=4;
+ public static final int NUMERAL=22;
+ public static final int READ=13;
++
++ int ruleNestingLevel = 0;
++
+ public BstLexer() {
+
+ }
+@@ -1661,4 +1665,4 @@
+
+
+
+-}
+\ No newline at end of file
++}
diff --git a/debian/patches/04_HONOR_DISPLAY_PROPERTIES.dpatch b/debian/patches/HONOR_DISPLAY_PROPERTIES.patch
old mode 100755
new mode 100644
similarity index 59%
rename from debian/patches/04_HONOR_DISPLAY_PROPERTIES.dpatch
rename to debian/patches/HONOR_DISPLAY_PROPERTIES.patch
index 546b558..eb82c0e
--- a/debian/patches/04_HONOR_DISPLAY_PROPERTIES.dpatch
+++ b/debian/patches/HONOR_DISPLAY_PROPERTIES.patch
@@ -1,13 +1,5 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_HONOR_DISPLAY_PROPERTIES.dpatch by <gregor+debian at comodo.priv.at>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: JEditorPane.HONOR_DISPLAY_PROPERTIES not understood by java-gcj-compat-dev ...
-
- at DPATCH@
-diff -urNad jabref~/src/java/net/sf/jabref/JabRefMain.java jabref/src/java/net/sf/jabref/JabRefMain.java
---- jabref~/src/java/net/sf/jabref/JabRefMain.java 2007-10-08 21:51:47.000000000 +0200
-+++ jabref/src/java/net/sf/jabref/JabRefMain.java 2007-10-09 18:55:12.000000000 +0200
+--- a/src/java/net/sf/jabref/JabRefMain.java
++++ b/src/java/net/sf/jabref/JabRefMain.java
@@ -109,7 +109,6 @@
"We are sorry for the trouble and thanks for reporting problems with JabRef!</html>");
pane.setEditable(false);
diff --git a/debian/patches/build_xml.patch b/debian/patches/build_xml.patch
new file mode 100644
index 0000000..4ef35b4
--- /dev/null
+++ b/debian/patches/build_xml.patch
@@ -0,0 +1,77 @@
+--- a/build.xml
++++ b/build.xml
+@@ -85,7 +85,7 @@
+ <property name="help.dir" value="${src.dir}/help" />
+ <property name="extensions.dir" value="${src.dir}/extensions" />
+ <property name="layout.dir" value="${src.dir}/resource/layout" />
+- <property name="lib.dir" value="lib" />
++ <property name="lib.dir" value="/usr/share/java" />
+ <property name="tests.dir" value="${src.dir}/tests" />
+
+ <property name="nsis.executable" value="makensis.exe"/>
+@@ -107,22 +107,22 @@
+
+ <fileset id="jarsFileset" dir="${lib.dir}">
+ <include name="antlr.jar" />
+- <include name="antlr-3.0b5.jar" />
+- <include name="looks-2.2.0.jar" />
+- <include name="forms-1.1.0.jar" />
++ <include name="antlr3.jar" />
++ <include name="looks.jar" />
++ <include name="forms.jar" />
+ <include name="spin.jar" />
+- <include name="glazedlists-1.7.0_java15.jar" />
++ <include name="glazedlists.jar" />
+ <include name="microba.jar" />
+- <include name="PDFBox-0.7.3-dev-reduced.jar" />
+- <include name="JempBox-0.2.0.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 -->
+- <include name="plugin/JPFCodeGenerator-rt.jar" />
+- <include name="plugin/jpf.jar" />
+- <include name="plugin/jpf-boot.jar" />
+- <include name="plugin/commons-logging.jar" />
++ <include name="JPFCodeGenerator-rt.jar" />
++ <include name="jpf.jar" />
++ <include name="jpf-boot.jar" />
++ <include name="commons-logging.jar" />
+ </fileset>
+
+ <!-- Build classpath -->
+@@ -134,10 +134,10 @@
+
+ <!-- Classpath for running the code generator -->
+ <path id="codegenerator">
+- <pathelement location="${lib.dir}/plugin/JPFCodeGenerator.jar" />
+- <pathelement location="${lib.dir}/plugin/jpf.jar" />
+- <pathelement location="${lib.dir}/plugin/jpf-boot.jar" />
+- <pathelement location="${lib.dir}/plugin/velocity-dep-1.5.jar" />
++ <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" />
+ </path>
+
+ <!-- Classpath for tests -->
+@@ -217,7 +217,7 @@
+ </target>
+
+ <!-- Jars up project -->
+- <target name="jars" depends="build, unjarlib">
++ <target name="jars" depends="build">
+ <mkdir dir="${build.lib}" />
+ <mkdir dir="${build.tmp}" />
+ <jar destfile="${build.lib}/${build.jar}">
+@@ -612,6 +612,6 @@
+ </jalopy>
+ </target>
+
+- <taskdef name="jarbundler" classpath="${lib.dir}/jarbundler-1.4.jar" classname="com.loomcom.ant.tasks.jarbundler.JarBundler" />
++<!-- <taskdef name="jarbundler" classpath="${lib.dir}/jarbundler-1.4.jar" classname="com.loomcom.ant.tasks.jarbundler.JarBundler" /> -->
+
+ </project>
diff --git a/debian/patches/01_free_javac.dpatch b/debian/patches/free_javac.patch
old mode 100755
new mode 100644
similarity index 70%
rename from debian/patches/01_free_javac.dpatch
rename to debian/patches/free_javac.patch
index 6097c38..47a9c51
--- a/debian/patches/01_free_javac.dpatch
+++ b/debian/patches/free_javac.patch
@@ -1,23 +1,14 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_free_javac.dpatch by <gregor+debian at comodo.priv.at>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Changes to be able to compile JabRef with free java compilers.
-## Thanks to Matthias Klose, cf. #383006
-
- at DPATCH@
-diff -urNad jabref~/src/java/net/sf/jabref/JabRef.java jabref/src/java/net/sf/jabref/JabRef.java
---- jabref~/src/java/net/sf/jabref/JabRef.java 2008-03-16 16:09:28.000000000 +0100
-+++ jabref/src/java/net/sf/jabref/JabRef.java 2008-03-16 16:11:42.000000000 +0100
-@@ -70,7 +70,6 @@
+--- a/src/java/net/sf/jabref/JabRef.java
++++ b/src/java/net/sf/jabref/JabRef.java
+@@ -29,7 +29,6 @@
import com.jgoodies.looks.FontSet;
import com.jgoodies.looks.FontSets;
import com.jgoodies.looks.plastic.Plastic3DLookAndFeel;
-import com.jgoodies.looks.windows.WindowsLookAndFeel;
-
- /**
- * JabRef Main Class - The application gets started here.
-@@ -609,27 +608,6 @@
+ import gnu.dtools.ritopt.BooleanOption;
+ import gnu.dtools.ritopt.Options;
+ import gnu.dtools.ritopt.StringOption;
+@@ -610,27 +609,6 @@
//Plastic3DLookAndFeel plLnf = (Plastic3DLookAndFeel) lnf;
}
diff --git a/debian/patches/preferences.patch b/debian/patches/preferences.patch
new file mode 100644
index 0000000..8f09981
--- /dev/null
+++ b/debian/patches/preferences.patch
@@ -0,0 +1,14 @@
+--- a/src/java/net/sf/jabref/JabRefPreferences.java
++++ b/src/java/net/sf/jabref/JabRefPreferences.java
+@@ -143,9 +143,9 @@
+ defaults.put("winEdtPath", "C:\\Program Files\\WinEdt Team\\WinEdt\\WinEdt.exe");
+ defaults.put("latexEditorPath", "C:\\Program Files\\LEd\\LEd.exe");
+ } else {
+- defaults.put("pdfviewer", "evince");
++ defaults.put("pdfviewer", "xpdf");
+ defaults.put("psviewer", "gv");
+- defaults.put("htmlviewer", "firefox");
++ defaults.put("htmlviewer", "x-www-browser");
+ defaults.put("lookAndFeel", "com.jgoodies.plaf.plastic.Plastic3DLookAndFeel");
+ }
+ defaults.put("useDefaultLookAndFeel", Boolean.TRUE);
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..bcb47d5
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,6 @@
+build_xml.patch
+free_javac.patch
+HONOR_DISPLAY_PROPERTIES.patch
+preferences.patch
+BstLexer.patch
+BibtexEntry.patch
diff --git a/debian/rules b/debian/rules
index 8fbbec9..c7de7e3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,15 +9,10 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-include /usr/share/dpatch/dpatch.make
-
-configure: configure-stamp
-configure-stamp: patch
- dh_testdir
- touch configure-stamp
+include /usr/share/quilt/quilt.make
build: build-stamp
-build-stamp: configure-stamp
+build-stamp: $(QUILT_STAMPFN)
dh_testdir
JAVA_HOME=/usr/lib/jvm/default-java ant jars
convert -geometry 32x32 src/images/JabRef-icon-48.png build/jabref32.xpm
@@ -29,7 +24,7 @@ clean: unpatch
dh_testroot
rm -f *-stamp
ant clean
- dh_clean
+ dh_clean
install: install-stamp
install-stamp: build-stamp
@@ -39,7 +34,7 @@ install-stamp: build-stamp
dh_installdirs
install -m 755 debian/jabref-wrapper $(CURDIR)/debian/jabref/usr/bin/jabref
touch install-stamp
-
+
# Build architecture-independent files here.
binary-indep: build install
dh_testdir
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jabref.git
More information about the pkg-java-commits
mailing list