Wed Mar 23 16:27:29 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 6f99487331a2fd34d8b275c1f7c63d78f6eb3c2f
Author: Varun Hiremath <varun at debian.org>
Date:   Sat Jan 26 10:50:25 2008 +0000

    * 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
---
 debian/changelog                                   | 24 +++++-
 debian/compat                                      |  2 +-
 debian/control                                     | 19 ++---
 debian/patches/00list                              |  8 +-
 debian/patches/10_fix-javacc-locations.dpatch      | 22 ++---
 .../patches/40_fix-contrib-benchmark-libs.dpatch   | 18 ++--
 .../patches/55_disable-db-jre-compilation.dpatch   | 96 ----------------------
 debian/patches/55_fix-contrib-db-je-libs.dpatch    | 41 +++++++++
 .../{ => old}/20_remove-gdata-server.dpatch        |  0
 .../{ => old}/80_fix-javadocs-classpath.dpatch     |  0
 .../patches/{ => old}/81_fix-javadocs-links.dpatch |  0
 .../82_fix-javadoc-external-link-for-gcj.dpatch    |  0
 12 files changed, 103 insertions(+), 127 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 46043fa..87a8464 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 @@ lucene2 (2.1.0-1) unstable; urgency=low
   * 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
-
diff --git a/debian/compat b/debian/compat
index b8626c4..1e8b314 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+6
diff --git a/debian/control b/debian/control
index 9569706..e2dd83f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,9 +4,7 @@ Priority: optional
 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 @@ Build-Depends-Indep: libjtidy-java (>= 7),
  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 @@ Depends: sun-java5-jre | sun-java6-jre,
  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 @@ Description: Full-text search engine library for Java(TM)
  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 @@ Description: Documentation for Lucene
  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/
diff --git a/debian/patches/00list b/debian/patches/00list
index 633e76c..07434fa 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -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
diff --git a/debian/patches/10_fix-javacc-locations.dpatch b/debian/patches/10_fix-javacc-locations.dpatch
index a5c89b5..9226d5d 100755
--- a/debian/patches/10_fix-javacc-locations.dpatch
+++ b/debian/patches/10_fix-javacc-locations.dpatch
@@ -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 @@ diff -urNad trunk~/common-build.xml trunk/common-build.xml
 +    classpath="${javacc.jar}"
      />
  
-   <available
+    <available
diff --git a/debian/patches/40_fix-contrib-benchmark-libs.dpatch b/debian/patches/40_fix-contrib-benchmark-libs.dpatch
index 622efe3..75dbdb8 100755
--- a/debian/patches/40_fix-contrib-benchmark-libs.dpatch
+++ b/debian/patches/40_fix-contrib-benchmark-libs.dpatch
@@ -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 @@ diff -urNad trunk~/contrib/benchmark/build.xml trunk/contrib/benchmark/build.xml
 -    <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 @@ diff -urNad trunk~/contrib/benchmark/build.xml trunk/contrib/benchmark/build.xml
 -        <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"/>
diff --git a/debian/patches/55_disable-db-jre-compilation.dpatch b/debian/patches/55_disable-db-jre-compilation.dpatch
deleted file mode 100755
index 66c0ae3..0000000
--- a/debian/patches/55_disable-db-jre-compilation.dpatch
+++ /dev/null
@@ -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>
diff --git a/debian/patches/55_fix-contrib-db-je-libs.dpatch b/debian/patches/55_fix-contrib-db-je-libs.dpatch
new file mode 100755
index 0000000..0111620
--- /dev/null
+++ b/debian/patches/55_fix-contrib-db-je-libs.dpatch
@@ -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>
diff --git a/debian/patches/20_remove-gdata-server.dpatch b/debian/patches/old/20_remove-gdata-server.dpatch
similarity index 100%
rename from debian/patches/20_remove-gdata-server.dpatch
rename to debian/patches/old/20_remove-gdata-server.dpatch
diff --git a/debian/patches/80_fix-javadocs-classpath.dpatch b/debian/patches/old/80_fix-javadocs-classpath.dpatch
similarity index 100%
rename from debian/patches/80_fix-javadocs-classpath.dpatch
rename to debian/patches/old/80_fix-javadocs-classpath.dpatch
diff --git a/debian/patches/81_fix-javadocs-links.dpatch b/debian/patches/old/81_fix-javadocs-links.dpatch
similarity index 100%
rename from debian/patches/81_fix-javadocs-links.dpatch
rename to debian/patches/old/81_fix-javadocs-links.dpatch
diff --git a/debian/patches/82_fix-javadoc-external-link-for-gcj.dpatch b/debian/patches/old/82_fix-javadoc-external-link-for-gcj.dpatch
similarity index 100%
rename from debian/patches/82_fix-javadoc-external-link-for-gcj.dpatch
rename to debian/patches/old/82_fix-javadoc-external-link-for-gcj.dpatch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lucene2.git

