[jabref] 162/459: * Switch patch system from dpatch to quilt. * debian/rules: remove configure{, -stamp} targets.
gregor herrmann
gregoa at debian.org
Thu Sep 15 20:40:09 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 a070d2f710635eceec6c3268f19f2af0fe1f797d
Author: gregor herrmann <gregoa at debian.org>
Date: Wed Jul 2 17:27:02 2008 +0000
* Switch patch system from dpatch to quilt.
* debian/rules: remove configure{,-stamp} targets.
---
debian/changelog | 2 ++
debian/control | 2 +-
debian/patches/00list | 5 -----
.../{01_free_javac.dpatch => 01_free_javac.patch} | 22 +++++++---------------
debian/patches/{02_libs.dpatch => 02_libs.patch} | 14 ++++----------
...external_apps.dpatch => 03_external_apps.patch} | 16 +++++-----------
...ES.dpatch => 04_HONOR_DISPLAY_PROPERTIES.patch} | 14 ++++----------
debian/patches/{05_antlr.dpatch => 05_antlr.patch} | 18 ++++++------------
debian/patches/series | 5 +++++
debian/rules | 15 +++++----------
10 files changed, 39 insertions(+), 74 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3500820..0acf986 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 at debian.org> Fri, 02 May 2008 01:24:18 +0200
diff --git a/debian/control b/debian/control
index 4e408d8..c3fddb7 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: contrib/tex
Priority: optional
Maintainer: gregor herrmann <gregoa at debian.org>
Uploaders: tony mancill <tmancill at 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
index efbdd0b..0000000
--- a/debian/patches/00list
+++ /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.patch
old mode 100755
new mode 100644
similarity index 66%
rename from debian/patches/01_free_javac.dpatch
rename to debian/patches/01_free_javac.patch
index e24e785..1c36af4
--- a/debian/patches/01_free_javac.dpatch
+++ b/debian/patches/01_free_javac.patch
@@ -1,14 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_free_javac.dpatch by <gregor+debian at 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
-
- at 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
+Author: <gregor+debian at 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;
@@ -17,7 +10,7 @@ diff -urNad jabref-2.2~b2~/src/java/net/sf/jabref/JabRef.java jabref-2.2~b2/src/
import com.jgoodies.looks.FontSet;
import com.jgoodies.looks.FontSets;
import com.jgoodies.looks.FontPolicy;
-@@ -578,27 +577,6 @@
+@@ -598,27 +597,6 @@
//Plastic3DLookAndFeel plLnf = (Plastic3DLookAndFeel) lnf;
}
@@ -45,9 +38,8 @@ diff -urNad jabref-2.2~b2~/src/java/net/sf/jabref/JabRef.java jabref-2.2~b2/src/
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
+--- 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;
diff --git a/debian/patches/02_libs.dpatch b/debian/patches/02_libs.patch
old mode 100755
new mode 100644
similarity index 83%
rename from debian/patches/02_libs.dpatch
rename to debian/patches/02_libs.patch
index b36ceca..d45cc4f
--- a/debian/patches/02_libs.dpatch
+++ b/debian/patches/02_libs.patch
@@ -1,13 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 02_libs.dpatch by <gerardo at sophie.gerardo.com.ve>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use debian libraries and disable unnecesary unjarlib target,
-
- at 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
+Author: <gerardo at 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" />
diff --git a/debian/patches/03_external_apps.dpatch b/debian/patches/03_external_apps.patch
old mode 100755
new mode 100644
similarity index 50%
rename from debian/patches/03_external_apps.dpatch
rename to debian/patches/03_external_apps.patch
index cdab4a3..c42d743
--- a/debian/patches/03_external_apps.dpatch
+++ b/debian/patches/03_external_apps.patch
@@ -1,14 +1,8 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 03_external_apps.dpatch by <gregor+debian at comodo.priv.at>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Change some external applications.
-
- at 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 @@
+Author: <gregor+debian at 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 {
diff --git a/debian/patches/04_HONOR_DISPLAY_PROPERTIES.dpatch b/debian/patches/04_HONOR_DISPLAY_PROPERTIES.patch
old mode 100755
new mode 100644
similarity index 59%
rename from debian/patches/04_HONOR_DISPLAY_PROPERTIES.dpatch
rename to debian/patches/04_HONOR_DISPLAY_PROPERTIES.patch
index 546b558..441f684
--- a/debian/patches/04_HONOR_DISPLAY_PROPERTIES.dpatch
+++ b/debian/patches/04_HONOR_DISPLAY_PROPERTIES.patch
@@ -1,13 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_HONOR_DISPLAY_PROPERTIES.dpatch by <gregor+debian at 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 ...
-
- at 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
+Author: <gregor+debian at 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>");
pane.setEditable(false);
diff --git a/debian/patches/05_antlr.dpatch b/debian/patches/05_antlr.patch
old mode 100755
new mode 100644
similarity index 55%
rename from debian/patches/05_antlr.dpatch
rename to debian/patches/05_antlr.patch
index 4098f7c..01793fd
--- a/debian/patches/05_antlr.dpatch
+++ b/debian/patches/05_antlr.patch
@@ -1,13 +1,7 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 05_antlr.dpatch by <gerardo at 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
-
- at 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
+Author: <gerardo at 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
@@ -26,9 +20,9 @@ diff -urNad jabref-2.3.1~/src/java/net/sf/jabref/bst/BstLexer.java jabref-2.3.1/
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);
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..584970d
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,5 @@
+01_free_javac.patch
+02_libs.patch
+03_external_apps.patch
+04_HONOR_DISPLAY_PROPERTIES.patch
+05_antlr.patch
diff --git a/debian/rules b/debian/rules
index aa8f191..4767acf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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
--
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