[SCM] Lucene 3 - Full-text search engine library for Java(TM) - Debian packaging branch, master, updated. upstream/3.4.0-23-g5c4f3cc
The following commit has been merged in the master branch: commit 07f7e3d56dad52bc2ee00abe546022ecda504ffb Author: James Page Date: Tue Nov 29 09:21:59 2011 + Refreshed patches diff --git a/debian/patches/add-osgi-manifest b/debian/patches/add-osgi-manifest index e1a7b8d..929bc2e 100644 --- a/debian/patches/add-osgi-manifest +++ b/debian/patches/add-osgi-manifest @@ -5,9 +5,9 @@ Author: Mat Scales (debianization) Origin: https://issues.apache.org/jira/browse/LUCENE-3167 Index: lucene3/common-build.xml === lucene3.orig/common-build.xml 2011-10-14 16:21:34.0 +0100 -+++ lucene3/common-build.xml 2011-10-14 16:23:38.902121613 +0100 -@@ -361,42 +361,17 @@ +--- lucene3.orig/common-build.xml 2011-11-29 09:21:38.245633846 + lucene3/common-build.xml 2011-11-29 09:21:38.521634620 + +@@ -365,42 +365,17 @@ diff --git a/debian/patches/build-versionless-jars.patch b/debian/patches/build-versionless-jars.patch index d08c987..905f2bd 100644 --- a/debian/patches/build-versionless-jars.patch +++ b/debian/patches/build-versionless-jars.patch @@ -1,7 +1,7 @@ Index: lucene3/common-build.xml === lucene3.orig/common-build.xml 2011-10-14 17:34:18.0 +0100 -+++ lucene3/common-build.xml 2011-10-14 17:34:45.452484050 +0100 +--- lucene3.orig/common-build.xml 2011-11-29 09:21:38.521634620 + lucene3/common-build.xml 2011-11-29 09:21:38.817635447 + @@ -50,7 +50,7 @@ @@ -11,7 +11,7 @@ Index: lucene3/common-build.xml -@@ -136,7 +136,7 @@ +@@ -138,7 +138,7 @@ @@ -20,7 +20,7 @@ Index: lucene3/common-build.xml -@@ -399,7 +399,7 @@ +@@ -403,7 +403,7 @@ @@ -31,8 +31,8 @@ Index: lucene3/common-build.xml Index: lucene3/contrib/contrib-build.xml === lucene3.orig/contrib/contrib-build.xml 2011-10-14 17:34:18.0 +0100 -+++ lucene3/contrib/contrib-build.xml 2011-10-14 17:34:18.0 +0100 +--- lucene3.orig/contrib/contrib-build.xml 2011-11-29 09:21:37.909632906 + lucene3/contrib/contrib-build.xml 2011-11-29 09:21:38.817635447 + @@ -118,7 +118,7 @@ @@ -42,8 +42,8 @@ Index: lucene3/contrib/contrib-build.xml -@@ -129,7 +129,7 @@ - +@@ -140,7 +140,7 @@ + - @@ -51,7 +51,7 @@ Index: lucene3/contrib/contrib-build.xml -@@ -140,7 +140,7 @@ +@@ -151,7 +151,7 @@ @@ -60,7 +60,7 @@ Index: lucene3/contrib/contrib-build.xml -@@ -151,7 +151,7 @@ +@@ -162,7 +162,7 @@ @@ -69,7 +69,7 @@ Index: lucene3/contrib/contrib-build.xml -@@ -162,7 +162,7 @@ +@@ -173,7 +173,7 @@ @@ -78,7 +78,7 @@ Index: lucene3/contrib/contrib-build.xml -@@ -173,7 +173,7 @@ +@@ -184,7 +184,7 @@ @@ -87,7 +87,7 @@ Index: lucene3/contrib/contrib-build.xml -@@ -184,7 +184,7 @@ +@@ -195,7 +195,7 @@ @@ -96,7 +96,7 @@ Index: lucene3/contrib/contrib-build.xml -@@ -195,7 +195,7 @@ +@@ -206,7 +206,7 @@ @@ -105,7 +105,7 @@ Index: lucene3/contrib/contrib-build.xml -@@ -206,7 +206,7 @@ +@@ -217,7 +217,7 @@ @@ -114,7 +114,7 @@ Index: lucene3/contrib/contrib-build.xml -@@ -217,7 +217,7 @@ +@@ -228,7 +228,7 @@ @@ -123,7 +123,7 @@ Index: lucene3/contrib/contrib-build.xml -@@ -228,7 +228,7 @@ +@@ -239,7 +239,7 @@ @@ -132,7 +132,7 @@ Index: lucene3/contrib/contrib-build.xml -@@ -239,7 +239,7 @@ +@@ -250,7 +250,7 @@ diff --git a/debian/patches/disable-tests b/debian/patches/disable-tests index 9cc1e68..8de5bb1 100644 --- a/debian/patches/disable-tests +++ b/debian/patches/disable-tests @@ -4,8 +4,8 @@ Description: Disable the building and running of the test framework Author: Mat Scales Index: lucene3/build.xml === lucene3.orig/build.xml 2011-10-14 16:19:41.443617649 +0100 -+++ lucene3/build.xml 2011-10-14 16:19:47.543679903 +0100 +--- lucene3.orig/build.xml 2011-11-29 09:21:37.509631787 + lucene3/build.xml 2011-11-29 09:21:37.905632895 + @@ -182,7 +182,7 @@ @@ -23,7 +23,7 @@ Index: lucene3/build.xml Contrib packages: ]]> -@@ -587,8 +586,7 @@ +@@ -589,8 +588,7 @@ @@ -35,8 +35,8 @@ Index: lucene3/build.xml Index: lucene3/contrib/analyzers/build.xml === lucene3.orig/contrib/analyzers/build.xml 2011-10-14 15:58:55.295345399 +0100 -+++ lucene3/contrib/analyzers/build.xml2011-10-14 16:19:47.543679903 +0100 +--- lucene3.o
[SCM] Lucene 3 - Full-text search engine library for Java(TM) - Debian packaging branch, master, updated. upstream/3.4.0-23-g5c4f3cc
The following commit has been merged in the master branch: commit 5c4f3ccd15797d20c42c1efd97896fa175823f46 Author: James Page Date: Fri Dec 23 09:55:03 2011 + Updates for 3.5.0 diff --git a/debian/liblucene3-contrib-java.jlibs b/debian/liblucene3-contrib-java.jlibs index 8f4c081..35c894b 100644 --- a/debian/liblucene3-contrib-java.jlibs +++ b/debian/liblucene3-contrib-java.jlibs @@ -15,3 +15,4 @@ build/contrib/remote/lucene-remote.jar build/contrib/spatial/lucene-spatial.jar build/contrib/spellchecker/lucene-spellchecker.jar build/contrib/xml-query-parser/lucene-xml-query-parser.jar +build/contrib/facet/lucene-facet.jar diff --git a/debian/patches/build-versionless-jars.patch b/debian/patches/build-versionless-jars.patch index 905f2bd..6e71a58 100644 --- a/debian/patches/build-versionless-jars.patch +++ b/debian/patches/build-versionless-jars.patch @@ -1,7 +1,7 @@ Index: lucene3/common-build.xml === lucene3.orig/common-build.xml 2011-11-29 09:21:38.521634620 + -+++ lucene3/common-build.xml 2011-11-29 09:21:38.817635447 + +--- lucene3.orig/common-build.xml 2011-11-29 09:57:02.859567072 + lucene3/common-build.xml 2011-11-29 09:57:04.075570426 + @@ -50,7 +50,7 @@ @@ -31,8 +31,8 @@ Index: lucene3/common-build.xml Index: lucene3/contrib/contrib-build.xml === lucene3.orig/contrib/contrib-build.xml 2011-11-29 09:21:37.909632906 + -+++ lucene3/contrib/contrib-build.xml 2011-11-29 09:21:38.817635447 + +--- lucene3.orig/contrib/contrib-build.xml 2011-11-29 09:56:59.515557848 + lucene3/contrib/contrib-build.xml 2011-11-29 09:57:21.823619368 + @@ -118,7 +118,7 @@ @@ -42,6 +42,15 @@ Index: lucene3/contrib/contrib-build.xml +@@ -129,7 +129,7 @@ + + + +- ++ + + + @@ -140,7 +140,7 @@ -- Lucene 3 - Full-text search engine library for Java(TM) - Debian packaging ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] Lucene 3 - Full-text search engine library for Java(TM) - Debian packaging branch, master, updated. upstream/3.4.0-23-g5c4f3cc
The following commit has been merged in the master branch:
commit 65b160f2816e706f9158ad554f9d0220fe5831a4
Author: James Page
Date: Tue Nov 29 09:38:12 2011 +
Added new (build)deps and Vcs fields
diff --git a/debian/control b/debian/control
index 46fc477..4905e8a 100644
--- a/debian/control
+++ b/debian/control
@@ -5,21 +5,29 @@ Maintainer: Debian Java Maintainers
, James Page
Homepage: http://lucene.apache.org/java/
Standards-Version: 3.9.2
-Build-Depends: ant,
- bnd,
- debhelper (>= 8),
- default-jdk,
- javahelper,
- javacc,
- jflex,
- libcommons-beanutils-java,
- libcommons-collections3-java,
- libcommons-compress-java,
- libcommons-digester-java,
- libcommons-logging-java,
- libicu4j-4.4-java,
- libregexp-java,
- libxerces2-java
+Build-Depends:
+ ant,
+ bnd,
+ debhelper (>= 8),
+ default-jdk,
+ javacc,
+ javahelper,
+ jflex,
+ libavalon-framework-java,
+ libcommons-beanutils-java,
+ libcommons-collections3-java,
+ libcommons-compress-java,
+ libcommons-digester-java,
+ libcommons-logging-java,
+ libexcalibur-logkit-java,
+ libicu4j-4.4-java,
+ liblog4j1.2-java,
+ libregexp-java,
+ libxerces2-java,
+ libxml-commons-external-java,
+ libxml-commons-resolver1.1-java
+Vcs-Git: git://git.debian.org/git/pkg-java/lucene3.git
+Vcs-Browser: http://git.debian.org/?p=pkg-java/lucene3.git
Package: liblucene3-java
Architecture: all
@@ -38,14 +46,20 @@ Package: liblucene3-contrib-java
Architecture: all
Depends: liblucene3-java, ${misc:Depends}
Suggests: liblucene3-java-doc
-Recommends: libcommons-beanutils-java,
-libcommons-collections3-java,
-libcommons-compress-java,
-libcommons-digester-java,
-libcommons-logging-java,
-libicu4j-4.4-java,
-libregexp-java,
-libxerces2-java
+Recommends:
+ libavalon-framework-java,
+ libcommons-beanutils-java,
+ libcommons-collections3-java,
+ libcommons-compress-java,
+ libcommons-digester-java,
+ libcommons-logging-java,
+ libexcalibur-logkit-java,
+ libicu4j-4.4-java,
+ liblog4j1.2-java,
+ libregexp-java,
+ libxerces2-java,
+ libxml-commons-external-java,
+ libxml-commons-resolver1.1-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
diff --git a/debian/copyright b/debian/copyright
index cff1e43..3707ae4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,5 @@
Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174
-Upstream-Name: Apache Lucene
+Upstream-Name: Apache Lucene
Source: http://lucene.apache.org/java/docs/releases.html
The source orig.tar.gz for this Debian package was created by downloading the
upstream source and removing embedded libraries that are packaged in Debian.
@@ -30,7 +30,7 @@ License: PSF-2.4 and Apache-2
Files:
contrib/analyzers/common/src/java/org/apache/lucene/analysis/en/KStemmer.java
contrib/analyzers/common/src/java/org/apache/lucene/analysis/en/KStemData*.java
-Copyright: 2003 Center for Intelligent Information Retrieval,
+Copyright: 2003 Center for Intelligent Information Retrieval,
University of Massachusetts, Amherst.
License: CIIR and Apache-2
--
Lucene 3 - Full-text search engine library for Java(TM) - Debian packaging
___
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] Lucene 3 - Full-text search engine library for Java(TM) - Debian packaging branch, master, updated. upstream/3.4.0-23-g5c4f3cc
The following commit has been merged in the master branch: commit 18333fb993716a28f1f6728f3b45f636adc0dcc6 Author: James Page Date: Tue Nov 29 09:20:56 2011 + New Upstream Version diff --git a/debian/changelog b/debian/changelog index de59a68..5bfa3d1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -lucene3 (3.4.0-1) unstable; urgency=low +lucene3 (3.5.0-1) unstable; urgency=low * New upstream release. * Refreshed patches. * Added myself to uploaders. - -- James Page Fri, 14 Oct 2011 16:17:29 +0100 + -- James Page Tue, 29 Nov 2011 09:20:11 + lucene3 (3.3.0+dfsg-1) unstable; urgency=low diff --git a/debian/rules b/debian/rules index e0f7550..79a2a45 100755 --- a/debian/rules +++ b/debian/rules @@ -7,7 +7,7 @@ export JAVA_HOME=/usr/lib/jvm/default-java dh $@ --with javahelper override_dh_auto_build: - ant -propertyfile debian/ant.properties -Dversion=3.4.0 \ + ant -propertyfile debian/ant.properties -Dversion=3.5.0 \ jar-core docs javadocs build-contrib override_dh_installchangelogs: -- Lucene 3 - Full-text search engine library for Java(TM) - Debian packaging ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
[SCM] Lucene 3 - Full-text search engine library for Java(TM) - Debian packaging branch, master, updated. upstream/3.4.0-23-g5c4f3cc
The following commit has been merged in the master branch: commit 4c9f2da178c60019b4f4cc0146144e555624964d Merge: 75bc7736a7a56b7f5ef6cdbb986ba5296c325d44 29296db7ecb18a2b6ec90f99c60fa06c5f81909a Author: James Page Date: Tue Nov 29 09:19:50 2011 + Merge commit 'upstream/3.5.0' -- Lucene 3 - Full-text search engine library for Java(TM) - Debian packaging ___ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
