* Switch patch system from dpatch to quilt.
authorgregor herrmann <gregoa@debian.org>
Wed, 2 Jul 2008 17:27:02 +0000 (17:27 -0000)
committergregor herrmann <gregoa@debian.org>
Wed, 2 Jul 2008 17:27:02 +0000 (17:27 -0000)
* debian/rules: remove configure{,-stamp} targets.

15 files changed:
debian/changelog
debian/control
debian/patches/00list [deleted file]
debian/patches/01_free_javac.dpatch [deleted file]
debian/patches/01_free_javac.patch [new file with mode: 0644]
debian/patches/02_libs.dpatch [deleted file]
debian/patches/02_libs.patch [new file with mode: 0644]
debian/patches/03_external_apps.dpatch [deleted file]
debian/patches/03_external_apps.patch [new file with mode: 0644]
debian/patches/04_HONOR_DISPLAY_PROPERTIES.dpatch [deleted file]
debian/patches/04_HONOR_DISPLAY_PROPERTIES.patch [new file with mode: 0644]
debian/patches/05_antlr.dpatch [deleted file]
debian/patches/05_antlr.patch [new file with mode: 0644]
debian/patches/series [new file with mode: 0644]
debian/rules

index 3500820..0acf986 100644 (file)
@@ -5,6 +5,8 @@ jabref (2.3.1-4) UNRELEASED; urgency=low
     LP: #225450 and LP: #203636).
   * debian/watch: use sourceforge URL directly instead of the redirector
     at qa.debian.org.
+  * Switch patch system from dpatch to quilt.
+  * debian/rules: remove configure{,-stamp} targets.
 
  -- gregor herrmann <gregoa@debian.org>  Fri, 02 May 2008 01:24:18 +0200
 
index 4e408d8..c3fddb7 100644 (file)
@@ -3,7 +3,7 @@ Section: contrib/tex
 Priority: optional
 Maintainer: gregor herrmann <gregoa@debian.org>
 Uploaders: tony mancill <tmancill@debian.org>
-Build-Depends: debhelper (>= 6), dpatch, ant
+Build-Depends: debhelper (>= 6), quilt (>= 0.40), ant
 Build-Depends-Indep: default-jdk-builddep, imagemagick, liblog4j1.2-java,
  antlr, antlr3, libjgoodies-looks-java, libjgoodies-forms-java, libspin-java,
  libglazedlists-java, libmicroba-java, libpdfbox-java, libjempbox-java (>= 0.2.0)
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644 (file)
index efbdd0b..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-01_free_javac
-02_libs
-03_external_apps
-04_HONOR_DISPLAY_PROPERTIES
-05_antlr
diff --git a/debian/patches/01_free_javac.dpatch b/debian/patches/01_free_javac.dpatch
deleted file mode 100755 (executable)
index e24e785..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_free_javac.dpatch by  <gregor+debian@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
-
-@DPATCH@
-diff -urNad jabref-2.2~b2~/src/java/net/sf/jabref/JabRef.java jabref-2.2~b2/src/java/net/sf/jabref/JabRef.java
---- jabref-2.2~b2~/src/java/net/sf/jabref/JabRef.java  2006-11-26 21:10:32.000000000 +0100
-+++ jabref-2.2~b2/src/java/net/sf/jabref/JabRef.java   2006-11-26 21:17:14.000000000 +0100
-@@ -46,7 +46,6 @@
- import com.jgoodies.looks.plastic.Plastic3DLookAndFeel;
- import com.jgoodies.looks.plastic.PlasticLookAndFeel;
--import com.jgoodies.looks.windows.WindowsLookAndFeel;
- import com.jgoodies.looks.FontSet;
- import com.jgoodies.looks.FontSets;
- import com.jgoodies.looks.FontPolicy;
-@@ -578,27 +577,6 @@
-                     //Plastic3DLookAndFeel plLnf = (Plastic3DLookAndFeel) lnf;
-                 }
--                else if ((lnf != null) && (lnf instanceof WindowsLookAndFeel)) {
--
--                    // Set a "model" icon size, so menu items are evenly spaced even though
--                    // only some items have icons. We load an arbitrary icon and look at
--                    // its size to determine what size to use:
--                    int defaultIconSize = GUIGlobals.getImage("open").getIconWidth();
--                    com.jgoodies.looks.Options.setDefaultIconSize
--                        (new Dimension(defaultIconSize, defaultIconSize));
--
--                    if (overrideDefaultFonts) {
--                        FontSet fontSet = FontSets.createDefaultFontSet(
--                            new Font("Tahoma", Font.PLAIN, fontSizes),    // control font
--                            new Font("Tahoma", Font.PLAIN, fontSizes),    // menu font
--                            new Font("Tahoma", Font.BOLD, fontSizes)     // title font
--                            );
--                        FontPolicy fixedPolicy = FontPolicies.createFixedPolicy(fontSet);
--                        WindowsLookAndFeel.setFontPolicy(fixedPolicy);
--                    }
--
--                    //WindowsLookAndFeel plLnf = (WindowsLookAndFeel) lnf;
--                }
-                 if (lnf != null) {
-                     try {
-diff -urNad jabref-2.2~b2~/src/java/net/sf/jabref/export/VerifyingWriter.java jabref-2.2~b2/src/java/net/sf/jabref/export/VerifyingWriter.java
---- jabref-2.2~b2~/src/java/net/sf/jabref/export/VerifyingWriter.java  2006-11-26 21:10:32.000000000 +0100
-+++ jabref-2.2~b2/src/java/net/sf/jabref/export/VerifyingWriter.java   2006-11-26 21:14:29.000000000 +0100
-@@ -1,7 +1,5 @@
- package net.sf.jabref.export;
--import sun.misc.CharacterEncoder;
--
- import java.io.*;
- import java.nio.charset.Charset;
- import java.nio.charset.CharsetEncoder;
diff --git a/debian/patches/01_free_javac.patch b/debian/patches/01_free_javac.patch
new file mode 100644 (file)
index 0000000..1c36af4
--- /dev/null
@@ -0,0 +1,50 @@
+Author: <gregor+debian@comodo.priv.at>
+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
+@@ -46,7 +46,6 @@
+ import com.jgoodies.looks.plastic.Plastic3DLookAndFeel;
+ import com.jgoodies.looks.plastic.PlasticLookAndFeel;
+-import com.jgoodies.looks.windows.WindowsLookAndFeel;
+ import com.jgoodies.looks.FontSet;
+ import com.jgoodies.looks.FontSets;
+ import com.jgoodies.looks.FontPolicy;
+@@ -598,27 +597,6 @@
+                     //Plastic3DLookAndFeel plLnf = (Plastic3DLookAndFeel) lnf;
+                 }
+-                else if ((lnf != null) && (lnf instanceof WindowsLookAndFeel)) {
+-
+-                    // Set a "model" icon size, so menu items are evenly spaced even though
+-                    // only some items have icons. We load an arbitrary icon and look at
+-                    // its size to determine what size to use:
+-                    int defaultIconSize = GUIGlobals.getImage("open").getIconWidth();
+-                    com.jgoodies.looks.Options.setDefaultIconSize
+-                        (new Dimension(defaultIconSize, defaultIconSize));
+-
+-                    if (overrideDefaultFonts) {
+-                        FontSet fontSet = FontSets.createDefaultFontSet(
+-                            new Font("Tahoma", Font.PLAIN, fontSizes),    // control font
+-                            new Font("Tahoma", Font.PLAIN, fontSizes),    // menu font
+-                            new Font("Tahoma", Font.BOLD, fontSizes)     // title font
+-                            );
+-                        FontPolicy fixedPolicy = FontPolicies.createFixedPolicy(fontSet);
+-                        WindowsLookAndFeel.setFontPolicy(fixedPolicy);
+-                    }
+-
+-                    //WindowsLookAndFeel plLnf = (WindowsLookAndFeel) lnf;
+-                }
+                 if (lnf != null) {
+                     try {
+--- a/src/java/net/sf/jabref/export/VerifyingWriter.java
++++ b/src/java/net/sf/jabref/export/VerifyingWriter.java
+@@ -1,7 +1,5 @@
+ package net.sf.jabref.export;
+-import sun.misc.CharacterEncoder;
+-
+ import java.io.*;
+ import java.nio.charset.Charset;
+ import java.nio.charset.CharsetEncoder;
diff --git a/debian/patches/02_libs.dpatch b/debian/patches/02_libs.dpatch
deleted file mode 100755 (executable)
index b36ceca..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_libs.dpatch by  <gerardo@sophie.gerardo.com.ve>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use debian libraries and disable unnecesary unjarlib target,
-
-@DPATCH@
-diff -urNad jabref-2.3.1~/build.xml jabref-2.3.1/build.xml
---- jabref-2.3.1~/build.xml    2008-04-19 04:13:24.000000000 -0430
-+++ jabref-2.3.1/build.xml     2008-04-19 04:16:57.000000000 -0430
-@@ -86,7 +86,7 @@
-       <property name="layout.dir" value="${src.dir}/resource/layout" />
-       <!-- Set the properties for library directories -->
--      <property name="library.directory" value="lib" />
-+      <property name="library.directory" value="/usr/share/java" />
- <!--    <property name="nsis.executable" value="makensis.exe"/> -->
-       <property name="nsis.executable.linux" value="makensis"/>
-@@ -105,22 +105,21 @@
-               </and>
-       </condition>
--      <taskdef name="jarbundler" classpath="${library.directory}/jarbundler-1.4.jar" classname="com.loomcom.ant.tasks.jarbundler.JarBundler" />
--
--
-+<!--  <taskdef name="jarbundler" classpath="${library.directory}/jarbundler-1.4.jar" classname="com.loomcom.ant.tasks.jarbundler.JarBundler" />
-+-->
-       <!-- Build classpath -->
-       <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.1.0.jar" />
-+              <pathelement location="${library.directory}/antlr3.jar" />
-+              <pathelement location="${library.directory}/looks.jar" />
-+              <pathelement location="${library.directory}/forms.jar" />
-               <pathelement location="${library.directory}/spin.jar" />
--              <pathelement location="${library.directory}/glazedlists-1.7.0_java15.jar" />
-+              <pathelement location="${library.directory}/glazedlists.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}/pdfbox.jar" />
-+              <pathelement location="${library.directory}/jempbox.jar" />
-       </path>
-       <target name="run" depends="build">
-@@ -194,7 +193,8 @@
-       </target>
-       <!-- Jars up project -->
--      <target name="jars" depends="build, unjarlib">
-+      <!-- The unjarlib target is not needed, we'll use the jars in the classpath -->
-+      <target name="jars" depends="build">
-               <mkdir dir="${build.lib}" />
-               <mkdir dir="${build.tmp}" />
-               <jar destfile="${build.lib}/${build.jar}">
diff --git a/debian/patches/02_libs.patch b/debian/patches/02_libs.patch
new file mode 100644 (file)
index 0000000..d45cc4f
--- /dev/null
@@ -0,0 +1,54 @@
+Author: <gerardo@sophie.gerardo.com.ve>
+Description: Use debian libraries and disable unnecesary unjarlib target,
+--- a/build.xml
++++ b/build.xml
+@@ -86,7 +86,7 @@
+       <property name="layout.dir" value="${src.dir}/resource/layout" />
+       <!-- Set the properties for library directories -->
+-      <property name="library.directory" value="lib" />
++      <property name="library.directory" value="/usr/share/java" />
+ <!--    <property name="nsis.executable" value="makensis.exe"/> -->
+       <property name="nsis.executable.linux" value="makensis"/>
+@@ -105,22 +105,21 @@
+               </and>
+       </condition>
+-      <taskdef name="jarbundler" classpath="${library.directory}/jarbundler-1.4.jar" classname="com.loomcom.ant.tasks.jarbundler.JarBundler" />
+-
+-
++<!--  <taskdef name="jarbundler" classpath="${library.directory}/jarbundler-1.4.jar" classname="com.loomcom.ant.tasks.jarbundler.JarBundler" />
++-->
+       <!-- Build classpath -->
+       <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.1.0.jar" />
++              <pathelement location="${library.directory}/antlr3.jar" />
++              <pathelement location="${library.directory}/looks.jar" />
++              <pathelement location="${library.directory}/forms.jar" />
+               <pathelement location="${library.directory}/spin.jar" />
+-              <pathelement location="${library.directory}/glazedlists-1.7.0_java15.jar" />
++              <pathelement location="${library.directory}/glazedlists.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}/pdfbox.jar" />
++              <pathelement location="${library.directory}/jempbox.jar" />
+       </path>
+       <target name="run" depends="build">
+@@ -194,7 +193,8 @@
+       </target>
+       <!-- Jars up project -->
+-      <target name="jars" depends="build, unjarlib">
++      <!-- The unjarlib target is not needed, we'll use the jars in the classpath -->
++      <target name="jars" depends="build">
+               <mkdir dir="${build.lib}" />
+               <mkdir dir="${build.tmp}" />
+               <jar destfile="${build.lib}/${build.jar}">
diff --git a/debian/patches/03_external_apps.dpatch b/debian/patches/03_external_apps.dpatch
deleted file mode 100755 (executable)
index cdab4a3..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_external_apps.dpatch by  <gregor+debian@comodo.priv.at>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Change some external applications.
-
-@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/03_external_apps.patch b/debian/patches/03_external_apps.patch
new file mode 100644 (file)
index 0000000..c42d743
--- /dev/null
@@ -0,0 +1,16 @@
+Author: <gregor+debian@comodo.priv.at>
+Description: Change some external applications.
+--- a/src/java/net/sf/jabref/JabRefPreferences.java
++++ b/src/java/net/sf/jabref/JabRefPreferences.java
+@@ -113,9 +113,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/04_HONOR_DISPLAY_PROPERTIES.dpatch b/debian/patches/04_HONOR_DISPLAY_PROPERTIES.dpatch
deleted file mode 100755 (executable)
index 546b558..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_HONOR_DISPLAY_PROPERTIES.dpatch by  <gregor+debian@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 ...
-
-@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
-@@ -109,7 +109,6 @@
-                 "We are sorry for the trouble and thanks for reporting problems with JabRef!</html>");\r
-             pane.setEditable(false);\r
-             pane.setOpaque(false);\r
--            pane.putClientProperty(JEditorPane.HONOR_DISPLAY_PROPERTIES, Boolean.TRUE);\r
-             \r
-             Component componentToDisplay;\r
-             if (pane.getPreferredSize().getHeight() > 700){\r
-@@ -157,7 +156,6 @@
-                 "<p>For more information visit <b>http://jabref.sf.net/faq.php</b>.</p></html>");\r
-             pane.setEditable(false);\r
-             pane.setOpaque(false);\r
--            pane.putClientProperty(JEditorPane.HONOR_DISPLAY_PROPERTIES, Boolean.TRUE);\r
-             \r
-             JOptionPane.showMessageDialog(null, pane, "Insufficient Java Version Installed", JOptionPane.ERROR_MESSAGE);\r
-         }\r
diff --git a/debian/patches/04_HONOR_DISPLAY_PROPERTIES.patch b/debian/patches/04_HONOR_DISPLAY_PROPERTIES.patch
new file mode 100644 (file)
index 0000000..441f684
--- /dev/null
@@ -0,0 +1,20 @@
+Author: <gregor+debian@comodo.priv.at>
+Description: JEditorPane.HONOR_DISPLAY_PROPERTIES not understood by java-gcj-compat-dev ...
+--- 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>");\r
+             pane.setEditable(false);\r
+             pane.setOpaque(false);\r
+-            pane.putClientProperty(JEditorPane.HONOR_DISPLAY_PROPERTIES, Boolean.TRUE);\r
+             \r
+             Component componentToDisplay;\r
+             if (pane.getPreferredSize().getHeight() > 700){\r
+@@ -157,7 +156,6 @@
+                 "<p>For more information visit <b>http://jabref.sf.net/faq.php</b>.</p></html>");\r
+             pane.setEditable(false);\r
+             pane.setOpaque(false);\r
+-            pane.putClientProperty(JEditorPane.HONOR_DISPLAY_PROPERTIES, Boolean.TRUE);\r
+             \r
+             JOptionPane.showMessageDialog(null, pane, "Insufficient Java Version Installed", JOptionPane.ERROR_MESSAGE);\r
+         }\r
diff --git a/debian/patches/05_antlr.dpatch b/debian/patches/05_antlr.dpatch
deleted file mode 100755 (executable)
index 4098f7c..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_antlr.dpatch by  <gerardo@sophie.gerardo.com.ve>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use antlr3 stable release API, missing ruleNestingLevel member on the antlr3 beta API
-
-@DPATCH@
-diff -urNad jabref-2.3.1~/src/java/net/sf/jabref/bst/BstLexer.java jabref-2.3.1/src/java/net/sf/jabref/bst/BstLexer.java
---- jabref-2.3.1~/src/java/net/sf/jabref/bst/BstLexer.java     2008-04-19 03:48:20.000000000 -0430
-+++ jabref-2.3.1/src/java/net/sf/jabref/bst/BstLexer.java      2008-04-19 03:48:53.000000000 -0430
-@@ -3,11 +3,12 @@
- // $ANTLR 3.0b5 Bst.g 2006-11-23 23:20:24
- import org.antlr.runtime.*;
-+import org.antlr.codegen.*;
- import java.util.Stack;
- import java.util.List;
- import java.util.ArrayList;
--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;
-@@ -40,6 +41,9 @@
-     public static final int IDLIST=4;
-     public static final int NUMERAL=22;
-     public static final int READ=13;
-+    
-+    int ruleNestingLevel = 0;
-+    
-     public BstLexer() {;} 
-     public BstLexer(CharStream input) {
-         super(input);
-@@ -1656,4 +1660,4 @@
-  
--}
-\ No newline at end of file
-+}
diff --git a/debian/patches/05_antlr.patch b/debian/patches/05_antlr.patch
new file mode 100644 (file)
index 0000000..01793fd
--- /dev/null
@@ -0,0 +1,35 @@
+Author: <gerardo@sophie.gerardo.com.ve>
+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
+@@ -3,11 +3,12 @@
+ // $ANTLR 3.0b5 Bst.g 2006-11-23 23:20:24
+ import org.antlr.runtime.*;
++import org.antlr.codegen.*;
+ import java.util.Stack;
+ import java.util.List;
+ import java.util.ArrayList;
+-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;
+@@ -40,6 +41,9 @@
+     public static final int IDLIST=4;
+     public static final int NUMERAL=22;
+     public static final int READ=13;
++
++    int ruleNestingLevel = 0;
++
+     public BstLexer() {;} 
+     public BstLexer(CharStream input) {
+         super(input);
+@@ -1656,4 +1660,4 @@
+  
+-}
+\ No newline at end of file
++}
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644 (file)
index 0000000..584970d
--- /dev/null
@@ -0,0 +1,5 @@
+01_free_javac.patch
+02_libs.patch
+03_external_apps.patch
+04_HONOR_DISPLAY_PROPERTIES.patch
+05_antlr.patch
index aa8f191..4767acf 100755 (executable)
@@ -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/java-gcj 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
@@ -64,4 +59,4 @@ binary-arch: build install
 # We have nothing to do.
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install