[jabref] 269/459: Remove patch 03_external_apps.patch, refresh patches 02_libs.patch and 06_BibtexEntry.patch.
gregor herrmann
gregoa at debian.org
Thu Sep 15 20:40:39 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 b8933e2d1560574fa6fb83c7b613bb1811e50bc7
Author: gregor herrmann <gregoa at debian.org>
Date: Thu Apr 15 17:49:29 2010 +0000
Remove patch 03_external_apps.patch, refresh patches 02_libs.patch and
06_BibtexEntry.patch.
---
debian/changelog | 2 ++
debian/patches/01_free_javac.patch | 4 ++--
debian/patches/02_libs.patch | 4 ++--
debian/patches/03_external_apps.patch | 17 -----------------
debian/patches/05_antlr.patch | 6 +++---
debian/patches/06_BibtexEntry.patch | 10 +++++-----
debian/patches/series | 1 -
7 files changed, 14 insertions(+), 30 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3b8e260..65ff730 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ jabref (2.6+ds-1) UNRELEASED; urgency=low
* New upstream release.
* Adapt name of jar file in debian/jabref.{install,links}.
+ * Remove patch 03_external_apps.patch, refresh patches 02_libs.patch and
+ 06_BibtexEntry.patch.
-- gregor herrmann <gregoa at debian.org> Thu, 15 Apr 2010 19:38:39 +0200
diff --git a/debian/patches/01_free_javac.patch b/debian/patches/01_free_javac.patch
index c88407e..ec6473c 100644
--- a/debian/patches/01_free_javac.patch
+++ b/debian/patches/01_free_javac.patch
@@ -3,7 +3,7 @@ Author: Philip Rinn <rinni at gmx.net>
Description: Changes to be able to compile JabRef with free java compilers.
--- a/src/java/net/sf/jabref/JabRef.java
+++ b/src/java/net/sf/jabref/JabRef.java
-@@ -29,7 +29,6 @@
+@@ -29,7 +29,6 @@ import com.jgoodies.looks.FontPolicy;
import com.jgoodies.looks.FontSet;
import com.jgoodies.looks.FontSets;
import com.jgoodies.looks.plastic.Plastic3DLookAndFeel;
@@ -11,7 +11,7 @@ Description: Changes to be able to compile JabRef with free java compilers.
import gnu.dtools.ritopt.BooleanOption;
import gnu.dtools.ritopt.Options;
import gnu.dtools.ritopt.StringOption;
-@@ -606,27 +605,6 @@
+@@ -606,27 +605,6 @@ public class JabRef {
//Plastic3DLookAndFeel plLnf = (Plastic3DLookAndFeel) lnf;
}
diff --git a/debian/patches/02_libs.patch b/debian/patches/02_libs.patch
index f07376d..071cabd 100644
--- a/debian/patches/02_libs.patch
+++ b/debian/patches/02_libs.patch
@@ -17,7 +17,7 @@ Description: Use debian libraries and disable unnecesary unjarlib target,
<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="looks-2.3.1.jar" />
- <include name="forms-1.1.0.jar" />
+ <include name="antlr3.jar" />
+ <include name="looks.jar" />
@@ -70,7 +70,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 +611,6 @@
+@@ -612,6 +611,6 @@ Number (CCN) maintenance
</jalopy>
</target>
diff --git a/debian/patches/03_external_apps.patch b/debian/patches/03_external_apps.patch
deleted file mode 100644
index 50aff91..0000000
--- a/debian/patches/03_external_apps.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: gregor herrmann <gregoa at debian.org>
-Author: Philip Rinn <rinni at gmx.net>
-Description: Change some external applications.
---- a/src/java/net/sf/jabref/JabRefPreferences.java
-+++ b/src/java/net/sf/jabref/JabRefPreferences.java
-@@ -147,9 +147,9 @@
- defaults.put("fontFamily", "Arial");
-
- } 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("fontFamily", "SansSerif");
-
diff --git a/debian/patches/05_antlr.patch b/debian/patches/05_antlr.patch
index 2d77f3a..02f3a21 100644
--- a/debian/patches/05_antlr.patch
+++ b/debian/patches/05_antlr.patch
@@ -3,7 +3,7 @@ Author: Philip Rinn <rinni at gmx.net>
Description: Use antlr3 stable release API, missing ruleNestingLevel member on the antlr3 beta API
--- a/src/java/net/sf/jabref/bst/BstLexer.java
+++ b/src/java/net/sf/jabref/bst/BstLexer.java
-@@ -9,8 +9,9 @@
+@@ -9,8 +9,9 @@ import org.antlr.runtime.MismatchedSetEx
import org.antlr.runtime.NoViableAltException;
import org.antlr.runtime.RecognitionException;
import org.antlr.runtime.Token;
@@ -14,7 +14,7 @@ Description: Use antlr3 stable release API, missing ruleNestingLevel member on t
public static final int LETTER=21;
public static final int T29=29;
public static final int T33=33;
-@@ -43,6 +44,9 @@
+@@ -43,6 +44,9 @@ public class BstLexer extends Lexer {
public static final int IDLIST=4;
public static final int NUMERAL=22;
public static final int READ=13;
@@ -24,7 +24,7 @@ Description: Use antlr3 stable release API, missing ruleNestingLevel member on t
public BstLexer() {
}
-@@ -1661,4 +1665,4 @@
+@@ -1661,4 +1665,4 @@ public class BstLexer extends Lexer {
diff --git a/debian/patches/06_BibtexEntry.patch b/debian/patches/06_BibtexEntry.patch
index 440cd0e..0e0f46f 100644
--- a/debian/patches/06_BibtexEntry.patch
+++ b/debian/patches/06_BibtexEntry.patch
@@ -2,7 +2,7 @@ Author: Philip Rinn <rinni at gmx.net>
Description: Fixing incompatible types
--- a/src/java/net/sf/jabref/gui/ImportInspectionDialog.java
+++ b/src/java/net/sf/jabref/gui/ImportInspectionDialog.java
-@@ -1319,7 +1319,7 @@
+@@ -1319,7 +1319,7 @@ public class ImportInspectionDialog exte
@SuppressWarnings("unchecked")
protected void setupComparatorChooser() {
// First column:
@@ -11,7 +11,7 @@ Description: Fixing incompatible types
.getComparatorsForColumn(0);
comparators.clear();
-@@ -1478,4 +1478,4 @@
+@@ -1478,4 +1478,4 @@ public class ImportInspectionDialog exte
public void toFront() {
super.toFront();
}
@@ -20,7 +20,7 @@ Description: Fixing incompatible types
+}
--- a/src/java/net/sf/jabref/gui/MainTable.java
+++ b/src/java/net/sf/jabref/gui/MainTable.java
-@@ -319,7 +319,7 @@
+@@ -319,7 +319,7 @@ public class MainTable extends JTable {
@SuppressWarnings("unchecked")
private void setupComparatorChooser() {
// First column:
@@ -29,7 +29,7 @@ Description: Fixing incompatible types
comparators.clear();
comparators.add(new FirstColumnComparator(panel.database()));
-@@ -618,7 +618,7 @@
+@@ -618,7 +618,7 @@ public class MainTable extends JTable {
*/
@SuppressWarnings("unchecked")
public Comparator<BibtexEntry> getComparatorForColumn(int index) {
@@ -40,7 +40,7 @@ Description: Fixing incompatible types
--- a/src/java/net/sf/jabref/gui/SearchResultsDialog.java
+++ b/src/java/net/sf/jabref/gui/SearchResultsDialog.java
-@@ -174,7 +174,7 @@
+@@ -176,7 +176,7 @@ public class SearchResultsDialog {
@SuppressWarnings("unchecked")
protected void setupComparatorChooser(TableComparatorChooser<BibtexEntry> comparatorChooser) {
// First column:
diff --git a/debian/patches/series b/debian/patches/series
index 69a2066..3310824 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
01_free_javac.patch
02_libs.patch
-03_external_apps.patch
05_antlr.patch
06_BibtexEntry.patch
--
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