CVS lucene/debian/patches
Barry Hawkins
barryh-guest at haydn.debian.org
Wed Sep 21 03:22:15 UTC 2005
Update of /cvsroot/pkg-java/lucene/debian/patches
In directory haydn:/tmp/cvs-serv19535/debian/patches
Modified Files:
Tag: RB_1_4_3
00list 01_upstream_StandardTokenizer_fix.dpatch
02_upstream_root_ant_build_fix.dpatch
Added Files:
Tag: RB_1_4_3
03_disable_test_failure.dpatch
Log Message:
Added patch to disable hard fail when any unit test fails.
Modified rules to run unit test reports to aid in debugging current issues.
Initialized changelog entry for next release.
Corrected missing newline in debian/.cvsignore.
Updated standards version to 3.6.2.1.
--- /cvsroot/pkg-java/lucene/debian/patches/00list 2005/02/11 21:45:11 1.1.2.1
+++ /cvsroot/pkg-java/lucene/debian/patches/00list 2005/09/21 03:22:15 1.1.2.2
@@ -1,3 +1,3 @@
01_upstream_StandardTokenizer_fix
02_upstream_root_ant_build_fix
-
+03_disable_test_failure
--- /cvsroot/pkg-java/lucene/debian/patches/01_upstream_StandardTokenizer_fix.dpatch 2005/02/11 21:45:12 1.1.2.1
+++ /cvsroot/pkg-java/lucene/debian/patches/01_upstream_StandardTokenizer_fix.dpatch 2005/09/21 03:22:15 1.1.2.2
@@ -1,26 +1,10 @@
-#! /bin/sh -e
+#! /bin/sh /usr/share/dpatch/dpatch-run
## 01_upstream_StandardTokenizer_fix.dpatch by Barry Hawkins <barry at alltc.com>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Patch for StandardTokenizer.jj error from upstream source
## DP: discovered by Jeff Breidenbach.
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch ${2:+-d $2}}"
-
-if [ $# -lt 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
@DPATCH@
diff -uNr ./src/java/org/apache/lucene/analysis/standard/StandardTokenizer.jj ../lucene-1.4.3/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.jj
--- /cvsroot/pkg-java/lucene/debian/patches/02_upstream_root_ant_build_fix.dpatch 2005/02/11 21:45:12 1.1.2.1
+++ /cvsroot/pkg-java/lucene/debian/patches/02_upstream_root_ant_build_fix.dpatch 2005/09/21 03:22:15 1.1.2.2
@@ -1,4 +1,4 @@
-#! /bin/sh -e
+#! /bin/sh /usr/share/dpatch/dpatch-run
## 02_upstream_root_ant_build_fix.dpatch by Barry Hawkins <barry at alltc.com>
##
## All lines beginning with `## DP:' are a description of the patch.
@@ -6,22 +6,6 @@
## DP: tasks in order to increase the control available
## DP: when compiling under different JVM/compiler combinations.
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch ${2:+-d $2}}"
-
-if [ $# -lt 1 ]; then
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1
-fi
-case "$1" in
- -patch) patch $patch_opts -p1 < $0;;
- -unpatch) patch $patch_opts -p1 -R < $0;;
- *)
- echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
- exit 1;;
-esac
-
-exit 0
@DPATCH@
diff -uNr lucene-1.4.3/build.xml debian_packages/lucene/1.4.3/lucene-1.4.3/build.xml
More information about the pkg-java-commits
mailing list