[jabref] 411/459: Drop jcombobox-parameter.patch, merged upstream.
gregor herrmann
gregoa at debian.org
Thu Sep 15 20:41:30 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 eccb95ee716635c235cbb722905e43d8243c429a
Author: gregor herrmann <gregoa at debian.org>
Date: Fri Jun 21 18:31:56 2013 +0200
Drop jcombobox-parameter.patch, merged upstream.
---
debian/patches/jcombobox-parameter.patch | 34 --------------------------------
debian/patches/series | 1 -
2 files changed, 35 deletions(-)
diff --git a/debian/patches/jcombobox-parameter.patch b/debian/patches/jcombobox-parameter.patch
deleted file mode 100644
index 09f6d8f..0000000
--- a/debian/patches/jcombobox-parameter.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: workaround error:
- [javac] /tmp/buildd/jabref-2.10~beta1+ds/src/java/net/sf/jabref/FileTab.java:40: type javax.swing.JComboBox does not take parameters
- [javac] private JComboBox<String> valueDelimiter;
- [javac] ^
- .
- [javac] /tmp/buildd/jabref-2.10~beta1+ds/src/java/net/sf/jabref/FileTab.java:70: type javax.swing.JComboBox does not take parameters
- [javac] valueDelimiter = new JComboBox<String>(new String[]{
- [javac] ^
-Origin: vendor
-Forwarded: via private mail
-Author: gregor herrmann <gregoa at debian.org>
-Last-Update: 2013-03-30
-Applied-Upstream: git, beta_2.10 branch, 2711226bada0120f9a98d78834e7f46f3e9a3390
-
---- a/src/java/net/sf/jabref/FileTab.java
-+++ b/src/java/net/sf/jabref/FileTab.java
-@@ -37,7 +37,7 @@
-
- private JCheckBox backup, openLast, autoDoubleBraces, autoSave,
- promptBeforeUsingAutoSave, includeEmptyFields, camelCase, sameColumn;
-- private JComboBox<String> valueDelimiter;
-+ private JComboBox valueDelimiter;
- private JRadioButton
- saveOriginalOrder, saveAuthorOrder, saveTableOrder, saveTitleOrder,
- exportOriginalOrder, exportAuthorOrder, exportTableOrder, exportTitleOrder,
-@@ -67,7 +67,7 @@
- autoSave = new JCheckBox(Globals.lang("Autosave"));
- promptBeforeUsingAutoSave = new JCheckBox(Globals.lang("Prompt before recovering a database from an autosave file"));
- autoSaveInterval = new JSpinner(new SpinnerNumberModel(1, 1, 60, 1));
-- valueDelimiter = new JComboBox<String>(new String[]{
-+ valueDelimiter = new JComboBox(new String[]{
- Globals.lang("Quotes") + ": \", \"",
- Globals.lang("Curly Brackets") + ": {, }" });
- includeEmptyFields = new JCheckBox(Globals.lang("Include empty fields"));
diff --git a/debian/patches/series b/debian/patches/series
index f9ab484..9ed273d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
debian_libs.patch
mrDlib_jayatana.patch
generated_JabRefPlugin.java.patch
-jcombobox-parameter.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