r2055 - in trunk/lucene/debian: . patches
Arnaud Vandyck
avdyk at costa.debian.org
Mon Apr 24 09:32:57 UTC 2006
Author: avdyk
Date: 2006-04-24 09:32:54 +0000 (Mon, 24 Apr 2006)
New Revision: 2055
Added:
trunk/lucene/debian/liblucene-java-doc.dirs
trunk/lucene/debian/liblucene-java-doc.doc-base
trunk/lucene/debian/liblucene-java.dirs
trunk/lucene/debian/patches/03_disable_test_failure.dpatch
trunk/lucene/debian/patches/04_exclude_TestRussianStem.dpatch
Removed:
trunk/lucene/debian/dirs
trunk/lucene/debian/docs
Modified:
trunk/lucene/debian/README.Debian
trunk/lucene/debian/ant.properties
trunk/lucene/debian/changelog
trunk/lucene/debian/control
trunk/lucene/debian/liblucene-java.docs
trunk/lucene/debian/liblucene-java.links
trunk/lucene/debian/patches/00list
trunk/lucene/debian/patches/01_upstream_StandardTokenizer_fix.dpatch
trunk/lucene/debian/patches/02_upstream_root_ant_build_fix.dpatch
trunk/lucene/debian/rules
Log:
updated to revert the 1.4.3-9 situation
Modified: trunk/lucene/debian/README.Debian
===================================================================
--- trunk/lucene/debian/README.Debian 2006-04-23 05:17:12 UTC (rev 2054)
+++ trunk/lucene/debian/README.Debian 2006-04-24 09:32:54 UTC (rev 2055)
@@ -47,4 +47,4 @@
permission java.io.FilePermission "/var/lib/tomcat4/temp", "read,write,delete";
permission java.io.FilePermission "/var/lib/tomcat4/temp/*", "read,write,delete";
- -- Barry Hawkins <barryh at bytemason.org>, Sat May 28 12:52:51 2005
+ -- Barry Hawkins <barry at alltc.com>, Tue, 22 Mar 2005 14:20:38 -0500
Modified: trunk/lucene/debian/ant.properties
===================================================================
--- trunk/lucene/debian/ant.properties 2006-04-23 05:17:12 UTC (rev 2054)
+++ trunk/lucene/debian/ant.properties 2006-04-24 09:32:54 UTC (rev 2055)
@@ -12,7 +12,7 @@
javac.nowarn=off
javac.verbose=yes
# Sun 1.4.2 SDK does not support classic compiler
-build.compiler=modern
+build.compiler=jikes
+build.rmic=kaffe
#compile.debug=
#compile.optimize=
-
Modified: trunk/lucene/debian/changelog
===================================================================
--- trunk/lucene/debian/changelog 2006-04-23 05:17:12 UTC (rev 2054)
+++ trunk/lucene/debian/changelog 2006-04-24 09:32:54 UTC (rev 2055)
@@ -1,3 +1,38 @@
+lucene (1.4.3-9) unstable; urgency=low
+
+ * Upload to remediate issue with .orig.tar.gz not being in main
+ (Closes: #338205)
+ * Added tomcat5 to Suggests: for liblucene-java as an alternative
+ to tomcat4
+
+ -- Barry Hawkins <barry at bytemason.org> Wed, 09 Nov 2005 10:36:12 -0500
+
+lucene (1.4.3-8) unstable; urgency=low
+
+ * Added specification of sections for binary packages to remediate
+ override for last package upload.
+
+ -- Barry Hawkins <barry at bytemason.org> Wed, 26 Oct 2005 15:39:07 -0400
+
+lucene (1.4.3-7) unstable; urgency=low
+
+ * Added missing dh_link to debian/rules; necessary link not being
+ created per Debian Java(TM) policy (Closes: #335561)
+
+ -- Barry Hawkins <barry at bytemason.org> Mon, 24 Oct 2005 13:24:58 -0400
+
+lucene (1.4.3-6) unstable; urgency=low
+
+ * Moved to main building with kaffe (Closes: #272295)
+ * Temporarily disabled unit test for class
+ org.apache.lucene.analysis.ru.RussianStem until Unicode
+ issue can be resolved
+ * Updated dependencies to reflect the Ant transition
+ * Added integration with Debian Documentation
+ * Updated standards version to 3.6.2.1
+
+ -- Barry Hawkins <barry at bytemason.org> Thu, 13 Oct 2005 23:39:58 -0400
+
lucene (1.4.3-5) unstable; urgency=low
* update documentation
@@ -94,4 +129,3 @@
* Initial Release.
-- Takashi Okamoto <tora at debian.org> Sat, 25 Jan 2003 11:17:27 +0900
-
Modified: trunk/lucene/debian/control
===================================================================
--- trunk/lucene/debian/control 2006-04-23 05:17:12 UTC (rev 2054)
+++ trunk/lucene/debian/control 2006-04-24 09:32:54 UTC (rev 2055)
@@ -1,16 +1,17 @@
Source: lucene
-Section: contrib/text
+Section: text
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Barry Hawkins <barry at bytemason.org>, Jeff Breidenbach <jab at debian.org>
-Build-Depends-Indep: debhelper (>= 4.0.0), dpatch (>= 1.11), sun-j2sdk1.4 | blackdown-j2sdk1.4 | java2-compiler, libant1.6-java, javacc, junit
-Standards-Version: 3.6.1
+Build-Depends-Indep: debhelper (>= 4.0.0), dpatch (>= 1.11), kaffe (>= 2:1.1.6), ant (>= 1.6.5-2), ant-optional (>= 1.6.5-2), javacc, junit, libxalan2-java
+Standards-Version: 3.6.2.1
Package: liblucene-java
Architecture: all
-Depends: sun-j2sdk1.4 | blackdown-j2sdk1.4 | ibm-j2sdk1.4 | sun-j2re1.4 | blackdown-j2re1.4 | ibm-j2re1.4 | j2sdk1.3 | j2sdk1.4 | j2re1.3 | j2re1.4 | java2-runtime | java1-runtime
-Replaces: liblucene-java-doc (<= 1.4.3-2)
-Suggests: liblucene-java-doc (>= ${Source-Version}), tomcat4
+Section: text
+Depends: kaffe (>= 2:1.1.6) | java2-runtime | java1-runtime
+Replaces: liblucene-java-doc (<= 1.4.3-5)
+Suggests: liblucene-java-doc (>= ${Source-Version}), tomcat4 | tomcat5
Description: full-text search engine library for Java(TM) and demonstration programs
Lucene is a full-text search engine for the Java(TM) programming language.
Lucene is not a complete application, but rather a code library and API
@@ -20,7 +21,8 @@
Package: liblucene-java-doc
Architecture: all
+Section: doc
Suggests: liblucene-java (>= ${Source-Version})
Description: demonstration programs and example code for Lucene
- Documentation and example code for Lucene, which is a full-text
+ Documentation and example code for Lucene, which is a full-text
search engine for the Java(TM) programming language.
Deleted: trunk/lucene/debian/dirs
===================================================================
--- trunk/lucene/debian/dirs 2006-04-23 05:17:12 UTC (rev 2054)
+++ trunk/lucene/debian/dirs 2006-04-24 09:32:54 UTC (rev 2055)
@@ -1,2 +0,0 @@
-usr/share/java
-var/lib/tomcat4/webapps
Deleted: trunk/lucene/debian/docs
===================================================================
--- trunk/lucene/debian/docs 2006-04-23 05:17:12 UTC (rev 2054)
+++ trunk/lucene/debian/docs 2006-04-24 09:32:54 UTC (rev 2055)
@@ -1 +0,0 @@
-README.txt
Added: trunk/lucene/debian/liblucene-java-doc.dirs
===================================================================
--- trunk/lucene/debian/liblucene-java-doc.dirs 2006-04-23 05:17:12 UTC (rev 2054)
+++ trunk/lucene/debian/liblucene-java-doc.dirs 2006-04-24 09:32:54 UTC (rev 2055)
@@ -0,0 +1,2 @@
+var/lib/tomcat4/webapps
+usr/share/doc/liblucene-java-doc
Added: trunk/lucene/debian/liblucene-java-doc.doc-base
===================================================================
--- trunk/lucene/debian/liblucene-java-doc.doc-base 2006-04-23 05:17:12 UTC (rev 2054)
+++ trunk/lucene/debian/liblucene-java-doc.doc-base 2006-04-24 09:32:54 UTC (rev 2055)
@@ -0,0 +1,10 @@
+Document: liblucene-java-doc
+Title: API Javadoc for Apache Lucene Full-Text Search Library
+Author: Apache Lucene Project Team
+Abstract: This is the API Javadoc provided by the Apache
+ Lucene Full-Text Search Library
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/liblucene-java-doc/docs/index.html
+Files: /usr/share/doc/liblucene-java-doc/docs/*.html
Added: trunk/lucene/debian/liblucene-java.dirs
===================================================================
--- trunk/lucene/debian/liblucene-java.dirs 2006-04-23 05:17:12 UTC (rev 2054)
+++ trunk/lucene/debian/liblucene-java.dirs 2006-04-24 09:32:54 UTC (rev 2055)
@@ -0,0 +1 @@
+usr/share/java
Modified: trunk/lucene/debian/liblucene-java.docs
===================================================================
--- trunk/lucene/debian/liblucene-java.docs 2006-04-23 05:17:12 UTC (rev 2054)
+++ trunk/lucene/debian/liblucene-java.docs 2006-04-24 09:32:54 UTC (rev 2055)
@@ -1 +1 @@
-
+README.txt
Modified: trunk/lucene/debian/liblucene-java.links
===================================================================
--- trunk/lucene/debian/liblucene-java.links 2006-04-23 05:17:12 UTC (rev 2054)
+++ trunk/lucene/debian/liblucene-java.links 2006-04-24 09:32:54 UTC (rev 2055)
@@ -1 +1,2 @@
usr/share/java/lucene-1.4.3.jar usr/share/java/lucene.jar
+usr/share/java/lucene-demos-1.4.3.jar /usr/share/java/lucene-demos.jar
Modified: trunk/lucene/debian/patches/00list
===================================================================
--- trunk/lucene/debian/patches/00list 2006-04-23 05:17:12 UTC (rev 2054)
+++ trunk/lucene/debian/patches/00list 2006-04-24 09:32:54 UTC (rev 2055)
@@ -1,3 +1,3 @@
01_upstream_StandardTokenizer_fix
02_upstream_root_ant_build_fix
-
+04_exclude_TestRussianStem
Modified: trunk/lucene/debian/patches/01_upstream_StandardTokenizer_fix.dpatch
===================================================================
--- trunk/lucene/debian/patches/01_upstream_StandardTokenizer_fix.dpatch 2006-04-23 05:17:12 UTC (rev 2054)
+++ trunk/lucene/debian/patches/01_upstream_StandardTokenizer_fix.dpatch 2006-04-24 09:32:54 UTC (rev 2055)
@@ -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
Modified: trunk/lucene/debian/patches/02_upstream_root_ant_build_fix.dpatch
===================================================================
--- trunk/lucene/debian/patches/02_upstream_root_ant_build_fix.dpatch 2006-04-23 05:17:12 UTC (rev 2054)
+++ trunk/lucene/debian/patches/02_upstream_root_ant_build_fix.dpatch 2006-04-24 09:32:54 UTC (rev 2055)
@@ -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
Added: trunk/lucene/debian/patches/03_disable_test_failure.dpatch
===================================================================
--- trunk/lucene/debian/patches/03_disable_test_failure.dpatch 2006-04-23 05:17:12 UTC (rev 2054)
+++ trunk/lucene/debian/patches/03_disable_test_failure.dpatch 2006-04-24 09:32:54 UTC (rev 2055)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_disable_test_failure.dpatch by Barry Hawkins <barry at bytemason.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch to disable build failure to allow unit test reports to
+## DP: complete.
+
+ at DPATCH@
+
+--- lucene-1.4.3/build.xml 2005-09-20 15:54:10.000000000 -0400
++++ build-04.xml 2005-09-20 15:57:40.000000000 -0400
+@@ -265,7 +265,6 @@
+ </batchtest>
+ </junit>
+
+- <fail if="tests.failed">Tests failed!</fail>
+ </target>
+
+ <!-- backwards compatible target - may be removed -->
Added: trunk/lucene/debian/patches/04_exclude_TestRussianStem.dpatch
===================================================================
--- trunk/lucene/debian/patches/04_exclude_TestRussianStem.dpatch 2006-04-23 05:17:12 UTC (rev 2054)
+++ trunk/lucene/debian/patches/04_exclude_TestRussianStem.dpatch 2006-04-24 09:32:54 UTC (rev 2055)
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_disable_test_failure.dpatch by Barry Hawkins <barry at bytemason.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Patch to disable build failure to allow unit test reports to
+## DP: complete.
+
+ at DPATCH@
+
+--- lucene-1.4.3/build.xml 2005-09-20 19:23:42.000000000 -0400
++++ build-04.xml 2005-09-21 22:54:07.000000000 -0400
+@@ -261,7 +261,8 @@
+ <formatter type="xml"/>
+ <formatter type="brief" usefile="false"/>
+ <batchtest fork="yes" todir="${junit.output.dir}" unless="testcase">
+- <fileset dir="src/test" includes="**/Test*.java"/>
++ <fileset dir="src/test" includes="**/Test*.java"
++ excludes="org/apache/lucene/analysis/ru/TestRussianStem.java"/>
+ </batchtest>
+ <batchtest fork="yes" todir="${junit.output.dir}" if="testcase">
+ <fileset dir="src/test" includes="**/${testcase}.java"/>
Modified: trunk/lucene/debian/rules
===================================================================
--- trunk/lucene/debian/rules 2006-04-23 05:17:12 UTC (rev 2054)
+++ trunk/lucene/debian/rules 2006-04-24 09:32:54 UTC (rev 2055)
@@ -16,17 +16,17 @@
TEMPDIR=debian/tmp
# Set JAVA_HOME to be used for Java commands
-JAVA_HOME=/usr/lib/j2sdk1.4-sun
+JAVA_HOME=/usr/lib/kaffe
# Set the invocation of the java command;
JAVACMD=$(JAVA_HOME)/bin/java
-# Class path: Ant requires and JAXP-compatible XML parser
+# Class path: Ant requires a JAXP-compatible XML parser
# You need to set CLASSPATH here (even if your build.xml assembles its own
# class path) to ensure the same build results in all cases
JAVA_LIB=/usr/share/java
-ANT_HOME=/usr/share/ant1.6
-ANT_CLASSPATH=$(JAVA_LIB)/gnujaxp.jar:$(ANT_HOME)/lib/ant.jar:$(ANT_HOME)/lib/ant-launcher.jar:$(ANT_HOME)/lib/ant-junit.jar:$(JAVA_LIB)/junit.jar:$(JAVA_HOME)/lib/tools.jar
+ANT_HOME=/usr/share/ant
+ANT_CLASSPATH=$(JAVA_LIB)/gnujaxp.jar:$(ANT_HOME)/lib/ant.jar:$(ANT_HOME)/lib/ant-launcher.jar:$(ANT_HOME)/lib/ant-junit.jar:$(JAVA_LIB)/junit.jar:$(JAVA_LIB)/xalan2.jar:/usr/share/kaffe/Klasses.jar
# Set path to Ant properties file
ANT_PROPS=debian/ant.properties
@@ -35,7 +35,7 @@
# place '-verbose' before -propertyfile to
# obtain detailed build output.
ANT=$(JAVACMD) -classpath $(ANT_CLASSPATH) \
- org.apache.tools.ant.Main -propertyfile $(ANT_PROPS)
+ org.apache.tools.ant.Main -verbose -propertyfile $(ANT_PROPS)
build: build-stamp
@@ -43,7 +43,7 @@
dh_testdir
$(ANT) javacc
$(ANT) package
- $(ANT) test
+ $(ANT) test
touch build-stamp
clean: unpatch
@@ -73,8 +73,6 @@
dh_movefiles
-
-
# Build architecture-independent files here.
binary-indep: build install
# We have nothing to do by default.
@@ -83,28 +81,17 @@
binary-arch: build install
dh_testdir
dh_testroot
-# dh_installdebconf
dh_installdocs
dh_installexamples
dh_installmenu
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
-# dh_installinit
dh_installcron
dh_installman
dh_installinfo
-# dh_undocumented
- dh_installchangelogs
+ dh_installchangelogs
dh_link
- dh_strip
dh_compress
dh_fixperms
-# dh_makeshlibs
dh_installdeb
-# dh_perl
- dh_shlibdeps
dh_gencontrol
dh_md5sums
dh_builddeb
More information about the pkg-java-commits
mailing list