[pkg-java] r5557 - in trunk/lucene2/debian: . patches patches/old
varun at alioth.debian.org
varun at alioth.debian.org
Sat Jan 26 10:50:25 UTC 2008
Author: varun
Date: 2008-01-26 10:50:25 +0000 (Sat, 26 Jan 2008)
New Revision: 5557
Added:
trunk/lucene2/debian/patches/55_fix-contrib-db-je-libs.dpatch
trunk/lucene2/debian/patches/old/20_remove-gdata-server.dpatch
trunk/lucene2/debian/patches/old/80_fix-javadocs-classpath.dpatch
trunk/lucene2/debian/patches/old/81_fix-javadocs-links.dpatch
trunk/lucene2/debian/patches/old/82_fix-javadoc-external-link-for-gcj.dpatch
Removed:
trunk/lucene2/debian/patches/20_remove-gdata-server.dpatch
trunk/lucene2/debian/patches/55_disable-db-jre-compilation.dpatch
trunk/lucene2/debian/patches/80_fix-javadocs-classpath.dpatch
trunk/lucene2/debian/patches/81_fix-javadocs-links.dpatch
trunk/lucene2/debian/patches/82_fix-javadoc-external-link-for-gcj.dpatch
Modified:
trunk/lucene2/debian/
trunk/lucene2/debian/changelog
trunk/lucene2/debian/compat
trunk/lucene2/debian/control
trunk/lucene2/debian/patches/00list
trunk/lucene2/debian/patches/10_fix-javacc-locations.dpatch
trunk/lucene2/debian/patches/40_fix-contrib-benchmark-libs.dpatch
Log:
* Not released yet because tests fail -> lucene2-2.3.0/build.xml:570:
Contrib tests failed!
* New upstream release
* debian/patches:
- Remove 55_disable-db-jre-compilation.dpatch
+ Add 55_fix-contrib-db-je-libs.dpatch to enable bdb-je integration
(Closes: #450569)
* Move the following patches to old dir as they are no longer applicable:
+ old/20_remove-gdata-server.dpatch
+ old/81_fix-javadocs-links.dpatch
+ old/82_fix-javadoc-external-link-for-gcj.dpatch
+ old/80_fix-javadocs-classpath.dpatch
* debian/control:
+ Add libdb-je-java to Build-Depends-Indep
+ Add Homepage header and replace XS-Vcs with Vcs
+ Bump debhelper compat to 6
+ Bump Standards-Version to 3.7.3
Property changes on: trunk/lucene2/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Modified: trunk/lucene2/debian/changelog
===================================================================
--- trunk/lucene2/debian/changelog 2008-01-26 10:44:28 UTC (rev 5556)
+++ trunk/lucene2/debian/changelog 2008-01-26 10:50:25 UTC (rev 5557)
@@ -1,3 +1,26 @@
+lucene2 (2.3.0-1) UNRELEASED; urgency=low
+
+ * Not released yet because tests fail -> lucene2-2.3.0/build.xml:570:
+ Contrib tests failed!
+
+ * New upstream release
+ * debian/patches:
+ - Remove 55_disable-db-jre-compilation.dpatch
+ + Add 55_fix-contrib-db-je-libs.dpatch to enable bdb-je integration
+ (Closes: #450569)
+ * Move the following patches to old dir as they are no longer applicable:
+ + old/20_remove-gdata-server.dpatch
+ + old/81_fix-javadocs-links.dpatch
+ + old/82_fix-javadoc-external-link-for-gcj.dpatch
+ + old/80_fix-javadocs-classpath.dpatch
+ * debian/control:
+ + Add libdb-je-java to Build-Depends-Indep
+ + Add Homepage header and replace XS-Vcs with Vcs
+ + Bump debhelper compat to 6
+ + Bump Standards-Version to 3.7.3
+
+ -- Varun Hiremath <varun at debian.org> Sat, 26 Jan 2008 15:26:56 +0530
+
lucene2 (2.2.0-2) unstable; urgency=low
* Use libdb4.5-java instead of libdb4.3-java, which is removed from Debian.
@@ -21,4 +44,3 @@
* Fixes compilation of lucli, dbd, dbd-je, regex contrib jar files
-- Jan-Pascal van Best <janpascal at vanbest.org> Tue, 10 Apr 2007 14:23:52 +0200
-
Modified: trunk/lucene2/debian/compat
===================================================================
--- trunk/lucene2/debian/compat 2008-01-26 10:44:28 UTC (rev 5556)
+++ trunk/lucene2/debian/compat 2008-01-26 10:50:25 UTC (rev 5557)
@@ -1 +1 @@
-4
+6
Modified: trunk/lucene2/debian/control
===================================================================
--- trunk/lucene2/debian/control 2008-01-26 10:44:28 UTC (rev 5556)
+++ trunk/lucene2/debian/control 2008-01-26 10:50:25 UTC (rev 5557)
@@ -4,9 +4,7 @@
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Jan-Pascal van Best <janpascal at vanbest.org>, Barry Hawkins <barry at alltc.com>,
Jeff Breidenbach <jab at debian.org>, Michael Koch <konqueror at gmx.de>
-XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/lucene2/
-XS-Vcs-svn: svn://svn.debian.org/svn/pkg-java/trunk/lucene2/
-Build-Depends: cdbs (>= 0.4.49), debhelper (>= 4.1.0), dpatch (>= 2.0),
+Build-Depends: cdbs (>= 0.4.49), debhelper (>= 6), dpatch (>= 2.0),
sun-java5-jre, sun-java5-jdk,
ant-optional, javacc, junit
Build-Depends-Indep: libjtidy-java (>= 7),
@@ -16,8 +14,12 @@
libdb4.5-java (>= 4.5.20),
libcommons-collections3-java (>= 3.1),
libcommons-logging-java (>= 1.0.4),
- libcommons-beanutils-java (>= 1.7.0)
-Standards-Version: 3.7.2
+ libcommons-beanutils-java (>= 1.7.0),
+ libdb-je-java
+Standards-Version: 3.7.3
+Homepage: http://lucene.apache.org/java/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/lucene2/
+Vcs-svn: svn://svn.debian.org/svn/pkg-java/trunk/lucene2/
Package: liblucene2-java
Architecture: all
@@ -29,7 +31,8 @@
libdb4.5-java (>= 4.5.20),
libcommons-collections3-java (>= 3.1),
libcommons-logging-java (>= 1.0.4),
- libcommons-beanutils-java (>= 1.7.0)
+ libcommons-beanutils-java (>= 1.7.0),
+ libdb-je-java
Description: Full-text search engine library for Java(TM)
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
@@ -39,8 +42,6 @@
also included: analyzers ant bdb benchmark demos highlighter lucli memory
queries regex similarity snowball spellchecker surround swing wordnet
xml-query-parser
- .
- Homepage: http://lucene.apache.org/java/
Package: liblucene2-java-doc
Architecture: all
@@ -51,5 +52,3 @@
Lucene is not a complete application, but rather a code library and API
that can easily be used to add search capabilities to applications.
This package contains class API documentation for Lucene.
- .
- Homepage: http://lucene.apache.org/java/
Modified: trunk/lucene2/debian/patches/00list
===================================================================
--- trunk/lucene2/debian/patches/00list 2008-01-26 10:44:28 UTC (rev 5556)
+++ trunk/lucene2/debian/patches/00list 2008-01-26 10:50:25 UTC (rev 5557)
@@ -1,12 +1,12 @@
01_remove_all_jarfiles.dpatch
10_fix-javacc-locations.dpatch
-20_remove-gdata-server.dpatch
+#20_remove-gdata-server.dpatch
30_fix-contrib-ant-libs.dpatch
40_fix-contrib-benchmark-libs.dpatch
50_fix-contrib-db-libs.dpatch
-55_disable-db-jre-compilation.dpatch
+55_fix-contrib-db-je-libs.dpatch
60_fix-contrib-lucli-libs.dpatch
61_lucli-script.dpatch
70_fix-contrib-regex-libs.dpatch
-80_fix-javadocs-classpath.dpatch
-81_fix-javadocs-links.dpatch
+#80_fix-javadocs-classpath.dpatch
+#81_fix-javadocs-links.dpatch
Modified: trunk/lucene2/debian/patches/10_fix-javacc-locations.dpatch
===================================================================
--- trunk/lucene2/debian/patches/10_fix-javacc-locations.dpatch 2008-01-26 10:44:28 UTC (rev 5556)
+++ trunk/lucene2/debian/patches/10_fix-javacc-locations.dpatch 2008-01-26 10:50:25 UTC (rev 5557)
@@ -5,18 +5,20 @@
## DP: Fix lucene's build configuration to find javacc
@DPATCH@
-diff -urNad trunk~/common-build.xml trunk/common-build.xml
---- trunk~/common-build.xml 2007-06-05 11:30:44.000000000 +0200
-+++ trunk/common-build.xml 2007-06-05 11:31:14.000000000 +0200
-@@ -39,6 +39,7 @@
- <property name="dist.dir" location="dist"/>
+diff -urNad lucene2-2.3.0~/common-build.xml lucene2-2.3.0/common-build.xml
+--- lucene2-2.3.0~/common-build.xml 2008-01-26 15:39:14.000000000 +0530
++++ lucene2-2.3.0/common-build.xml 2008-01-26 15:42:13.000000000 +0530
+@@ -69,7 +69,8 @@
+ <property name="m2.repository.url" value="file://${maven.dist.dir}"/>
+ <property name="m2.repository.private.key" value="${user.home}/.ssh/id_dsa"/>
- <property name="javacc.home" location="${common.dir}"/>
-+ <property name="javacc.jar" location="$(javacc.home}/bin/lib/javacc.jar"/>
+- <property name="javacc.home" location="${common.dir}"/>
++ <property name="javacc.home" location="/usr/share/java"/>
++ <property name="javacc.jar" location="${javacc.home}/javacc.jar"/>
+ <property name="jflex.home" location="${common.dir}"/>
<property name="junit.output.dir" location="${build.dir}/test"/>
- <property name="junit.reports" location="${build.dir}/test/reports"/>
-@@ -67,7 +68,7 @@
+@@ -101,7 +102,7 @@
<available
property="javacc.present"
classname="org.javacc.parser.Main"
@@ -24,4 +26,4 @@
+ classpath="${javacc.jar}"
/>
- <available
+ <available
Deleted: trunk/lucene2/debian/patches/20_remove-gdata-server.dpatch
===================================================================
--- trunk/lucene2/debian/patches/20_remove-gdata-server.dpatch 2008-01-26 10:44:28 UTC (rev 5556)
+++ trunk/lucene2/debian/patches/20_remove-gdata-server.dpatch 2008-01-26 10:50:25 UTC (rev 5557)
@@ -1,78 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 20_remove-gdata-server.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 trunk~/build.xml trunk/build.xml
---- trunk~/build.xml 2007-06-05 13:18:25.000000000 +0200
-+++ trunk/build.xml 2007-06-05 13:19:51.000000000 +0200
-@@ -28,6 +28,7 @@
- <!-- NOTE: gdata jars only used with jdk 5 but include them even for lower jdk -->
- <fileset dir="contrib">
- <include name="**/*.jar"/>
-+ <exclude name="gdata-server/**/*.jar"/>
- </fileset>
- </path>
-
-@@ -51,10 +52,11 @@
-
- <patternset id="src.dist.patterns"
- includes="src/,build.xml,*build*.xml,docs/,*.txt,contrib/,"
-- excludes="contrib/db/*/lib/,contrib/*/ext-libs/,src/site/build/"
-+ excludes="contrib/db/*/lib/,contrib/*/ext-libs/,src/site/build/,contrib/gdata-server/"
- />
- <patternset id="binary.build.dist.patterns"
- includes="${final.name}.jar,${demo.war.name}.war,${demo.name}.jar,docs/,contrib/*/*.jar"
-+ excludes="contrib/gdata-server/*.jar"
- />
- <patternset id="binary.root.dist.patterns"
- includes="src/demo/,src/jsp/,docs/,*.txt"
-@@ -370,6 +372,7 @@
- <subant target="@{target}" failonerror="@{failonerror}">
- <fileset dir="."
- includes="contrib/*/build.xml"
-+ excludes="contrib/gdata-server/build.xml"
- />
- </subant>
- </sequential>
-@@ -399,7 +402,7 @@
- <attribute name="access"/>
- <attribute name="destdir"/>
- <sequential>
--
-+ <!-- debian-ignore
- <dirset dir="contrib/gdata-server/src/core/src/java" id="gdata-server-core">
- <include name="**" if="build-1-5-contrib" />
- </dirset>
-@@ -409,6 +412,7 @@
- <dirset dir="contrib/gdata-server/src/hivemind/src/java" id="gdata-server-hivemind">
- <include name="**" if="build-1-5-contrib" />
- </dirset>
-+ -->
-
- <javadoc
- overview="src/java/overview.html"
-@@ -459,9 +463,11 @@
- <packageset dir="contrib/wordnet/src/java"/>
- <packageset dir="contrib/xml-query-parser/src/java"/>
- <!-- end alpha sort -->
-+ <!-- debian-ignore
- <packageset refid="gdata-server-core" />
- <packageset refid="gdata-server-gom" />
- <packageset refid="gdata-server-hivemind" />
-+ -->
-
- <!-- If the main javadoc Group listing includes an "Other -->
- <!-- Packages" group after the ones listed here, then those -->
-@@ -476,7 +482,9 @@
- <group title="contrib: Benchmark" packages="org.apache.lucene.benchmark*"/>
- <group title="contrib: DB" packages="org.apache.lucene.store.db*:org.apache.lucene.store.je*:com.sleepycat*"/>
- <group title="contrib: Highlighter" packages="org.apache.lucene.search.highlight*"/>
-+ <!-- debian-ignore
- <group title="contrib: GData Server (Java1.5)" packages="org.apache.lucene.gdata.*"/>
-+ -->
- <group title="contrib: Lucli" packages="lucli*"/>
- <group title="contrib: Memory" packages="org.apache.lucene.index.memory*"/>
- <group title="contrib: Miscellaneous " packages="org.apache.lucene.misc*:org.apache.lucene.queryParser.analyzing*:org.apache.lucene.queryParser.precedence*"/>
Modified: trunk/lucene2/debian/patches/40_fix-contrib-benchmark-libs.dpatch
===================================================================
--- trunk/lucene2/debian/patches/40_fix-contrib-benchmark-libs.dpatch 2008-01-26 10:44:28 UTC (rev 5556)
+++ trunk/lucene2/debian/patches/40_fix-contrib-benchmark-libs.dpatch 2008-01-26 10:50:25 UTC (rev 5557)
@@ -5,10 +5,10 @@
## DP: No description.
@DPATCH@
-diff -urNad trunk~/contrib/benchmark/build.xml trunk/contrib/benchmark/build.xml
---- trunk~/contrib/benchmark/build.xml 2007-06-04 06:02:17.000000000 +0200
-+++ trunk/contrib/benchmark/build.xml 2007-06-05 13:37:06.000000000 +0200
-@@ -81,18 +81,18 @@
+diff -urNad lucene2-2.3.0~/contrib/benchmark/build.xml lucene2-2.3.0/contrib/benchmark/build.xml
+--- lucene2-2.3.0~/contrib/benchmark/build.xml 2008-01-26 15:45:55.000000000 +0530
++++ lucene2-2.3.0/contrib/benchmark/build.xml 2008-01-26 15:55:12.000000000 +0530
+@@ -99,22 +99,22 @@
<antcall target="expand-reuters"/>
<antcall target="extract-reuters"/>
</target>
@@ -16,10 +16,14 @@
- <property name="collections.jar" value="commons-collections-3.1.jar"/>
- <property name="logging.jar" value="commons-logging-1.0.4.jar"/>
- <property name="bean-utils.jar" value="commons-beanutils-1.7.0.jar"/>
+- <property name="xercesImpl.jar" value="xerces-2.9.0.jar"/>
+- <property name="xml-apis.jar" value="xml-apis-2.9.0.jar"/>
+ <property name="digester.jar" value="commons-digester.jar"/>
-+ <property name="collections.jar" value="commons-collections-3.jar"/>
++ <property name="collections.jar" value="commons-collections.jar"/>
+ <property name="logging.jar" value="commons-logging.jar"/>
+ <property name="bean-utils.jar" value="commons-beanutils.jar"/>
++ <property name="xercesImpl.jar" value="xercesImpl.jar"/>
++ <property name="xml-apis.jar" value="xml-apis.jar"/>
<path id="classpath">
<pathelement path="${common.dir}/build/classes/java"/>
@@ -28,10 +32,14 @@
- <pathelement path="${basedir}/lib/${collections.jar}"/>
- <pathelement path="${basedir}/lib/${logging.jar}"/>
- <pathelement path="${basedir}/lib/${bean-utils.jar}"/>
+- <pathelement path="${basedir}/lib/${xercesImpl.jar}"/>
+- <pathelement path="${basedir}/lib/${xml-apis.jar}"/>
+ <pathelement path="/usr/share/java/${digester.jar}"/>
+ <pathelement path="/usr/share/java/${collections.jar}"/>
+ <pathelement path="/usr/share/java/${logging.jar}"/>
+ <pathelement path="/usr/share/java/${bean-utils.jar}"/>
++ <pathelement path="/usr/share/java/${xercesImpl.jar}"/>
++ <pathelement path="/usr/share/java/${xml-apis.jar}"/>
</path>
<path id="run.classpath">
<path refid="classpath"/>
Deleted: trunk/lucene2/debian/patches/55_disable-db-jre-compilation.dpatch
===================================================================
--- trunk/lucene2/debian/patches/55_disable-db-jre-compilation.dpatch 2008-01-26 10:44:28 UTC (rev 5556)
+++ trunk/lucene2/debian/patches/55_disable-db-jre-compilation.dpatch 2008-01-26 10:50:25 UTC (rev 5557)
@@ -1,96 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 55_disable-db-jre-compilation.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 trunk~/build.xml trunk/build.xml
---- trunk~/build.xml 2007-07-13 09:37:04.000000000 +0200
-+++ trunk/build.xml 2007-07-13 09:37:59.000000000 +0200
-@@ -46,6 +46,7 @@
- <fileset dir="contrib">
- <include name="**/*.jar"/>
- <exclude name="gdata-server/**/*.jar"/>
-+ <exclude name="db/dbd-je/**/*.jar"/>
- </fileset>
- </path>
-
-@@ -69,11 +70,11 @@
-
- <patternset id="src.dist.patterns"
- includes="src/,build.xml,*build*.xml,docs/,*.txt,contrib/,"
-- excludes="contrib/db/*/lib/,contrib/*/ext-libs/,src/site/build/,contrib/gdata-server/"
-+ excludes="contrib/db/*/lib/,contrib/*/ext-libs/,src/site/build/,contrib/gdata-server/,contrib/db/bdb-je/"
- />
- <patternset id="binary.build.dist.patterns"
- includes="${final.name}.jar,${demo.war.name}.war,${demo.name}.jar,docs/,contrib/*/*.jar"
-- excludes="contrib/gdata-server/*.jar"
-+ excludes="contrib/gdata-server/*.jar,contrib/db/bdb-je/*.jar"
- />
- <patternset id="binary.root.dist.patterns"
- includes="src/demo/,src/jsp/,docs/,*.txt"
-@@ -452,7 +453,7 @@
- <subant target="@{target}" failonerror="@{failonerror}">
- <fileset dir="."
- includes="contrib/*/build.xml"
-- excludes="contrib/gdata-server/build.xml"
-+ excludes="contrib/gdata-server/build.xml,contrib/db/bdb-je/build.xml"
- />
- </subant>
- </sequential>
-@@ -533,7 +534,7 @@
- <packageset dir="contrib/analyzers/src/java"/>
- <packageset dir="contrib/ant/src/java"/>
- <packageset dir="contrib/benchmark/src/java"/>
-- <packageset dir="contrib/db/bdb-je/src/java"/>
-+ <!-- debian-ignore <packageset dir="contrib/db/bdb-je/src/java"/> -->
- <packageset dir="contrib/db/bdb/src/java"/>
- <packageset dir="contrib/highlighter/src/java"/>
- <packageset dir="contrib/lucli/src/java"/>
-diff -urNad trunk~/contrib/db/build.xml trunk/contrib/db/build.xml
---- trunk~/contrib/db/build.xml 2007-07-13 09:37:02.000000000 +0200
-+++ trunk/contrib/db/build.xml 2007-07-13 09:37:05.000000000 +0200
-@@ -22,41 +22,31 @@
- <description>
- Lucene DB integration
- - bdb: using the Java interface of C Berkeley DB
-- - bdb-je: using Berkeley DB Java Edition
- </description>
-
- <target name="bdb">
- <ant dir="bdb" />
- </target>
-
-- <target name="bdb-je">
-- <ant dir="bdb-je" />
-- </target>
--
-- <target name="default" depends="bdb,bdb-je" />
-+ <target name="default" depends="bdb" />
-
- <target name="clean">
- <ant dir="bdb" target="clean" />
-- <ant dir="bdb-je" target="clean" />
- </target>
- <target name="compile-core">
- <ant dir="bdb" target="compile-core" />
-- <ant dir="bdb-je" target="compile-core" />
- </target>
- <target name="compile-test">
- <ant dir="bdb" target="compile-test" />
-- <ant dir="bdb-je" target="compile-test" />
- </target>
- <target name="test">
- <ant dir="bdb" target="test" />
-- <ant dir="bdb-je" target="test" />
- </target>
-
- <target name="build-artifacts-and-tests" depends="default,compile-test" />
-
- <target name="dist-maven" depends="default">
- <ant dir="bdb" target="dist-maven" />
-- <ant dir="bdb-je" target="dist-maven" />
- </target>
-
- </project>
Added: trunk/lucene2/debian/patches/55_fix-contrib-db-je-libs.dpatch
===================================================================
--- trunk/lucene2/debian/patches/55_fix-contrib-db-je-libs.dpatch (rev 0)
+++ trunk/lucene2/debian/patches/55_fix-contrib-db-je-libs.dpatch 2008-01-26 10:50:25 UTC (rev 5557)
@@ -0,0 +1,41 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 55_fix-contrib-db-jre-compilation.dpatch by <varun at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad lucene2-2.2.0~/contrib/db/bdb-je/build.xml lucene2-2.2.0/contrib/db/bdb-je/build.xml
+--- lucene2-2.2.0~/contrib/db/bdb-je/build.xml 2007-06-17 10:50:55.000000000 +0530
++++ lucene2-2.2.0/contrib/db/bdb-je/build.xml 2008-01-26 15:14:11.000000000 +0530
+@@ -5,10 +5,8 @@
+ Lucene Berkeley DB Java Edition integration
+ </description>
+
+- <property name="je.version" value="2.0.90" />
+-
+ <path id="je.jar">
+- <pathelement location="lib/je-${je.version}/lib/je.jar" />
++ <pathelement location="/usr/share/java/db-je.jar" />
+ </path>
+
+ <available classname="com.sleepycat.je.Database" property="je.jar.exists">
+@@ -23,17 +21,5 @@
+
+ <import file="../../contrib-build.xml" />
+
+- <target name="get-je-jar" unless="je.jar.exists">
+- <mkdir dir="lib" />
+- <get src="http://downloads.sleepycat.com/je-${je.version}.zip"
+- dest="lib/je-${je.version}.zip" />
+- <unzip src="lib/je-${je.version}.zip" dest="lib">
+- <patternset>
+- <include name="je-${je.version}/lib/je.jar" />
+- </patternset>
+- </unzip>
+- </target>
+-
+- <target name="check-and-get-je-jar" depends="get-je-jar" />
+- <target name="init" depends="contrib-build.init,check-and-get-je-jar" />
++ <target name="init" depends="contrib-build.init" />
+ </project>
Property changes on: trunk/lucene2/debian/patches/55_fix-contrib-db-je-libs.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Deleted: trunk/lucene2/debian/patches/80_fix-javadocs-classpath.dpatch
===================================================================
--- trunk/lucene2/debian/patches/80_fix-javadocs-classpath.dpatch 2008-01-26 10:44:28 UTC (rev 5556)
+++ trunk/lucene2/debian/patches/80_fix-javadocs-classpath.dpatch 2008-01-26 10:50:25 UTC (rev 5557)
@@ -1,23 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 80_fix-javadocs.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add depencies to the Javadoc classpath to avoid warnings during
-## DP: generation of the apidocs.
-
- at DPATCH@
-diff -urNad trunk~/build.xml trunk/build.xml
---- trunk~/build.xml 2007-07-13 09:35:18.000000000 +0200
-+++ trunk/build.xml 2007-07-13 09:35:42.000000000 +0200
-@@ -41,6 +41,11 @@
- <path id="javadoc.classpath">
- <path refid="classpath"/>
- <pathelement location="${ant.home}/lib/ant.jar"/>
-+ <pathelement location="/usr/share/java/commons-digester.jar"/>
-+ <pathelement location="/usr/share/java/jline.jar"/>
-+ <pathelement location="/usr/share/java/jtidy.jar"/>
-+ <pathelement location="/usr/share/java/libdb4.3-java.jar"/>
-+ <pathelement location="/usr/share/java/regexp.jar"/>
-
- <!-- NOTE: gdata jars only used with jdk 5 but include them even for lower jdk -->
- <fileset dir="contrib">
Deleted: trunk/lucene2/debian/patches/81_fix-javadocs-links.dpatch
===================================================================
--- trunk/lucene2/debian/patches/81_fix-javadocs-links.dpatch 2008-01-26 10:44:28 UTC (rev 5556)
+++ trunk/lucene2/debian/patches/81_fix-javadocs-links.dpatch 2008-01-26 10:50:25 UTC (rev 5557)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 81_fix-javadocs-links.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 trunk~/build.xml trunk/build.xml
---- trunk~/build.xml 2007-07-13 10:09:09.000000000 +0200
-+++ trunk/build.xml 2007-07-13 10:09:36.000000000 +0200
-@@ -595,6 +595,8 @@
-
- <classpath refid="javadoc.classpath"/>
-
-+ <link href="file:///usr/share/doc/libregexp-java/api"/>
-+ <link href="/usr/share/doc/ant-doc/javadocs"/>
- </javadoc>
-
- </sequential>
Deleted: trunk/lucene2/debian/patches/82_fix-javadoc-external-link-for-gcj.dpatch
===================================================================
--- trunk/lucene2/debian/patches/82_fix-javadoc-external-link-for-gcj.dpatch 2008-01-26 10:44:28 UTC (rev 5556)
+++ trunk/lucene2/debian/patches/82_fix-javadoc-external-link-for-gcj.dpatch 2008-01-26 10:50:25 UTC (rev 5557)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 82_fix-javadoc-external-link-for-gcj.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: It seems the html doclet included with gcj cannot handle the http
-## DP: redirect sent by the Sun web server
-
- at DPATCH@
-diff -urNad lucene2~/build.xml lucene2/build.xml
---- lucene2~/build.xml 2007-08-08 14:27:26.000000000 +0200
-+++ lucene2/build.xml 2007-08-08 14:27:46.000000000 +0200
-@@ -27,7 +27,7 @@
-
- <property name="demo.name" value="lucene-demos-${version}"/>
- <property name="demo.war.name" value="luceneweb"/>
-- <property name="javadoc.link" value="http://java.sun.com/j2se/1.4/docs/api/"/>
-+ <property name="javadoc.link" value="http://java.sun.com/j2se/1.4.2/docs/api/"/>
-
- <!-- Type of checksum to compute for distribution files -->
- <property name="checksum.algorithm" value="md5" />
Copied: trunk/lucene2/debian/patches/old/20_remove-gdata-server.dpatch (from rev 5555, trunk/lucene2/debian/patches/20_remove-gdata-server.dpatch)
===================================================================
--- trunk/lucene2/debian/patches/old/20_remove-gdata-server.dpatch (rev 0)
+++ trunk/lucene2/debian/patches/old/20_remove-gdata-server.dpatch 2008-01-26 10:50:25 UTC (rev 5557)
@@ -0,0 +1,78 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 20_remove-gdata-server.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 trunk~/build.xml trunk/build.xml
+--- trunk~/build.xml 2007-06-05 13:18:25.000000000 +0200
++++ trunk/build.xml 2007-06-05 13:19:51.000000000 +0200
+@@ -28,6 +28,7 @@
+ <!-- NOTE: gdata jars only used with jdk 5 but include them even for lower jdk -->
+ <fileset dir="contrib">
+ <include name="**/*.jar"/>
++ <exclude name="gdata-server/**/*.jar"/>
+ </fileset>
+ </path>
+
+@@ -51,10 +52,11 @@
+
+ <patternset id="src.dist.patterns"
+ includes="src/,build.xml,*build*.xml,docs/,*.txt,contrib/,"
+- excludes="contrib/db/*/lib/,contrib/*/ext-libs/,src/site/build/"
++ excludes="contrib/db/*/lib/,contrib/*/ext-libs/,src/site/build/,contrib/gdata-server/"
+ />
+ <patternset id="binary.build.dist.patterns"
+ includes="${final.name}.jar,${demo.war.name}.war,${demo.name}.jar,docs/,contrib/*/*.jar"
++ excludes="contrib/gdata-server/*.jar"
+ />
+ <patternset id="binary.root.dist.patterns"
+ includes="src/demo/,src/jsp/,docs/,*.txt"
+@@ -370,6 +372,7 @@
+ <subant target="@{target}" failonerror="@{failonerror}">
+ <fileset dir="."
+ includes="contrib/*/build.xml"
++ excludes="contrib/gdata-server/build.xml"
+ />
+ </subant>
+ </sequential>
+@@ -399,7 +402,7 @@
+ <attribute name="access"/>
+ <attribute name="destdir"/>
+ <sequential>
+-
++ <!-- debian-ignore
+ <dirset dir="contrib/gdata-server/src/core/src/java" id="gdata-server-core">
+ <include name="**" if="build-1-5-contrib" />
+ </dirset>
+@@ -409,6 +412,7 @@
+ <dirset dir="contrib/gdata-server/src/hivemind/src/java" id="gdata-server-hivemind">
+ <include name="**" if="build-1-5-contrib" />
+ </dirset>
++ -->
+
+ <javadoc
+ overview="src/java/overview.html"
+@@ -459,9 +463,11 @@
+ <packageset dir="contrib/wordnet/src/java"/>
+ <packageset dir="contrib/xml-query-parser/src/java"/>
+ <!-- end alpha sort -->
++ <!-- debian-ignore
+ <packageset refid="gdata-server-core" />
+ <packageset refid="gdata-server-gom" />
+ <packageset refid="gdata-server-hivemind" />
++ -->
+
+ <!-- If the main javadoc Group listing includes an "Other -->
+ <!-- Packages" group after the ones listed here, then those -->
+@@ -476,7 +482,9 @@
+ <group title="contrib: Benchmark" packages="org.apache.lucene.benchmark*"/>
+ <group title="contrib: DB" packages="org.apache.lucene.store.db*:org.apache.lucene.store.je*:com.sleepycat*"/>
+ <group title="contrib: Highlighter" packages="org.apache.lucene.search.highlight*"/>
++ <!-- debian-ignore
+ <group title="contrib: GData Server (Java1.5)" packages="org.apache.lucene.gdata.*"/>
++ -->
+ <group title="contrib: Lucli" packages="lucli*"/>
+ <group title="contrib: Memory" packages="org.apache.lucene.index.memory*"/>
+ <group title="contrib: Miscellaneous " packages="org.apache.lucene.misc*:org.apache.lucene.queryParser.analyzing*:org.apache.lucene.queryParser.precedence*"/>
Copied: trunk/lucene2/debian/patches/old/80_fix-javadocs-classpath.dpatch (from rev 5555, trunk/lucene2/debian/patches/80_fix-javadocs-classpath.dpatch)
===================================================================
--- trunk/lucene2/debian/patches/old/80_fix-javadocs-classpath.dpatch (rev 0)
+++ trunk/lucene2/debian/patches/old/80_fix-javadocs-classpath.dpatch 2008-01-26 10:50:25 UTC (rev 5557)
@@ -0,0 +1,23 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 80_fix-javadocs.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add depencies to the Javadoc classpath to avoid warnings during
+## DP: generation of the apidocs.
+
+ at DPATCH@
+diff -urNad trunk~/build.xml trunk/build.xml
+--- trunk~/build.xml 2007-07-13 09:35:18.000000000 +0200
++++ trunk/build.xml 2007-07-13 09:35:42.000000000 +0200
+@@ -41,6 +41,11 @@
+ <path id="javadoc.classpath">
+ <path refid="classpath"/>
+ <pathelement location="${ant.home}/lib/ant.jar"/>
++ <pathelement location="/usr/share/java/commons-digester.jar"/>
++ <pathelement location="/usr/share/java/jline.jar"/>
++ <pathelement location="/usr/share/java/jtidy.jar"/>
++ <pathelement location="/usr/share/java/libdb4.3-java.jar"/>
++ <pathelement location="/usr/share/java/regexp.jar"/>
+
+ <!-- NOTE: gdata jars only used with jdk 5 but include them even for lower jdk -->
+ <fileset dir="contrib">
Copied: trunk/lucene2/debian/patches/old/81_fix-javadocs-links.dpatch (from rev 5555, trunk/lucene2/debian/patches/81_fix-javadocs-links.dpatch)
===================================================================
--- trunk/lucene2/debian/patches/old/81_fix-javadocs-links.dpatch (rev 0)
+++ trunk/lucene2/debian/patches/old/81_fix-javadocs-links.dpatch 2008-01-26 10:50:25 UTC (rev 5557)
@@ -0,0 +1,19 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 81_fix-javadocs-links.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 trunk~/build.xml trunk/build.xml
+--- trunk~/build.xml 2007-07-13 10:09:09.000000000 +0200
++++ trunk/build.xml 2007-07-13 10:09:36.000000000 +0200
+@@ -595,6 +595,8 @@
+
+ <classpath refid="javadoc.classpath"/>
+
++ <link href="file:///usr/share/doc/libregexp-java/api"/>
++ <link href="/usr/share/doc/ant-doc/javadocs"/>
+ </javadoc>
+
+ </sequential>
Copied: trunk/lucene2/debian/patches/old/82_fix-javadoc-external-link-for-gcj.dpatch (from rev 5555, trunk/lucene2/debian/patches/82_fix-javadoc-external-link-for-gcj.dpatch)
===================================================================
--- trunk/lucene2/debian/patches/old/82_fix-javadoc-external-link-for-gcj.dpatch (rev 0)
+++ trunk/lucene2/debian/patches/old/82_fix-javadoc-external-link-for-gcj.dpatch 2008-01-26 10:50:25 UTC (rev 5557)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 82_fix-javadoc-external-link-for-gcj.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: It seems the html doclet included with gcj cannot handle the http
+## DP: redirect sent by the Sun web server
+
+ at DPATCH@
+diff -urNad lucene2~/build.xml lucene2/build.xml
+--- lucene2~/build.xml 2007-08-08 14:27:26.000000000 +0200
++++ lucene2/build.xml 2007-08-08 14:27:46.000000000 +0200
+@@ -27,7 +27,7 @@
+
+ <property name="demo.name" value="lucene-demos-${version}"/>
+ <property name="demo.war.name" value="luceneweb"/>
+- <property name="javadoc.link" value="http://java.sun.com/j2se/1.4/docs/api/"/>
++ <property name="javadoc.link" value="http://java.sun.com/j2se/1.4.2/docs/api/"/>
+
+ <!-- Type of checksum to compute for distribution files -->
+ <property name="checksum.algorithm" value="md5" />
More information about the pkg-java-commits
mailing list