Refresh patches.

diff --git a/debian/changelog b/debian/changelog
index 654ced9..566b0bb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ jabref (2.7~beta1+ds-1) UNRELEASED; urgency=low
   * New upstream release.
   * debian/control: uniform spelling of BibTex; thanks to Erik Esterer for the
     bug report and patch (closes: #596946).
+  * Refresh patches.
 
  -- gregor herrmann <gregoa@debian.org>  Tue, 18 Jan 2011 17:40:42 +0100
 

diff --git a/debian/patches/02_libs.patch b/debian/patches/02_libs.patch
index 3cb5ffd..063c85e 100644 (file)
--- a/debian/patches/02_libs.patch
+++ b/debian/patches/02_libs.patch
@@ -71,11 +71,10 @@ 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 +612,6 @@ Number (CCN)           maintenance
+@@ -623,6 +623,4 @@ Number (CCN)           maintenance
                </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" /> -->
- 
+-      <taskdef name="jarbundler" classpath="${lib.dir}/jarbundler-2.1.0.jar" classname="net.sourceforge.jarbundler.JarBundler" />
+-
  </project>

diff --git a/debian/patches/05_antlr32.patch b/debian/patches/05_antlr32.patch
index c9bb3bb..9e0aff7 100644 (file)
--- a/debian/patches/05_antlr32.patch
+++ b/debian/patches/05_antlr32.patch
@@ -1085,14 +1085,14 @@ Last-Update: 2010-08-03
 -                int n_1 = list_identifier == null ? 0 : list_identifier.size();
 -                 
 -
--
--                for (int i_1=0; i_1<n_1; i_1++) {
--                    adaptor.addChild(root_1, list_identifier.get(i_1));
 +                while ( stream_identifier.hasNext() ) {
 +                    adaptor.addChild(root_1, stream_identifier.nextTree());
  
-                 }
+-                for (int i_1=0; i_1<n_1; i_1++) {
+-                    adaptor.addChild(root_1, list_identifier.get(i_1));
+-
 -                }
+                 }
 +                stream_identifier.reset();
  
                  adaptor.addChild(root_0, root_1);

diff --git a/debian/patches/06_BibtexEntry.patch b/debian/patches/06_BibtexEntry.patch
index 0e0f46f..f7f46fd 100644 (file)
--- a/debian/patches/06_BibtexEntry.patch
+++ b/debian/patches/06_BibtexEntry.patch
@@ -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 @@ public class MainTable extends JTable {
+@@ -323,7 +323,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 @@ public class MainTable extends JTable {
+@@ -624,7 +624,7 @@ public class MainTable extends JTable {
       */
      @SuppressWarnings("unchecked")
        public Comparator<BibtexEntry> getComparatorForColumn(int index) {