[pkg-java] r12926 - in trunk/lucene3/debian: . patches
Jan-Pascal van Best
janpascal-guest at alioth.debian.org
Fri Aug 20 12:40:30 UTC 2010
Author: janpascal-guest
Date: 2010-08-20 12:40:28 +0000 (Fri, 20 Aug 2010)
New Revision: 12926
Added:
trunk/lucene3/debian/liblucene3-java-contrib.classpath
trunk/lucene3/debian/liblucene3-java-contrib.jlibs
trunk/lucene3/debian/liblucene3-java-contrib.manpages
trunk/lucene3/debian/liblucene3-java-core.jlibs
Removed:
trunk/lucene3/debian/liblucene3-java.manpages
Modified:
trunk/lucene3/debian/changelog
trunk/lucene3/debian/control
trunk/lucene3/debian/patches/00list
trunk/lucene3/debian/rules
Log:
Use javahelper for symlinks, setting the classpath, installing jars, managing java library dependencies
Modified: trunk/lucene3/debian/changelog
===================================================================
--- trunk/lucene3/debian/changelog 2010-08-20 12:35:33 UTC (rev 12925)
+++ trunk/lucene3/debian/changelog 2010-08-20 12:40:28 UTC (rev 12926)
@@ -5,9 +5,10 @@
Lucene3 uses Java5 features (such as generics) and removes deprecated APIs.
* Add Class-Path entries to the contrib jar files' MANIFEST.MF containing
the lucene-core jar files and other dependencies.
+ * Use javahelper as much as possibl
* Bump standards version to 3.9.1 (no changes needed)
- -- Jan-Pascal van Best <janpascal at vanbest.org> Thu, 12 Aug 2010 11:51:54 +0200
+ -- Jan-Pascal van Best <janpascal at vanbest.org> Fri, 20 Aug 2010 14:26:31 +0200
lucene2 (2.9.3+ds1-1) unstable; urgency=low
Modified: trunk/lucene3/debian/control
===================================================================
--- trunk/lucene3/debian/control 2010-08-20 12:35:33 UTC (rev 12925)
+++ trunk/lucene3/debian/control 2010-08-20 12:40:28 UTC (rev 12926)
@@ -9,7 +9,8 @@
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/lucene3/
Homepage: http://lucene.apache.org/java/
Build-Depends: cdbs (>= 0.4.49), debhelper (>= 6), dpatch (>= 2.0),
- openjdk-6-jdk,
+ javahelper,
+ default-jdk (>= 1.6),
ant-optional (>= 1.8), ant-contrib, javacc, junit
Build-Depends-Indep: libjline-java (>= 0.9.5),
libcommons-digester-java (>= 1.7),
@@ -27,34 +28,45 @@
Package: liblucene3-java
Architecture: all
Depends: ${misc:Depends},
- openjdk-6-jre-headless | java5-runtime-headless,
-Recommends: libcommons-beanutils-java (>= 1.7.0),
- libcommons-collections3-java (>= 3.1),
- libcommons-compress-java (>= 1.0),
- libcommons-digester-java (>= 1.7),
- libcommons-logging-java (>= 1.0.4),
- libdb4.7-java,
- libdb-je-java (>= 3.2.68),
- libicu4j-java (>= 3.8.1),
- libjline-java (>= 0.9.5),
- libjtidy-java (>= 7+svn20070309),
- libregexp-java (>= 1.4)
+ liblucene3-java-core, liblucene3-java-contrib
+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
+ that can easily be used to add search capabilities to applications.
+ .
+ This is a metapackage containing the Lucene core and contrib libraries.
+
+Package: liblucene3-java-core
+Architecture: all
+Depends: ${misc:Depends}, ${java:Depends}
Breaks: solr-common (<< 1.2.0+ds2-3)
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
that can easily be used to add search capabilities to applications.
.
- This package contains the Lucene core library and a number of additional
- (contributed) libraries.
+ This package contains the Lucene core library.
+Package: liblucene3-java-contrib
+Architecture: all
+Depends: ${misc:Depends}, ${java:Depends}
+Breaks: solr-common (<< 1.2.0+ds2-3)
+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
+ that can easily be used to add search capabilities to applications.
+ .
+ This package contains the Lucene contrib libraries.
+
Package: liblucene3-java-doc
Architecture: all
Section: doc
Depends: ${misc:Depends}
-Recommends: libregexp-java (>= 1.4), ant-doc
+Recommends: ${java:Recommends}
+#libregexp-java (>= 1.4), ant-doc
Description: Documentation for Lucene
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
that can easily be used to add search capabilities to applications.
+ .
This package contains class API documentation for Lucene.
Added: trunk/lucene3/debian/liblucene3-java-contrib.classpath
===================================================================
--- trunk/lucene3/debian/liblucene3-java-contrib.classpath (rev 0)
+++ trunk/lucene3/debian/liblucene3-java-contrib.classpath 2010-08-20 12:40:28 UTC (rev 12926)
@@ -0,0 +1,25 @@
+build/contrib/snowball/lucene-snowball-3.0.2.jar /usr/share/java/lucene-core-3.0.2.jar
+build/contrib/swing/lucene-swing-3.0.2.jar /usr/share/java/lucene-core-3.0.2.jar
+build/contrib/collation/lucene-collation-3.0.2.jar /usr/share/java/icu4j.jar /usr/share/java/lucene-core-3.0.2.jar
+build/contrib/analyzers/common/lucene-analyzers-3.0.2.jar /usr/share/java/lucene-core-3.0.2.jar /usr/share/java/xml-apis.jar /usr/share/java/jaxp-1.3.jar
+build/contrib/analyzers/smartcn/lucene-smartcn-3.0.2.jar /usr/share/java/lucene-core-3.0.2.jar
+build/contrib/wikipedia/lucene-wikipedia-3.0.2.jar /usr/share/java/lucene-core-3.0.2.jar
+build/contrib/lucli/lucene-lucli-3.0.2.jar /usr/share/java/jline.jar /usr/share/java/lucene-core-3.0.2.jar
+build/contrib/regex/lucene-regex-3.0.2.jar /usr/share/java/lucene-core-3.0.2.jar /usr/share/java/regexp.jar /usr/share/java/xalan2.jar
+build/contrib/spatial/lucene-spatial-3.0.2.jar /usr/share/java/lucene-core-3.0.2.jar /usr/share/java/lucene-misc-3.0.2.jar
+build/contrib/misc/lucene-misc-3.0.2.jar /usr/share/java/lucene-core-3.0.2.jar
+build/contrib/db/bdb-je/lucene-bdb-je-3.0.2.jar /usr/share/java/db-je.jar /usr/share/java/lucene-core-3.0.2.jar
+build/contrib/db/bdb/lucene-bdb-3.0.2.jar /usr/share/java/libdb4.7-java.jar /usr/share/java/lucene-core-3.0.2.jar
+build/contrib/surround/lucene-surround-3.0.2.jar /usr/share/java/lucene-core-3.0.2.jar
+build/contrib/xml-query-parser/lucene-xml-query-parser-3.0.2.jar /usr/share/java/lucene-core-3.0.2.jar /usr/share/java/lucene-queries-3.0.2.jar /usr/share/java/xml-apis.jar /usr/share/java/xml-commons-external.jar /usr/share/java/jaxp-1.3.jar
+build/contrib/instantiated/lucene-instantiated-3.0.2.jar /usr/share/java/lucene-core-3.0.2.jar
+build/contrib/memory/lucene-memory-3.0.2.jar /usr/share/java/lucene-core-3.0.2.jar
+build/contrib/wordnet/lucene-wordnet-3.0.2.jar /usr/share/java/lucene-core-3.0.2.jar
+build/contrib/ant/lucene-ant-3.0.2.jar /usr/share/java/ant.jar /usr/share/java/jtidy.jar /usr/share/java/lucene-core-3.0.2.jar /usr/share/java/xml-apis.jar /usr/share/java/xml-commons-external.jar /usr/share/java/jaxp-1.3.jar
+build/contrib/benchmark/lucene-benchmark-3.0.2.jar /usr/share/java/commons-compress.jar /usr/share/java/lucene-core-3.0.2.jar /usr/share/java/lucene-fast-vector-highlighter-3.0.2.jar /usr/share/java/lucene-highlighter-3.0.2.jar /usr/share/java/xml-apis.jar /usr/share/javax/jaxp-1.3.jar
+build/contrib/highlighter/lucene-highlighter-3.0.2.jar /usr/share/java/lucene-core-3.0.2.jar /usr/share/java/lucene-memory-3.0.2.jar
+build/contrib/queryparser/lucene-queryparser-3.0.2.jar /usr/share/java/lucene-core-3.0.2.jar
+build/contrib/fast-vector-highlighter/lucene-fast-vector-highlighter-3.0.2.jar /usr/share/java/lucene-core-3.0.2.jar
+build/contrib/spellchecker/lucene-spellchecker-3.0.2.jar /usr/share/java/lucene-core-3.0.2.jar
+build/contrib/remote/lucene-remote-3.0.2.jar /usr/share/java/lucene-core-3.0.2.jar
+build/contrib/queries/lucene-queries-3.0.2.jar /usr/share/java/lucene-core-3.0.2.jar
Added: trunk/lucene3/debian/liblucene3-java-contrib.jlibs
===================================================================
--- trunk/lucene3/debian/liblucene3-java-contrib.jlibs (rev 0)
+++ trunk/lucene3/debian/liblucene3-java-contrib.jlibs 2010-08-20 12:40:28 UTC (rev 12926)
@@ -0,0 +1,25 @@
+build/contrib/snowball/lucene-snowball-3.0.2.jar
+build/contrib/swing/lucene-swing-3.0.2.jar
+build/contrib/collation/lucene-collation-3.0.2.jar
+build/contrib/analyzers/common/lucene-analyzers-3.0.2.jar
+build/contrib/analyzers/smartcn/lucene-smartcn-3.0.2.jar
+build/contrib/wikipedia/lucene-wikipedia-3.0.2.jar
+build/contrib/lucli/lucene-lucli-3.0.2.jar
+build/contrib/regex/lucene-regex-3.0.2.jar
+build/contrib/spatial/lucene-spatial-3.0.2.jar
+build/contrib/misc/lucene-misc-3.0.2.jar
+build/contrib/db/bdb-je/lucene-bdb-je-3.0.2.jar
+build/contrib/db/bdb/lucene-bdb-3.0.2.jar
+build/contrib/surround/lucene-surround-3.0.2.jar
+build/contrib/xml-query-parser/lucene-xml-query-parser-3.0.2.jar
+build/contrib/instantiated/lucene-instantiated-3.0.2.jar
+build/contrib/memory/lucene-memory-3.0.2.jar
+build/contrib/wordnet/lucene-wordnet-3.0.2.jar
+build/contrib/ant/lucene-ant-3.0.2.jar
+build/contrib/benchmark/lucene-benchmark-3.0.2.jar
+build/contrib/highlighter/lucene-highlighter-3.0.2.jar
+build/contrib/queryparser/lucene-queryparser-3.0.2.jar
+build/contrib/fast-vector-highlighter/lucene-fast-vector-highlighter-3.0.2.jar
+build/contrib/spellchecker/lucene-spellchecker-3.0.2.jar
+build/contrib/remote/lucene-remote-3.0.2.jar
+build/contrib/queries/lucene-queries-3.0.2.jar
Copied: trunk/lucene3/debian/liblucene3-java-contrib.manpages (from rev 12908, trunk/lucene3/debian/liblucene3-java.manpages)
===================================================================
--- trunk/lucene3/debian/liblucene3-java-contrib.manpages (rev 0)
+++ trunk/lucene3/debian/liblucene3-java-contrib.manpages 2010-08-20 12:40:28 UTC (rev 12926)
@@ -0,0 +1 @@
+debian/lucli.1
Added: trunk/lucene3/debian/liblucene3-java-core.jlibs
===================================================================
--- trunk/lucene3/debian/liblucene3-java-core.jlibs (rev 0)
+++ trunk/lucene3/debian/liblucene3-java-core.jlibs 2010-08-20 12:40:28 UTC (rev 12926)
@@ -0,0 +1 @@
+build/lucene-core-3.0.2.jar
Deleted: trunk/lucene3/debian/liblucene3-java.manpages
===================================================================
--- trunk/lucene3/debian/liblucene3-java.manpages 2010-08-20 12:35:33 UTC (rev 12925)
+++ trunk/lucene3/debian/liblucene3-java.manpages 2010-08-20 12:40:28 UTC (rev 12926)
@@ -1 +0,0 @@
-debian/lucli.1
Modified: trunk/lucene3/debian/patches/00list
===================================================================
--- trunk/lucene3/debian/patches/00list 2010-08-20 12:35:33 UTC (rev 12925)
+++ trunk/lucene3/debian/patches/00list 2010-08-20 12:40:28 UTC (rev 12926)
@@ -2,7 +2,7 @@
05_add-osgi-metadata-in-manifests.dpatch
10_fix-javacc-locations.dpatch
11_fix-javacc-generated-files.dpatch
-20_add-classpath-to-manifest-in-jars.dpatch
+#20_add-classpath-to-manifest-in-jars.dpatch
30_fix-contrib-ant-libs.dpatch
31_fix-contrib-ant-test-wrong-encoding.dpatch
40_fix-contrib-benchmark-libs.dpatch
Modified: trunk/lucene3/debian/rules
===================================================================
--- trunk/lucene3/debian/rules 2010-08-20 12:35:33 UTC (rev 12925)
+++ trunk/lucene3/debian/rules 2010-08-20 12:40:28 UTC (rev 12926)
@@ -3,6 +3,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/dpatch.mk
+include /usr/share/cdbs/1/class/javahelper.mk
include /usr/share/cdbs/1/class/ant.mk
# Uncomment this to turn on verbose mode.
@@ -51,18 +52,18 @@
# Install the libraries into the libluceneX-java package
# Install the core library
- install -m 0644 build/lucene-core-$(UPSTREAM_VERSION).jar $(CURDIR)/debian/liblucene$(ABI_VERSION)-java/usr/share/java
- ln -s lucene-core-$(UPSTREAM_VERSION).jar $(CURDIR)/debian/liblucene$(ABI_VERSION)-java/usr/share/java/lucene-core-$(ABI_VERSION).jar
+ #install -m 0644 build/lucene-core-$(UPSTREAM_VERSION).jar $(CURDIR)/debian/liblucene$(ABI_VERSION)-java/usr/share/java
+ #ln -s lucene-core-$(UPSTREAM_VERSION).jar $(CURDIR)/debian/liblucene$(ABI_VERSION)-java/usr/share/java/lucene-core-$(ABI_VERSION).jar
# Install contrib libraries
- CONTRIB_JARS=`find build/contrib/ -name \*-$(UPSTREAM_VERSION).jar` ; \
+ #CONTRIB_JARS=`find build/contrib/ -name \*-$(UPSTREAM_VERSION).jar` ; \
for jarfile in $$CONTRIB_JARS; do \
install -m 0644 "$$jarfile" $(CURDIR)/debian/liblucene$(ABI_VERSION)-java/usr/share/java ; \
CONTRIB=`echo $$jarfile | sed "s/.*\\/lucene-\\([-a-z]*\\)-.*\\.jar/\\1/"` ; \
ln -s lucene-$$CONTRIB-$(UPSTREAM_VERSION).jar $(CURDIR)/debian/liblucene$(ABI_VERSION)-java/usr/share/java/lucene-$$CONTRIB-$(ABI_VERSION).jar ; \
done
- install -d $(CURDIR)/debian/liblucene$(ABI_VERSION)-java/usr/bin/
- install contrib/lucli/run.sh $(CURDIR)/debian/liblucene$(ABI_VERSION)-java/usr/bin/lucli
+ install -d $(CURDIR)/debian/liblucene$(ABI_VERSION)-java-contrib/usr/bin/
+ install contrib/lucli/run.sh $(CURDIR)/debian/liblucene$(ABI_VERSION)-java-contrib/usr/bin/lucli
install/liblucene$(ABI_VERSION)-java-doc::
# Install the documentation into the libluceneX-java-doc package
@@ -98,6 +99,12 @@
get-orig-source:
debian/get-orig-source.sh
+bootstrap-javahelper:
+ echo build/lucene-core-$(UPSTREAM_VERSION).jar > debian/liblucene$(ABI_VERSION)-java-core.jlibs.stub
+ java-propose-classpath build/lucene-core-$(UPSTREAM_VERSION).jar > debian/liblucene$(ABI_VERSION)-java-core.classpath.stub
+ find build/contrib -name \*-$(UPSTREAM_VERSION).jar > debian/liblucene$(ABI_VERSION)-java-contrib.jlibs.stub
+ find build/contrib -name \*-$(UPSTREAM_VERSION).jar | xargs java-propose-classpath > debian/liblucene$(ABI_VERSION)-java-core.classpath.stub
+
check:
lintian -i $(CHANGESFILE)
zgrep "^---" ../lucene$(ABI_VERSION)_$(DEB_VERSION).diff.gz | grep -v debian ; [ $$? != 0 ]
@@ -105,7 +112,4 @@
dpkg --contents ../$${p}_$(DEB_VERSION)_all.deb ; \
done ) | less
-upload:
- dupload -t mentors $(CHANGESFILE)
-
.PHONY: patched build clean binary-indep binary-arch binary install install-indep install-arch configure
More information about the pkg-java-commits
mailing list