This is an automated email from the git hooks/post-receive script. gregoa pushed a commit to branch master in repository jabref.
commit b5548a3ca2ae22a86a4fe561ab6628bd524377bd Author: gregor herrmann <[email protected]> Date: Mon Oct 29 19:06:45 2012 +0100 Remove patch 06_BibtexEntry.patch, applied upstream. --- debian/patches/06_BibtexEntry.patch | 51 ------------------------------------- debian/patches/series | 1 - 2 files changed, 52 deletions(-) diff --git a/debian/patches/06_BibtexEntry.patch b/debian/patches/06_BibtexEntry.patch deleted file mode 100644 index f7f46fd..0000000 --- a/debian/patches/06_BibtexEntry.patch +++ /dev/null @@ -1,51 +0,0 @@ -Author: Philip Rinn <[email protected]> -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 @@ public class ImportInspectionDialog exte - @SuppressWarnings("unchecked") - protected void setupComparatorChooser() { - // First column: -- java.util.List<Comparator<BibtexEntry>> comparators = comparatorChooser -+ java.util.List<Comparator> comparators = comparatorChooser - .getComparatorsForColumn(0); - comparators.clear(); - -@@ -1478,4 +1478,4 @@ public class ImportInspectionDialog exte - 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 -@@ -323,7 +323,7 @@ public class MainTable extends JTable { - @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())); - -@@ -624,7 +624,7 @@ public class MainTable extends JTable { - */ - @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 -@@ -176,7 +176,7 @@ public class SearchResultsDialog { - @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/series b/debian/patches/series index db9175d..179445a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,5 @@ 02_libs.patch 05_antlr32.patch -06_BibtexEntry.patch 07_pdfbox1.5.patch 08_doubleextensions.patch 09_looks2.5.patch -- 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
