This is an automated email from the git hooks/post-receive script. seamlik-guest pushed a commit to branch master in repository lucene2.
commit c6af3fb5e9638683f878b2fae0c7ae78be378d92 Author: Jan-Pascal van Best <[email protected]> Date: Wed Aug 8 11:38:32 2007 +0000 Moved to cdbs --- debian/ant.properties | 1 - debian/changelog | 2 +- debian/control | 18 +++--- debian/docs | 1 - debian/rules | 176 +++++++++++--------------------------------------- 5 files changed, 45 insertions(+), 153 deletions(-) diff --git a/debian/ant.properties b/debian/ant.properties index 2c86fa5..c9a5f46 100644 --- a/debian/ant.properties +++ b/debian/ant.properties @@ -5,7 +5,6 @@ version=2.2.0 # javacc settings used by Lucene build -#javacc.jar.dir=/usr/share/java javacc.home=/usr/share/java javacc.jar=/usr/share/java/javacc.jar diff --git a/debian/changelog b/debian/changelog index 7d20e6c..94f26bd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ lucene2 (2.2.0-2~pre1) unstable; urgency=low - * Moved to gcj (from sun-java5) + * Moved to cdbs -- Jan-Pascal van Best <[email protected]> Wed, 18 Jul 2007 08:25:20 +0200 diff --git a/debian/control b/debian/control index 12a21fa..1bbfa7c 100644 --- a/debian/control +++ b/debian/control @@ -4,11 +4,11 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Jan-Pascal van Best <[email protected]>, Barry Hawkins <[email protected]>, Jeff Breidenbach <[email protected]>, Michael Koch <[email protected]> -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), - java-gcj-compat-dev, - ant-optional, javacc, junit, libxalan2-java +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: cdbs, debhelper (>= 4.1.0), dpatch (>= 2.0), + sun-java5-jdk, + ant-optional, javacc, junit Build-Depends-Indep: libjtidy-java (>= 7), libjline-java (>= 0.9.5), libcommons-digester-java (>= 1.7), @@ -21,8 +21,7 @@ Standards-Version: 3.7.2 Package: liblucene2-java Architecture: all -Depends: ${misc:Depends}, - sun-java5-jre | sun-java6-jre, +Depends: sun-java5-jre | sun-java6-jre, libjtidy-java (>= 7), libjline-java (>= 0.9.5), libcommons-digester-java (>= 1.7), @@ -46,13 +45,12 @@ Description: Full-text search engine library for Java(TM) Package: liblucene2-java-doc Architecture: all Section: contrib/doc -Depends: ${misc:Depends}, - libregexp-java (>= 1.4), - ant-doc +Suggests: 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. . Homepage: http://lucene.apache.org/java/ diff --git a/debian/docs b/debian/docs index 17f565c..82303e6 100644 --- a/debian/docs +++ b/debian/docs @@ -1,4 +1,3 @@ BUILD.txt -CHANGES.txt NOTICE.txt README.txt diff --git a/debian/rules b/debian/rules index 813604c..3b404ad 100755 --- a/debian/rules +++ b/debian/rules @@ -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 - -DEBIAN_VERSION := $(shell dpkg-parsechangelog | grep "^Version:" | cut -c 10-) -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-$(LUCENE_VERSION) - -# Explicitly build with gcj -export JAVA_HOME = /usr/lib/jvm/java-gcj -export JAVA = $(JAVA_HOME)/bin/java -export JAVAC = $(JAVA_HOME)/bin/javac - -# 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 - -# 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 +DEB_INSTALL_CHANGELOGS_liblucene2-java := CHANGES.txt - # Nothing to do, this package does not have an arch part. - touch build-arch-stamp +# Build with java-1.5.0-sun +JAVA_HOME := /usr/lib/jvm/java-1.5.0-sun -build-indep: build-indep-stamp -build-indep-stamp: configure-stamp +DEB_ANT_BUILD_TARGET := javacc jar-core build-contrib war-demo javadocs +#DEB_ANT_CHECK_TARGET := test +DEB_ANT_CLEAN_TARGET := clean - dh_testdir +# Needed for running javacc and the unit tests +DEB_JARS = ant-nodeps ant-junit junit - $(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 +# Upstream Lucene name +UPSTREAM_BASENAME := lucene-$(DEB_UPSTREAM_VERSION) +CHANGESFILE = ../lucene2_$(DEB_VERSION)_$(DEB_BUILD_ARCH).changes +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 @@ remove-source: 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 -upload: - cd .. ; dupload -t vanbest lucene2_$(DEBIAN_VERSION)_$(DEBIAN_ARCH).changes - #cd .. ; dupload -t mentors lucene2_$(DEBIAN_VERSION)_$(DEBIAN_ARCH).changes +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: + dupload -t mentors $(CHANGESFILE) .PHONY: patched build clean binary-indep binary-arch binary install install-indep install-arch configure -- 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
