This is an automated email from the git hooks/post-receive script. seamlik-guest pushed a commit to branch master in repository lucene2.
commit 9489540f0cde4e5b02b815e5e639c96b7da70526 Author: Jan-Pascal van Best <[email protected]> Date: Wed Aug 1 20:30:54 2007 +0000 Package seems to work now --- debian/TODO.Debian | 4 ---- debian/ant.properties | 6 ++++-- debian/changelog | 2 +- debian/control | 26 +++++++++++++++++++------- debian/rules | 34 ++++++++++------------------------ 5 files changed, 34 insertions(+), 38 deletions(-) diff --git a/debian/TODO.Debian b/debian/TODO.Debian index cf03ae5..937e927 100644 --- a/debian/TODO.Debian +++ b/debian/TODO.Debian @@ -3,10 +3,6 @@ TODO Stuff to do regarding packaging of lucene-2.x.x: -- Split up patches/02_full.dpatch -- Add patch to prevent downloading of external libraries by ant -- Put pressure on the release of jtidy for Debian, so contrib/ant can be - included (it has been in the incoming queue for 3 weeks as of April 16, 2007). - In the javadoc, fix the links to external documentation other than Sun's java API diff --git a/debian/ant.properties b/debian/ant.properties index adb33bf..a07b79f 100644 --- a/debian/ant.properties +++ b/debian/ant.properties @@ -2,10 +2,12 @@ # Version number for upstream source; errors in the # upstream source require that it be overridden. -version=2.1.0 +version=2.2.0 # javacc settings used by Lucene build -javacc.jar.dir=/usr/share/java +#javacc.jar.dir=/usr/share/java +javacc.home=/usr/share/java +javacc.jar=/usr/share/java/javacc.jar # javac settings used by Lucene compilation javac.debug=on diff --git a/debian/changelog b/debian/changelog index 99d7ad2..ae82416 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,7 @@ lucene2 (2.2.0-1~pre1) UNRELEASED; urgency=low * New upstream release (2.2.0) * (still based on pre-release version) - -- Jan-Pascal van Best <[email protected]> Tue, 05 Jun 2007 10:40:11 +0200 + -- Jan-Pascal van Best <[email protected]> Tue, 05 Jun 2007 15:42:40 +0200 lucene2 (2.1.0-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 2710cda..63812a6 100644 --- a/debian/control +++ b/debian/control @@ -8,25 +8,37 @@ XS-Vcs-Browser: http://www.vanbest.org/websvn/lucene2 XS-Vcs-svn: http://svn.vanbest.org/svn/lucene2 Build-Depends: debhelper (>= 4.0.0), dpatch (>= 2.0), sun-java5-jre, sun-java5-jdk, ant, ant-optional, javacc, junit, libxalan2-java -Build-Depends-Indep: libjline-java, libcommons-digester-java, libregexp-java, - libdb4.3-java, libdb4.3-java-dev, - libcommons-collections3-java, libcommons-logging-java, libcommons-beanutils-java +Build-Depends-Indep: libjtidy-java (>= 7), + libjline-java (>= 0.9.5), + libcommons-digester-java (>= 1.7), + libregexp-java (>= 1.4), + libdb4.3-java (>= 4.3.29), + libcommons-collections3-java (>= 3.1), + libcommons-logging-java (>= 1.0.4), + libcommons-beanutils-java (>= 1.7.0) Standards-Version: 3.7.2 Package: liblucene2-java Architecture: all Depends: ${misc:Depends}, sun-java5-jre | sun-java6-jre, - libjline-java, libcommons-digester-java, libregexp-java, libdb4.3-java, - libcommons-collections3-java, libcommons-logging-java, libcommons-beanutils-java + libjtidy-java (>= 7), + libjline-java (>= 0.9.5), + libcommons-digester-java (>= 1.7), + libregexp-java (>= 1.4), + libdb4.3-java (>= 4.3.29), + libcommons-collections3-java (>= 3.1), + libcommons-logging-java (>= 1.0.4), + libcommons-beanutils-java (>= 1.7.0) 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. . In addition to the Lucene core library, the following contributions are - also included: analyzers bdb benchmark demos highlighter lucli memory - queries regex similarity snowball spellchecker surround swing wordnet xml-query-parser + 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/ diff --git a/debian/rules b/debian/rules index 26805ee..ebb3e79 100755 --- a/debian/rules +++ b/debian/rules @@ -23,15 +23,6 @@ DEBIAN_ARCH := $(shell dpkg-architecture | grep ^DEB_BUILD_ARCH= | cut -c 16-) LUCENE_VERSION := $(shell echo $(DEBIAN_VERSION) | grep -o "^[[:digit:]\.]*") UPSTREAM_BASENAME = lucene-2.2-dev - -# Stuff from contrib we include -# We do not include: -# - ant depends on JTidy -# - db/bdb-je depends on je -# - gdata-server depends on Google Data API -# - contrib/javascript, is installed under doc -LUCENE_CONTRIBS = analyzers benchmark db/bdb highlighter memory lucli miscellaneous queries regex similarity snowball spellchecker surround swing wordnet xml-query-parser - # Explicitly build with sun-java5-jdk export JAVA_HOME = /usr/lib/jvm/java-1.5.0-sun export JAVA = $(JAVA_HOME)/bin/java @@ -81,18 +72,10 @@ build-indep-stamp: configure-stamp $(ANT) javacc $(ANT) jar-core - # $(ANT) build-contrib - for contrib in $(LUCENE_CONTRIBS); do \ - cd $(CURDIR)/contrib/$$contrib ; \ - $(ANT) jar ; \ - done + $(ANT) build-contrib $(ANT) war-demo - $(ANT) test - export LD_LIBRARY_PATH=/usr/lib ; \ - for contrib in $(LUCENE_CONTRIBS); do \ - cd $(CURDIR)/contrib/$$contrib ; \ - $(ANT) test ; \ - done + # Skipping until production time... + # $(ANT) test $(ANT) javadocs touch build-indep-stamp @@ -109,6 +92,9 @@ clean: unpatch # 'ant test' in contrib/db leave some stuff behind... rm -rf $(CURDIR)/contrib/db/bdb/index + # remove keyring, since it is a binary file + rm -f debian/lucene-keyring.gpg + dh_clean install: install-indep install-arch @@ -123,13 +109,13 @@ install-indep: install -m 0644 build/lucene-core-$(LUCENE_VERSION).jar $(CURDIR)/debian/liblucene2-java/usr/share/java ln -s lucene-core-$(LUCENE_VERSION).jar $(CURDIR)/debian/liblucene2-java/usr/share/java/lucene-core.jar - # build contrib - for contrib in $(LUCENE_CONTRIBS); do \ - for jarfile in "build/contrib/$$contrib"/*.jar; do \ + # install contrib + CONTRIB_JARS=`find build/contrib/ -name \*.jar` ; \ + for jarfile in $$CONTRIB_JARS; do \ + echo $$jarfile ; \ install -m 0644 "$$jarfile" $(CURDIR)/debian/liblucene2-java/usr/share/java ; \ CONTRIB=`echo $$jarfile | sed "s/.*\\/lucene-\\(.*\\)-.*.jar/\\1/"` ; \ ln -s lucene-$$CONTRIB-$(LUCENE_VERSION).jar $(CURDIR)/debian/liblucene2-java/usr/share/java/lucene-$$CONTRIB.jar ; \ - done ; \ done install -d $(CURDIR)/debian/liblucene2-java/usr/bin/ install debian/lucli $(CURDIR)/debian/liblucene2-java/usr/bin/ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/lucene2.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
