[pkg-java] r3958 - in trunk/lucene2/debian: . patches

janpascal-guest at alioth.debian.org janpascal-guest at alioth.debian.org
Wed Aug 1 20:31:18 UTC 2007 

Author: janpascal-guest
Date: 2007-08-01 20:31:18 +0000 (Wed, 01 Aug 2007)
New Revision: 3958

Modified:
   trunk/lucene2/debian/changelog
   trunk/lucene2/debian/download-upstream
   trunk/lucene2/debian/patches/50_fix-contrib-db-libs.dpatch
   trunk/lucene2/debian/patches/55_disable-db-jre-compilation.dpatch
   trunk/lucene2/debian/rules
   trunk/lucene2/debian/watch
Log:
Fixes for new upstream 2.2 release candidate

Modified: trunk/lucene2/debian/changelog
===================================================================
--- trunk/lucene2/debian/changelog	2007-08-01 20:31:12 UTC (rev 3957)
+++ trunk/lucene2/debian/changelog	2007-08-01 20:31:18 UTC (rev 3958)
@@ -1,6 +1,12 @@
+lucene2 (2.2.0-1~pre2) unstable; urgency=low
+
+  * New upstream release (2.2.0)
+  * (fixes for new upstream 2.2.0 release candidate)
+
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Tue, 19 Jun 2007 13:28:49 +0200
+
 lucene2 (2.2.0-1~pre1) unstable; urgency=low
 
-  * New upstream release (2.2.0)
   * (still based on pre-release version)
 
  -- Jan-Pascal van Best <janpascal at vanbest.org>  Tue, 05 Jun 2007 16:25:29 +0200

Modified: trunk/lucene2/debian/download-upstream
===================================================================
--- trunk/lucene2/debian/download-upstream	2007-08-01 20:31:12 UTC (rev 3957)
+++ trunk/lucene2/debian/download-upstream	2007-08-01 20:31:18 UTC (rev 3958)
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-DEHS=`( uscan --dehs )`
+DEHS=`( uscan --dehs ; echo "</dehs>" )`
 
 URL=`echo $DEHS | xsltproc debian/uscan-url.xslt -`
 VERSION=`echo $DEHS | xsltproc debian/uscan-upstream-version.xslt -`
@@ -30,4 +30,5 @@
 # Check signature
 gpgv --quiet --keyring $KEYRING $SIGFILE $SOURCEFILE
 
-echo "Check whether the archive has been signed by Yorick Seeley, key ID 0AFCEE7C"
+echo "Check whether the archive has been signed by Michael Busch (Lucene Committer) <buschmi at apache.org>, key ID 6BD872A0"
+

Modified: trunk/lucene2/debian/patches/50_fix-contrib-db-libs.dpatch
===================================================================
--- trunk/lucene2/debian/patches/50_fix-contrib-db-libs.dpatch	2007-08-01 20:31:12 UTC (rev 3957)
+++ trunk/lucene2/debian/patches/50_fix-contrib-db-libs.dpatch	2007-08-01 20:31:18 UTC (rev 3958)
@@ -6,21 +6,21 @@
 
 @DPATCH@
 diff -urNad trunk~/contrib/db/bdb/build.xml trunk/contrib/db/bdb/build.xml
---- trunk~/contrib/db/bdb/build.xml	2007-06-04 06:02:15.000000000 +0200
-+++ trunk/contrib/db/bdb/build.xml	2007-06-05 13:42:30.000000000 +0200
+--- trunk~/contrib/db/bdb/build.xml     2007-06-19 13:08:27.000000000 +0200
++++ trunk/contrib/db/bdb/build.xml      2007-06-19 13:10:01.000000000 +0200
 @@ -8,7 +8,7 @@
    <property name="db.version" value="4.3.29" />
- 
+
    <path id="db.jar">
 -    <pathelement location="lib/db-${db.version}.jar" />
 +    <pathelement location="/usr/share/java/libdb4.3-java.jar" />
    </path>
- 
+
    <available classname="com.sleepycat.db.internal.Db" property="db.jar.exists">
-@@ -22,12 +22,6 @@
- 
+@@ -23,12 +23,6 @@
+
    <import file="../../contrib-build.xml" />
- 
+
 -  <target name="get-db-jar" unless="db.jar.exists">
 -    <mkdir dir="lib" />
 -    <get src="http://downloads.osafoundation.org/db/db-${db.version}.jar"
@@ -30,13 +30,13 @@
    <target name="sanity-load-lib" depends="compile-test">
      <java classname="org.apache.lucene.store.db.SanityLoadLibrary"
            classpathref="junit.classpath"
-@@ -54,7 +48,6 @@
+@@ -55,7 +49,6 @@
      <antcall target="common.test" inheritAll="true" inheritRefs="true" />
    </target>
- 
+
 -  <target name="check-and-get-db-jar" depends="get-db-jar" />
--  <target name="init" depends="common.init,check-and-get-db-jar" />
-+  <target name="init" depends="common.init" />
- 
+-  <target name="init" depends="contrib-build.init,check-and-get-db-jar" />
++  <target name="init" depends="contrib-build.init" />
+
  </project>
 

Modified: trunk/lucene2/debian/patches/55_disable-db-jre-compilation.dpatch
===================================================================
--- trunk/lucene2/debian/patches/55_disable-db-jre-compilation.dpatch	2007-08-01 20:31:12 UTC (rev 3957)
+++ trunk/lucene2/debian/patches/55_disable-db-jre-compilation.dpatch	2007-08-01 20:31:18 UTC (rev 3958)
@@ -6,17 +6,17 @@
 
 @DPATCH@
 diff -urNad trunk~/build.xml trunk/build.xml
---- trunk~/build.xml	2007-06-05 14:05:22.000000000 +0200
-+++ trunk/build.xml	2007-06-05 14:05:23.000000000 +0200
-@@ -29,6 +29,7 @@
+--- trunk~/build.xml	2007-06-19 13:39:47.000000000 +0200
++++ trunk/build.xml	2007-06-19 13:45:24.000000000 +0200
+@@ -46,6 +46,7 @@
      <fileset dir="contrib">
          <include name="**/*.jar"/>
  	<exclude name="gdata-server/**/*.jar"/>
-+	<exclude name="db/dbd-je/**/*.jar"/>
++        <exclude name="db/dbd-je/**/*.jar"/>
      </fileset>
    </path>
  
-@@ -52,11 +53,11 @@
+@@ -69,11 +70,11 @@
  
    <patternset id="src.dist.patterns"
                includes="src/,build.xml,*build*.xml,docs/,*.txt,contrib/,"
@@ -30,7 +30,7 @@
    />
    <patternset id="binary.root.dist.patterns"
                includes="src/demo/,src/jsp/,docs/,*.txt"
-@@ -372,7 +373,7 @@
+@@ -452,7 +453,7 @@
        <subant target="@{target}" failonerror="@{failonerror}">
          <fileset dir="."
                   includes="contrib/*/build.xml"
@@ -40,14 +40,13 @@
        </subant>
      </sequential>
 diff -urNad trunk~/contrib/db/build.xml trunk/contrib/db/build.xml
---- trunk~/contrib/db/build.xml	2007-06-04 06:02:15.000000000 +0200
-+++ trunk/contrib/db/build.xml	2007-06-05 14:05:52.000000000 +0200
-@@ -4,27 +4,21 @@
+--- trunk~/contrib/db/build.xml	2007-06-19 13:39:37.000000000 +0200
++++ trunk/contrib/db/build.xml	2007-06-19 13:46:48.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
-+      - bdb-je: using Berkeley DB Java Edition (removed for Debian)
    </description>
  
    <target name="bdb">
@@ -65,10 +64,24 @@
      <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>

Modified: trunk/lucene2/debian/rules
===================================================================
--- trunk/lucene2/debian/rules	2007-08-01 20:31:12 UTC (rev 3957)
+++ trunk/lucene2/debian/rules	2007-08-01 20:31:18 UTC (rev 3958)
@@ -20,7 +20,7 @@
 
 # Upstream Lucene version
 LUCENE_VERSION := $(shell echo $(DEBIAN_VERSION) | grep -o "^[[:digit:]\.]*")
-UPSTREAM_BASENAME = lucene-2.2-dev
+UPSTREAM_BASENAME = lucene-$(LUCENE_VERSION)
 
 # Explicitly build with sun-java5-jdk
 export JAVA_HOME = /usr/lib/jvm/java-1.5.0-sun

Modified: trunk/lucene2/debian/watch
===================================================================
--- trunk/lucene2/debian/watch	2007-08-01 20:31:12 UTC (rev 3957)
+++ trunk/lucene2/debian/watch	2007-08-01 20:31:18 UTC (rev 3958)
@@ -1,4 +1,8 @@
 version=3
 
-http://www.apache.org/dist/lucene/java/lucene-(.*)-src\.tar\.gz
+#http://www.apache.org/dist/lucene/java/lucene-(.*)-src\.tar\.gz
 
+# Staging area for 2.2
+http://people.apache.org/~buschmi/staging_area/lucene-2.2.0/lucene-(.*)-src\.tar\.gz
+
+

More information about the pkg-java-commits mailing list