[lucene2] 98/104: Use quilt for patching as dpatch is deprecated.
Kai-Chung Yan
seamlik-guest at moszumanska.debian.org
Wed Mar 23 16:27:37 UTC 2016
This is an automated email from the git hooks/post-receive script.
seamlik-guest pushed a commit to branch master
in repository lucene2.
commit 64eb12a0f66fe165b8ea8e6f46288647abdc92f3
Author: Stephen Nelson <stephen at eccostudio.com>
Date: Tue Jul 22 16:51:37 2014 +0000
Use quilt for patching as dpatch is deprecated.
---
debian/changelog | 7 +++++++
debian/control | 1 -
debian/patches/00list | 19 -----------------
...jarfiles.dpatch => 01_remove_all_jarfiles.diff} | 0
...atch => 05_add-osgi-metadata-in-manifests.diff} | 0
...cations.dpatch => 10_fix-javacc-locations.diff} | 0
...s.dpatch => 11_fix-javacc-generated-files.diff} | 0
...ildd-failure-in-TestTimeLimitingCollector.diff} | 10 ++++-----
...on.dpatch => 20_fix-java-compiler-version.diff} | 7 +++----
...nt-libs.dpatch => 30_fix-contrib-ant-libs.diff} | 0
...=> 31_fix-contrib-ant-test-wrong-encoding.diff} | 5 ++---
...s.dpatch => 40_fix-contrib-benchmark-libs.diff} | 7 +++----
...s.dpatch => 45_fix-contrib-collation-libs.diff} | 0
...-db-libs.dpatch => 50_fix-contrib-db-libs.diff} | 0
...-libs.dpatch => 55_fix-contrib-db-je-libs.diff} | 0
...-libs.dpatch => 60_fix-contrib-lucli-libs.diff} | 0
...61_lucli-script.dpatch => 61_lucli-script.diff} | 0
...-libs.dpatch => 70_fix-contrib-regex-libs.diff} | 0
...atch => 80_prevent-downloading-data-files.diff} | 0
...h => 81_disable-test-tag-backcompat-tests.diff} | 9 ++++----
...lls.dpatch => 82_disable-svnversion-calls.diff} | 15 +++++++-------
...ing.dpatch => 83_fix-java-IPv4-networking.diff} | 6 +++---
.../patches/99debug_print-unittest-results.dpatch | 24 ----------------------
debian/patches/series | 19 +++++++++++++++++
debian/rules | 1 -
debian/source/format | 2 +-
26 files changed, 53 insertions(+), 79 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 79ba1a2..2ab38ed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lucene2 (2.9.4+ds1-5) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Convert package to use quilt for patching as dpatch is deprecated.
+
+ -- Stephen Nelson <stephen at eccostudio.com> Tue, 22 Jul 2014 17:30:44 +0100
+
lucene2 (2.9.4+ds1-4) unstable; urgency=low
[ Benjamin Drung ]
diff --git a/debian/control b/debian/control
index bc8c219..e8a5421 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,6 @@ Build-Depends: ant-contrib,
cdbs (>= 0.4.49),
debhelper (>= 6),
default-jdk,
- dpatch (>= 2.0),
javacc,
junit
Build-Depends-Indep: libcommons-beanutils-java (>= 1.7.0),
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index 1875f6a..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,19 +0,0 @@
-01_remove_all_jarfiles.dpatch
-05_add-osgi-metadata-in-manifests.dpatch
-10_fix-javacc-locations.dpatch
-11_fix-javacc-generated-files.dpatch
-12_fix-buildd-failure-in-TestTimeLimitingCollector.dpatch
-20_fix-java-compiler-version.dpatch
-30_fix-contrib-ant-libs.dpatch
-31_fix-contrib-ant-test-wrong-encoding.dpatch
-40_fix-contrib-benchmark-libs.dpatch
-45_fix-contrib-collation-libs.dpatch
-50_fix-contrib-db-libs
-55_fix-contrib-db-je-libs
-60_fix-contrib-lucli-libs.dpatch
-61_lucli-script.dpatch
-70_fix-contrib-regex-libs.dpatch
-80_prevent-downloading-data-files
-81_disable-test-tag-backcompat-tests.dpatch
-82_disable-svnversion-calls
-83_fix-java-IPv4-networking.dpatch
diff --git a/debian/patches/01_remove_all_jarfiles.dpatch b/debian/patches/01_remove_all_jarfiles.diff
similarity index 100%
rename from debian/patches/01_remove_all_jarfiles.dpatch
rename to debian/patches/01_remove_all_jarfiles.diff
diff --git a/debian/patches/05_add-osgi-metadata-in-manifests.dpatch b/debian/patches/05_add-osgi-metadata-in-manifests.diff
similarity index 100%
rename from debian/patches/05_add-osgi-metadata-in-manifests.dpatch
rename to debian/patches/05_add-osgi-metadata-in-manifests.diff
diff --git a/debian/patches/10_fix-javacc-locations.dpatch b/debian/patches/10_fix-javacc-locations.diff
similarity index 100%
rename from debian/patches/10_fix-javacc-locations.dpatch
rename to debian/patches/10_fix-javacc-locations.diff
diff --git a/debian/patches/11_fix-javacc-generated-files.dpatch b/debian/patches/11_fix-javacc-generated-files.diff
similarity index 100%
rename from debian/patches/11_fix-javacc-generated-files.dpatch
rename to debian/patches/11_fix-javacc-generated-files.diff
diff --git a/debian/patches/12_fix-buildd-failure-in-TestTimeLimitingCollector.dpatch b/debian/patches/12_fix-buildd-failure-in-TestTimeLimitingCollector.diff
old mode 100755
new mode 100644
similarity index 60%
rename from debian/patches/12_fix-buildd-failure-in-TestTimeLimitingCollector.dpatch
rename to debian/patches/12_fix-buildd-failure-in-TestTimeLimitingCollector.diff
index 8f9f564..5375a35
--- a/debian/patches/12_fix-buildd-failure-in-TestTimeLimitingCollector.dpatch
+++ b/debian/patches/12_fix-buildd-failure-in-TestTimeLimitingCollector.diff
@@ -6,9 +6,8 @@
## DP: Apache Lucene svn revision 834011
@DPATCH@
-diff -urNad lucene2~/src/test/org/apache/lucene/search/TestTimeLimitedCollector.java lucene2/src/test/org/apache/lucene/search/TestTimeLimitedCollector.java
---- lucene2~/src/test/org/apache/lucene/search/TestTimeLimitedCollector.java 2009-10-23 17:21:47.000000000 +0200
-+++ lucene2/src/test/org/apache/lucene/search/TestTimeLimitedCollector.java 2010-01-22 12:49:03.000000000 +0100
+--- a/src/test/org/apache/lucene/search/TestTimeLimitedCollector.java
++++ b/src/test/org/apache/lucene/search/TestTimeLimitedCollector.java
@@ -80,7 +80,8 @@
searcher = new IndexSearcher(directory);
@@ -19,9 +18,8 @@ diff -urNad lucene2~/src/test/org/apache/lucene/search/TestTimeLimitedCollector.
qtxt += ' ' + docText[i]; // large query so that search will be longer
}
QueryParser queryParser = new QueryParser(FIELD_NAME, new WhitespaceAnalyzer());
-diff -urNad lucene2~/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java lucene2/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java
---- lucene2~/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java 2009-10-23 17:21:47.000000000 +0200
-+++ lucene2/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java 2010-01-22 12:44:21.000000000 +0100
+--- a/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java
++++ b/src/test/org/apache/lucene/search/TestTimeLimitingCollector.java
@@ -82,7 +82,8 @@
searcher = new IndexSearcher(directory);
diff --git a/debian/patches/20_fix-java-compiler-version.dpatch b/debian/patches/20_fix-java-compiler-version.diff
old mode 100755
new mode 100644
similarity index 77%
rename from debian/patches/20_fix-java-compiler-version.dpatch
rename to debian/patches/20_fix-java-compiler-version.diff
index 2eb0cc2..e6ccce3
--- a/debian/patches/20_fix-java-compiler-version.dpatch
+++ b/debian/patches/20_fix-java-compiler-version.diff
@@ -6,10 +6,9 @@
## DP: already depends on java >= 1.5
@DPATCH@
-diff -urNad lucene2~/common-build.xml lucene2/common-build.xml
---- lucene2~/common-build.xml 2009-11-03 22:32:24.000000000 +0100
-+++ lucene2/common-build.xml 2009-11-03 22:35:55.000000000 +0100
-@@ -58,8 +58,8 @@
+--- a/common-build.xml
++++ b/common-build.xml
+@@ -60,8 +60,8 @@
<property name="javac.deprecation" value="off"/>
<property name="javac.debug" value="on"/>
diff --git a/debian/patches/30_fix-contrib-ant-libs.dpatch b/debian/patches/30_fix-contrib-ant-libs.diff
similarity index 100%
rename from debian/patches/30_fix-contrib-ant-libs.dpatch
rename to debian/patches/30_fix-contrib-ant-libs.diff
diff --git a/debian/patches/31_fix-contrib-ant-test-wrong-encoding.dpatch b/debian/patches/31_fix-contrib-ant-test-wrong-encoding.diff
old mode 100755
new mode 100644
similarity index 64%
rename from debian/patches/31_fix-contrib-ant-test-wrong-encoding.dpatch
rename to debian/patches/31_fix-contrib-ant-test-wrong-encoding.diff
index eca735e..805475d
--- a/debian/patches/31_fix-contrib-ant-test-wrong-encoding.dpatch
+++ b/debian/patches/31_fix-contrib-ant-test-wrong-encoding.diff
@@ -7,9 +7,8 @@
## DP: a space. This patch removes the URL decoding.
@DPATCH@
-diff -urNad lucene2~/contrib/ant/src/test/org/apache/lucene/ant/DocumentTestCase.java lucene2/contrib/ant/src/test/org/apache/lucene/ant/DocumentTestCase.java
---- lucene2~/contrib/ant/src/test/org/apache/lucene/ant/DocumentTestCase.java 2009-06-27 12:58:40.000000000 +0200
-+++ lucene2/contrib/ant/src/test/org/apache/lucene/ant/DocumentTestCase.java 2009-11-05 09:34:23.000000000 +0100
+--- a/contrib/ant/src/test/org/apache/lucene/ant/DocumentTestCase.java
++++ b/contrib/ant/src/test/org/apache/lucene/ant/DocumentTestCase.java
@@ -33,7 +33,7 @@
String fullname =
this.getClass().getResource(filename).getFile();
diff --git a/debian/patches/40_fix-contrib-benchmark-libs.dpatch b/debian/patches/40_fix-contrib-benchmark-libs.diff
old mode 100755
new mode 100644
similarity index 81%
rename from debian/patches/40_fix-contrib-benchmark-libs.dpatch
rename to debian/patches/40_fix-contrib-benchmark-libs.diff
index f1f4d52..02160af
--- a/debian/patches/40_fix-contrib-benchmark-libs.dpatch
+++ b/debian/patches/40_fix-contrib-benchmark-libs.diff
@@ -5,10 +5,9 @@
## DP: No description.
@DPATCH@
-diff -urNad lucene2~/contrib/benchmark/build.xml lucene2/contrib/benchmark/build.xml
---- lucene2~/contrib/benchmark/build.xml 2009-08-20 09:34:18.000000000 +0200
-+++ lucene2/contrib/benchmark/build.xml 2009-08-20 09:35:09.000000000 +0200
-@@ -107,9 +107,13 @@
+--- a/contrib/benchmark/build.xml
++++ b/contrib/benchmark/build.xml
+@@ -110,9 +110,13 @@
<pathelement path="${common.dir}/build/contrib/highlighter/classes/java"/>
<pathelement path="${common.dir}/build/contrib/memory/classes/java"/>
<pathelement path="${common.dir}/build/contrib/fast-vector-highlighter/classes/java"/>
diff --git a/debian/patches/45_fix-contrib-collation-libs.dpatch b/debian/patches/45_fix-contrib-collation-libs.diff
similarity index 100%
rename from debian/patches/45_fix-contrib-collation-libs.dpatch
rename to debian/patches/45_fix-contrib-collation-libs.diff
diff --git a/debian/patches/50_fix-contrib-db-libs.dpatch b/debian/patches/50_fix-contrib-db-libs.diff
similarity index 100%
rename from debian/patches/50_fix-contrib-db-libs.dpatch
rename to debian/patches/50_fix-contrib-db-libs.diff
diff --git a/debian/patches/55_fix-contrib-db-je-libs.dpatch b/debian/patches/55_fix-contrib-db-je-libs.diff
similarity index 100%
rename from debian/patches/55_fix-contrib-db-je-libs.dpatch
rename to debian/patches/55_fix-contrib-db-je-libs.diff
diff --git a/debian/patches/60_fix-contrib-lucli-libs.dpatch b/debian/patches/60_fix-contrib-lucli-libs.diff
similarity index 100%
rename from debian/patches/60_fix-contrib-lucli-libs.dpatch
rename to debian/patches/60_fix-contrib-lucli-libs.diff
diff --git a/debian/patches/61_lucli-script.dpatch b/debian/patches/61_lucli-script.diff
similarity index 100%
rename from debian/patches/61_lucli-script.dpatch
rename to debian/patches/61_lucli-script.diff
diff --git a/debian/patches/70_fix-contrib-regex-libs.dpatch b/debian/patches/70_fix-contrib-regex-libs.diff
similarity index 100%
rename from debian/patches/70_fix-contrib-regex-libs.dpatch
rename to debian/patches/70_fix-contrib-regex-libs.diff
diff --git a/debian/patches/80_prevent-downloading-data-files.dpatch b/debian/patches/80_prevent-downloading-data-files.diff
similarity index 100%
rename from debian/patches/80_prevent-downloading-data-files.dpatch
rename to debian/patches/80_prevent-downloading-data-files.diff
diff --git a/debian/patches/81_disable-test-tag-backcompat-tests.dpatch b/debian/patches/81_disable-test-tag-backcompat-tests.diff
old mode 100755
new mode 100644
similarity index 92%
rename from debian/patches/81_disable-test-tag-backcompat-tests.dpatch
rename to debian/patches/81_disable-test-tag-backcompat-tests.diff
index 732ca74..eb5c8fe
--- a/debian/patches/81_disable-test-tag-backcompat-tests.dpatch
+++ b/debian/patches/81_disable-test-tag-backcompat-tests.diff
@@ -5,10 +5,9 @@
## DP: No description.
@DPATCH@
-diff -urNad lucene2~/build.xml lucene2/build.xml
---- lucene2~/build.xml 2009-09-18 01:03:43.000000000 +0200
-+++ lucene2/build.xml 2009-11-05 10:43:38.000000000 +0100
-@@ -80,8 +80,8 @@
+--- a/build.xml
++++ b/build.xml
+@@ -90,8 +90,8 @@
<target name="test-core" depends="common.test"
description="Runs unit tests for the core Lucene code"
/>
@@ -19,7 +18,7 @@ diff -urNad lucene2~/build.xml lucene2/build.xml
/>
<property name="tag" value="${compatibility.tag}"/>
-@@ -100,50 +100,6 @@
+@@ -110,50 +110,6 @@
<pathelement path="${java.class.path}"/>
</path>
diff --git a/debian/patches/82_disable-svnversion-calls.dpatch b/debian/patches/82_disable-svnversion-calls.diff
old mode 100755
new mode 100644
similarity index 80%
rename from debian/patches/82_disable-svnversion-calls.dpatch
rename to debian/patches/82_disable-svnversion-calls.diff
index d9b88fb..7b28254
--- a/debian/patches/82_disable-svnversion-calls.dpatch
+++ b/debian/patches/82_disable-svnversion-calls.diff
@@ -5,10 +5,9 @@
## DP: No description.
@DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lucene2~/common-build.xml lucene2/common-build.xml
---- lucene2~/common-build.xml 2010-08-06 11:29:27.000000000 +0200
-+++ lucene2/common-build.xml 2010-08-06 11:30:19.000000000 +0200
-@@ -99,15 +99,6 @@
+--- a/common-build.xml
++++ b/common-build.xml
+@@ -101,15 +101,6 @@
<property name="manifest.file" location="${common.dir}/build/MANIFEST.MF"/>
@@ -24,7 +23,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
<available property="build-1-5-contrib" classname="java.lang.StringBuilder" />
<property name="clover.db.dir" location="${common.dir}/build/test/clover/db"/>
-@@ -305,7 +296,7 @@
+@@ -316,7 +307,7 @@
<attribute name="Implementation-Title" value="org.apache.lucene"/>
<!-- impl version can be any string -->
<attribute name="Implementation-Version"
@@ -33,7 +32,7 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
<attribute name="Implementation-Vendor"
value="The Apache Software Foundation"/>
<attribute name="X-Compile-Source-JDK"
-@@ -345,12 +336,6 @@
+@@ -351,12 +342,6 @@
<element name="manifest-attributes" optional="yes"/>
<element name="metainf-includes" optional="yes"/>
<sequential>
@@ -44,5 +43,5 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
- </exec>
-
<build-manifest/>
-
- <jar
+ <if>
+ <isset property="OSGi.requirebundle"/>
diff --git a/debian/patches/83_fix-java-IPv4-networking.dpatch b/debian/patches/83_fix-java-IPv4-networking.diff
old mode 100755
new mode 100644
similarity index 83%
rename from debian/patches/83_fix-java-IPv4-networking.dpatch
rename to debian/patches/83_fix-java-IPv4-networking.diff
index 93b2c31..1782998
--- a/debian/patches/83_fix-java-IPv4-networking.dpatch
+++ b/debian/patches/83_fix-java-IPv4-networking.diff
@@ -5,9 +5,9 @@
## DP: No description.
@DPATCH@
---- lucene2-2.9.1+ds1.orig/common-build.xml
-+++ lucene2-2.9.1+ds1/common-build.xml
-@@ -54,7 +54,7 @@
+--- a/common-build.xml
++++ b/common-build.xml
+@@ -56,7 +56,7 @@
</path>
<!-- default arguments to pass to JVM executing tests -->
diff --git a/debian/patches/99debug_print-unittest-results.dpatch b/debian/patches/99debug_print-unittest-results.dpatch
deleted file mode 100644
index 4199e63..0000000
--- a/debian/patches/99debug_print-unittest-results.dpatch
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 99debug_print-unittest-results-final.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad lucene2~/build.xml lucene2/build.xml
---- lucene2~/build.xml 2010-01-25 15:04:52.000000000 +0100
-+++ lucene2/build.xml 2010-01-25 15:28:13.000000000 +0100
-@@ -88,8 +88,11 @@
- <!-- ================================================================== -->
-
- <target name="test-core" depends="common.test"
-- description="Runs unit tests for the core Lucene code"
-- />
-+ description="Runs unit tests for the core Lucene code">
-+ <exec executable="/bin/cat">
-+ <arg path="${junit.output.dir}/TEST-org.apache.lucene.index.TestIndexReaderReopen.xml" />
-+ </exec>
-+ </target>
- <target name="test" depends="test-core, test-contrib"
- description="Runs all unit tests (core and contrib)"
- />
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4bf4e7b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,19 @@
+05_add-osgi-metadata-in-manifests.diff
+10_fix-javacc-locations.diff
+11_fix-javacc-generated-files.diff
+12_fix-buildd-failure-in-TestTimeLimitingCollector.diff
+20_fix-java-compiler-version.diff
+30_fix-contrib-ant-libs.diff
+31_fix-contrib-ant-test-wrong-encoding.diff
+40_fix-contrib-benchmark-libs.diff
+45_fix-contrib-collation-libs.diff
+50_fix-contrib-db-libs.diff
+55_fix-contrib-db-je-libs.diff
+60_fix-contrib-lucli-libs.diff
+61_lucli-script.diff
+70_fix-contrib-regex-libs.diff
+80_prevent-downloading-data-files.diff
+81_disable-test-tag-backcompat-tests.diff
+82_disable-svnversion-calls.diff
+83_fix-java-IPv4-networking.diff
+#01_remove_all_jarfiles.diff
diff --git a/debian/rules b/debian/rules
index 168501a..dd150d4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
# -*- makefile -*-
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
include /usr/share/cdbs/1/class/ant.mk
# Uncomment this to turn on verbose mode.
diff --git a/debian/source/format b/debian/source/format
index d3827e7..163aaf8 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-1.0
+3.0 (quilt)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lucene2.git
More information about the pkg-java-commits
mailing list