Author: janpascal-guest Date: 2007-09-04 13:25:55 +0000 (Tue, 04 Sep 2007) New Revision: 4098
Modified: branches/lucene2/2.2.0/debian/changelog branches/lucene2/2.2.0/debian/control branches/lucene2/2.2.0/debian/lucli.1 branches/lucene2/2.2.0/debian/rules Log: Moved to cdbs; expanded man page Modified: branches/lucene2/2.2.0/debian/changelog =================================================================== --- branches/lucene2/2.2.0/debian/changelog 2007-09-04 09:41:28 UTC (rev 4097) +++ branches/lucene2/2.2.0/debian/changelog 2007-09-04 13:25:55 UTC (rev 4098) @@ -1,8 +1,10 @@ lucene2 (2.2.0-2) unstable; urgency=low * Use libdb4.5-java instead of libdb4.3-java, which is removed from Debian. + * Move to cdbs + * Expanded man page a little - -- Jan-Pascal van Best <[EMAIL PROTECTED]> Tue, 04 Sep 2007 11:21:13 +0200 + -- Jan-Pascal van Best <[EMAIL PROTECTED]> Tue, 04 Sep 2007 15:23:14 +0200 lucene2 (2.2.0-1) unstable; urgency=low Modified: branches/lucene2/2.2.0/debian/control =================================================================== --- branches/lucene2/2.2.0/debian/control 2007-09-04 09:41:28 UTC (rev 4097) +++ branches/lucene2/2.2.0/debian/control 2007-09-04 13:25:55 UTC (rev 4098) @@ -6,8 +6,9 @@ Jeff Breidenbach <[EMAIL PROTECTED]>, Michael Koch <[EMAIL PROTECTED]> XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/lucene2/ XS-Vcs-svn: svn://svn.debian.org/svn/pkg-java/trunk/lucene2/ -Build-Depends: debhelper (>= 4.0.0), dpatch (>= 2.0), sun-java5-jre, sun-java5-jdk, - ant-optional, javacc, junit, libxalan2-java +Build-Depends: cdbs (>= 0.4.49), debhelper (>= 4.1.0), dpatch (>= 2.0), + sun-java5-jre, sun-java5-jdk, + ant-optional, javacc, junit Build-Depends-Indep: libjtidy-java (>= 7), libjline-java (>= 0.9.5), libcommons-digester-java (>= 1.7), Modified: branches/lucene2/2.2.0/debian/lucli.1 =================================================================== --- branches/lucene2/2.2.0/debian/lucli.1 2007-09-04 09:41:28 UTC (rev 4097) +++ branches/lucene2/2.2.0/debian/lucli.1 2007-09-04 13:25:55 UTC (rev 4098) @@ -2,7 +2,7 @@ .\" First parameter, NAME, should be all caps .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" other parameters are allowed: see man(7), man(1) -.TH LUCLI 1 "April 11, 2007" +.TH LUCLI 1 "September 4, 2007" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -19,21 +19,42 @@ lucli \- command line interface to the Lucene full-text indexing library .SH SYNOPSIS .B lucli -.RI [ options ] " files" ... .SH DESCRIPTION -This manual page documents briefly the -.B lucli -command. -.PP -.\" TeX users may be more comfortable with the \fB<whatever>\fP and -.\" \fI<whatever>\fP escape sequences to invode bold face and italics, -.\" respectively. \fBlucli\fP is a program that allows you to work directly with Lucene indexes. +Once inside +.B lucli +you can use the following commands: +.TP +\fBcount\fP +Return the number of hits for a search. Example: count foo +.TP +\fBexplain\fP +Explanation that describes how the document scored against query. Example: explain foo +.TP +\fBhelp\fP +Display help about commands +.TP +\fBindex\fP +Choose a different lucene index. Example index my_index +.TP +\fBinfo\fP +Display info about the current Lucene index. Example: info +.TP +\fBoptimize\fP +Optimize the current index +.TP +\fBquit\fP +Quit/exit the program +.TP +\fBsearch\fP +Search the current index. Example: search foo +.TP +\fBterms\fP +Show the first 100 terms in this index. Supply a field name to only show terms in a specific field. Example: terms +.TP +\fBtokens\fP +Does a search and shows the top 10 tokens for each document. Verbose! Example: tokens foo .br -Type "help" once inside -.B lucli -for more information. -.br .SH AUTHOR lucli was written as a part of Lucene, the Java full-text indexing library. See http://lucene.apache.org for more information. Modified: branches/lucene2/2.2.0/debian/rules =================================================================== --- branches/lucene2/2.2.0/debian/rules 2007-09-04 09:41:28 UTC (rev 4097) +++ branches/lucene2/2.2.0/debian/rules 2007-09-04 13:25:55 UTC (rev 4098) @@ -1,175 +1,65 @@ #!/usr/bin/make -f # -*- makefile -*- -# -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. -# -# Modified to make a template file for a multi-binary package with separated -# build-arch and build-indep targets by Bill Allombert 2001 +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/dpatch.mk +include /usr/share/cdbs/1/class/ant.mk + # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -# This has to be exported to make some magic below work. -export DH_OPTIONS +DEB_INSTALL_CHANGELOGS_liblucene2-java := CHANGES.txt -DEBIAN_VERSION := $(shell dpkg-parsechangelog | grep "^Version:" | cut -c 10-) -DEBIAN_ARCH := $(shell dpkg-architecture | grep ^DEB_BUILD_ARCH= | cut -c 16-) +# Build with Sun JDK 1.5 +JAVA_HOME := /usr/lib/jvm/java-1.5.0-sun -# Upstream Lucene version -LUCENE_VERSION := $(shell echo $(DEBIAN_VERSION) | grep -o "^[[:digit:]\.]*") -UPSTREAM_BASENAME = lucene-$(LUCENE_VERSION) +DEB_ANT_BUILD_TARGET := javacc jar-core build-contrib war-demo javadocs +DEB_ANT_CHECK_TARGET := test +DEB_ANT_CLEAN_TARGET := clean -# Explicitly build with sun-java5-jdk -export JAVA_HOME = /usr/lib/jvm/java-1.5.0-sun -export JAVA = $(JAVA_HOME)/bin/java -export JAVAC = $(JAVA_HOME)/bin/javac +# Needed for running javacc and the unit tests +DEB_JARS = ant-nodeps ant-junit junit -# Class path: Ant requires a JAXP-compatible XML parser -# You need to set CLASSPATH here (even if your build.xml assembles its own -# class path) to ensure the same build results in all cases -JAVA_LIB=/usr/share/java -ANT_HOME=/usr/share/ant -ANT_CLASSPATH=$(JAVA_LIB)/junit.jar:$(JAVA_LIB)/xalan2.jar +# Upstream Lucene name +UPSTREAM_BASENAME := lucene-$(DEB_UPSTREAM_VERSION) +CHANGESFILE = ../lucene2_$(DEB_VERSION)_$(DEB_BUILD_ARCH).changes -# Set path to Ant properties file -ANT_PROPS=$(CURDIR)/debian/ant.properties - -# Universal Ant invocation for reliable builds; -# place '-verbose' before -propertyfile to -# obtain detailed build output. -ANT=ant -propertyfile $(ANT_PROPS) - -# Include dpatch stuff per the documentation -include /usr/share/dpatch/dpatch.make - -patch-stamp: patch - -configure: configure-stamp -configure-stamp: patch-stamp - dh_testdir - # Add here commands to configure the package. - - touch configure-stamp - -#Architecture -build: build-arch build-indep - -build-arch: build-arch-stamp -build-arch-stamp: configure-stamp - - # Nothing to do, this package does not have an arch part. - touch build-arch-stamp - -build-indep: build-indep-stamp -build-indep-stamp: configure-stamp - - dh_testdir - - $(ANT) javacc - $(ANT) jar-core - $(ANT) build-contrib - $(ANT) war-demo - # Skipping (very time consuming) until production time... - $(ANT) test - $(ANT) javadocs - - touch build-indep-stamp - -clean: unpatch - dh_testdir - dh_testroot - rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP# - - $(ANT) clean - +clean:: # '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 -install-indep: - dh_testdir - dh_testroot - dh_clean -k -i - dh_installdirs -i - +install/liblucene2-java:: # Install the libraries into the liblucene2-java package - - 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 - + + install -m 0644 build/lucene-core-$(DEB_UPSTREAM_VERSION).jar $(CURDIR)/debian/liblucene2-java/usr/share/java + ln -s lucene-core-$(DEB_UPSTREAM_VERSION).jar $(CURDIR)/debian/liblucene2-java/usr/share/java/lucene-core.jar + # 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 ; \ + ln -s lucene-$$CONTRIB-$(DEB_UPSTREAM_VERSION).jar $(CURDIR)/debian/liblucene2-java/usr/share/java/lucene-$$CONTRIB.jar ; \ done install -d $(CURDIR)/debian/liblucene2-java/usr/bin/ install contrib/lucli/run.sh $(CURDIR)/debian/liblucene2-java/usr/bin/lucli - + install -d $(CURDIR)/debian/liblucene2-java/usr/share/doc/liblucene2-java cp -a contrib/javascript $(CURDIR)/debian/liblucene2-java/usr/share/doc/liblucene2-java/ +install/liblucene2-java:: # Install the documentation into the liblucene2-java-doc package - + mkdir -p $(CURDIR)/debian/liblucene2-java-doc/usr/share/doc/liblucene2-java-doc/ cp -r docs $(CURDIR)/debian/liblucene2-java-doc/usr/share/doc/liblucene2-java-doc/ cp -r build/docs/* $(CURDIR)/debian/liblucene2-java-doc/usr/share/doc/liblucene2-java-doc/docs/ install -d $(CURDIR)/debian/liblucene2-java-doc/usr/share/doc/liblucene2-java-doc/demo - install -m 644 build/lucene-demos-$(LUCENE_VERSION).jar $(CURDIR)/debian/liblucene2-java-doc/usr/share/doc/liblucene2-java-doc/demo/ + install -m 644 build/lucene-demos-$(DEB_UPSTREAM_VERSION).jar $(CURDIR)/debian/liblucene2-java-doc/usr/share/doc/liblucene2-java-doc/demo/ install -m 644 build/luceneweb.war $(CURDIR)/debian/liblucene2-java-doc/usr/share/doc/liblucene2-java-doc/demo/ - dh_install -i - -install-arch: - dh_testdir - dh_testroot - dh_clean -k -s - dh_installdirs -s - - # Nothing to do, this package does not have an arch part. - - dh_install -s - -# Must not depend on anything. This is to be called by -# binary-arch/binary-indep -# in another 'make' thread. -binary-common: - dh_testdir - dh_testroot - dh_installchangelogs CHANGES.txt - dh_installdocs - dh_installexamples - dh_installman - dh_link - dh_strip - dh_compress - dh_fixperms - dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -# Build architecture independant packages using the common target. -binary-indep: build-indep install-indep - $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common - -binary: binary-indep - -binary-arch: - # empty - remove-source: rm -f build.xml rm -f common-build.xml @@ -179,16 +69,22 @@ rm -rf build dist docs example lib src contrib restore-from-source: remove-source - tar xzf ../lucene2_$(LUCENE_VERSION).orig.tar.gz + tar xzf ../lucene2_$(DEB_UPSTREAM_VERSION).orig.tar.gz mv $(UPSTREAM_BASENAME)/* . rmdir $(UPSTREAM_BASENAME) get-orig-source: debian/get-orig-source.sh +check: + lintian -i $(CHANGESFILE) + linda -i $(CHANGESFILE) + zgrep "^---" ../lucene2_$(DEB_VERSION).diff.gz | grep -v debian ; [ $$? != 0 ] + ( for p in $(DEB_ALL_PACKAGES); do \ + dpkg --contents ../$${p}_$(DEB_VERSION)_all.deb ; \ + done ) | less + upload: - cd .. ; dupload -t vanbest lucene2_$(DEBIAN_VERSION)_$(DEBIAN_ARCH).changes - #cd .. ; dupload -t mentors lucene2_$(DEBIAN_VERSION)_$(DEBIAN_ARCH).changes + dupload -t mentors $(CHANGESFILE) - .PHONY: patched build clean binary-indep binary-arch binary install install-indep install-arch configure _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
