[lucene2] 22/104: Fixes for new upstream 2.2 release candidate
Kai-Chung Yan
seamlik-guest at moszumanska.debian.org
Wed Mar 23 16:27:26 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 cd229a74c409f745c4a781f640592f1285e2b102
Author: Jan-Pascal van Best <janpascal at vanbest.org>
Date: Wed Aug 1 20:31:18 2007 +0000
Fixes for new upstream 2.2 release candidate
---
debian/changelog | 8 ++++-
debian/download-upstream | 5 ++--
debian/patches/50_fix-contrib-db-libs.dpatch | 24 +++++++--------
.../patches/55_disable-db-jre-compilation.dpatch | 35 +++++++++++++++-------
debian/rules | 2 +-
debian/watch | 6 +++-
6 files changed, 52 insertions(+), 28 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index fde75c0..b509be2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,12 @@
-lucene2 (2.2.0-1~pre1) unstable; urgency=low
+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
+
* (still based on pre-release version)
-- Jan-Pascal van Best <janpascal at vanbest.org> Tue, 05 Jun 2007 16:25:29 +0200
diff --git a/debian/download-upstream b/debian/download-upstream
index 62c7841..534bb2d 100755
--- a/debian/download-upstream
+++ b/debian/download-upstream
@@ -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 @@ fi
# 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"
+
diff --git a/debian/patches/50_fix-contrib-db-libs.dpatch b/debian/patches/50_fix-contrib-db-libs.dpatch
index be0e037..cfbdac6 100755
--- a/debian/patches/50_fix-contrib-db-libs.dpatch
+++ b/debian/patches/50_fix-contrib-db-libs.dpatch
@@ -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 @@ diff -urNad trunk~/contrib/db/bdb/build.xml trunk/contrib/db/bdb/build.xml
<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>
diff --git a/debian/patches/55_disable-db-jre-compilation.dpatch b/debian/patches/55_disable-db-jre-compilation.dpatch
index e5522dd..0807157 100755
--- a/debian/patches/55_disable-db-jre-compilation.dpatch
+++ b/debian/patches/55_disable-db-jre-compilation.dpatch
@@ -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 @@ diff -urNad trunk~/build.xml trunk/build.xml
/>
<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 @@ diff -urNad trunk~/build.xml trunk/build.xml
</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 @@ diff -urNad trunk~/contrib/db/build.xml trunk/contrib/db/build.xml
<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/rules b/debian/rules
index a1daef5..a29d982 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@ DEBIAN_ARCH := $(shell dpkg-architecture | grep ^DEB_BUILD_ARCH= | cut -c 16-)
# 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
diff --git a/debian/watch b/debian/watch
index 8a4dc15..0b8c62b 100644
--- a/debian/watch
+++ b/debian/watch
@@ -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
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lucene2.git
More information about the pkg-java-commits
mailing list