[pkg-java] r13802 - in branches/lucene3: . convert-tot-quilt/debian

Jan-Pascal van Best janpascal-guest at alioth.debian.org
Tue Jun 14 14:24:31 UTC 2011 

Author: janpascal-guest
Date: 2011-06-14 14:24:30 +0000 (Tue, 14 Jun 2011)
New Revision: 13802

Added:
   branches/lucene3/convert-tot-quilt/
   branches/lucene3/convert-tot-quilt/debian/copyright
   branches/lucene3/convert-tot-quilt/debian/get-orig-source.sh
   branches/lucene3/convert-tot-quilt/debian/rules
   branches/lucene3/convert-tot-quilt/debian/watch
Removed:
   branches/lucene3/convert-tot-quilt/debian/get-orig-source.sh
   branches/lucene3/convert-tot-quilt/debian/rules
   branches/lucene3/convert-tot-quilt/debian/watch
Log:
Added lucene3 convert-to-quilt branch

Copied: branches/lucene3/convert-tot-quilt/debian/copyright (from rev 13801, trunk/lucene3/debian/copyright)
===================================================================
--- branches/lucene3/convert-tot-quilt/debian/copyright	                        (rev 0)
+++ branches/lucene3/convert-tot-quilt/debian/copyright	2011-06-14 14:24:30 UTC (rev 13802)
@@ -0,0 +1,95 @@
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=REVISION
+Name: lucene3
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Source: http://lucene.apache.org/java/
+
+Files: *
+Copyright: 2006-2009 The Apache Software Foundation
+License: Apache-2
+
+Files: debian/*
+Copyright: 2007-2009 Jan-Pascal van Best <janpascal at vanbest.org> 
+License: Apache-2
+
+Files: src/java/org/apache/lucene/util/UnicodeUtil.java
+Copyright: 2001-2004 Unicode, Inc.
+License: Unicode and Apache-2
+
+Files: src/java/org/apache/lucene/util/ArrayUtil.java
+Copyright: 1991-2005 Python Software Foundation
+License: PSF-2.4 and Apache-2
+
+License: Apache-2
+ On Debian systems, the complete text of the Apache
+ License, version 2.0, can be found in the 
+ `/usr/share/common-licenses/Apache-2.0' file.
+
+License: PSF-2.4
+ PSF LICENSE AGREEMENT FOR PYTHON 2.4
+ ------------------------------------
+ 
+ 1. This LICENSE AGREEMENT is between the Python Software Foundation
+ ("PSF"), and the Individual or Organization ("Licensee") accessing and
+ otherwise using Python 2.4 software in source or binary form and its
+ associated documentation.
+ 
+ 2. Subject to the terms and conditions of this License Agreement, PSF
+ hereby grants Licensee a nonexclusive, royalty-free, world-wide
+ license to reproduce, analyze, test, perform and/or display publicly,
+ prepare derivative works, distribute, and otherwise use Python 2.4
+ alone or in any derivative version, provided, however, that PSF's
+ License Agreement and PSF's notice of copyright, i.e., "Copyright (c)
+ 2001, 2002, 2003, 2004 Python Software Foundation; All Rights Reserved"
+ are retained in Python 2.4 alone or in any derivative version prepared
+ by Licensee.
+ 
+ 3. In the event Licensee prepares a derivative work that is based on
+ or incorporates Python 2.4 or any part thereof, and wants to make
+ the derivative work available to others as provided herein, then
+ Licensee hereby agrees to include in any such work a brief summary of
+ the changes made to Python 2.4.
+ 
+ 4. PSF is making Python 2.4 available to Licensee on an "AS IS"
+ basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
+ IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
+ DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
+ FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 2.4 WILL NOT
+ INFRINGE ANY THIRD PARTY RIGHTS.
+ 
+ 5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
+ 2.4 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
+ A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 2.4,
+ OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
+ 
+ 6. This License Agreement will automatically terminate upon a material
+ breach of its terms and conditions.
+ 
+ 7. Nothing in this License Agreement shall be deemed to create any
+ relationship of agency, partnership, or joint venture between PSF and
+ Licensee.  This License Agreement does not grant permission to use PSF
+ trademarks or trade name in a trademark sense to endorse or promote
+ products or services of Licensee, or any third party.
+ 
+ 8. By copying, installing or otherwise using Python 2.4, Licensee
+ agrees to be bound by the terms and conditions of this License
+ Agreement.
+
+License: Unicode
+ Disclaimer
+ 
+ This source code is provided as is by Unicode, Inc. No claims are
+ made as to fitness for any particular purpose. No warranties of any
+ kind are expressed or implied. The recipient agrees to determine
+ applicability of information provided. If this file has been
+ purchased on magnetic or optical media from Unicode, Inc., the
+ sole remedy for any claim will be exchange of defective media
+ within 90 days of receipt.
+ 
+ Limitations on Rights to Redistribute This Code
+ 
+ Unicode, Inc. hereby grants the right to freely use the information
+ supplied in this file in the creation of products supporting the
+ Unicode Standard, and to make copies of this file in any form
+ for internal or external distribution as long as this notice
+ remains attached.
+

Deleted: branches/lucene3/convert-tot-quilt/debian/get-orig-source.sh
===================================================================
--- trunk/lucene3/debian/get-orig-source.sh	2011-06-14 14:04:17 UTC (rev 13800)
+++ branches/lucene3/convert-tot-quilt/debian/get-orig-source.sh	2011-06-14 14:24:30 UTC (rev 13802)
@@ -1,66 +0,0 @@
-#!/bin/bash
-
-DEHS=`( uscan --dehs )`
-
-URL=`echo $DEHS | xsltproc debian/uscan-url.xslt -`
-VERSION=`echo $DEHS | xsltproc debian/uscan-upstream-version.xslt -`
-ABI_VERSION=$(echo $UPSTREAM_VERSION | grep -o "^[[:digit:]]\+" )
-
-DEBIAN_SOURCE_VERSION="$VERSION+ds1"
-
-DESTDIR=$PWD/..
-SOURCEFILE=$DESTDIR/lucene-$VERSION-src.tar.gz
-SIGFILE=$DESTDIR/lucene-$VERSION-src.tar.gz.asc
-SOURCETAR=$DESTDIR/lucene${ABI_VERSION}_$DEBIAN_SOURCE_VERSION.orig.tar
-
-KEYURL="http://www.apache.org/dist/lucene/java/KEYS"
-KEYFILE="debian/KEYS"
-KEYRING="debian/lucene-keyring.gpg"
-
-# Download source tarball and signature file
-if [ ! -r "$SOURCEFILE" ]; then
-  wget "$URL" -O $SOURCEFILE
-fi
-
-wget "$URL.asc" -O $SIGFILE
-
-# If necessary, recreate keyring used for signing
-# Only do this if the keyring is not yet downloaded
-if [ ! -r $KEYFILE ]; then
-    wget "$KEYURL" -O "$KEYFILE"
-fi
-
-if [ ! -r $KEYRING ]; then
-    touch $KEYRING
-    gpg --no-default-keyring --primary-keyring $KEYRING --import $KEYFILE
-fi
-
-# Check signature
-gpgv --quiet --keyring $KEYRING $SIGFILE $SOURCEFILE
-
-echo "Check whether the archive has been signed by Uwe Schindler (CODE SIGNING KEY) <uschindler at apache.org>, key ID E1EE085F"
-
-# Repackage upstream source file without the third party jars
-TEMPDIR=`mktemp -d`
-echo "Unpacking into tempdir $TEMPDIR..."
-tar xzf $SOURCEFILE -C $TEMPDIR
-
-echo "Removing third party jars..."
-find $TEMPDIR -name \*.jar -exec rm {} \;
-
-echo "Removing pre-generated javacc output files..."
-# Some generated files are excepted because they are not properly generated by
-# the build system
-#fgrep -lR "Generated By:JavaCC:" $TEMPDIR | grep -v "analysis/standard/ParseException.java\|precedence\|surround" | xargs -n5 rm
-fgrep -lR "Generated By:JavaCC:" $TEMPDIR | xargs -n5 rm
-
-echo "Packing new orig source tarball $SOURCETAR..."
-rm -f $SOURCETAR $SOURCETAR.gz
-cd $TEMPDIR
-tar cf $SOURCETAR *
-gzip -9 $SOURCETAR
-cd $DESTDIR
-
-echo "Removing tempdir..."
-rm -rf "$TEMPDIR"
-

Copied: branches/lucene3/convert-tot-quilt/debian/get-orig-source.sh (from rev 13801, trunk/lucene3/debian/get-orig-source.sh)
===================================================================
--- branches/lucene3/convert-tot-quilt/debian/get-orig-source.sh	                        (rev 0)
+++ branches/lucene3/convert-tot-quilt/debian/get-orig-source.sh	2011-06-14 14:24:30 UTC (rev 13802)
@@ -0,0 +1,66 @@
+#!/bin/bash
+
+DEHS=`( uscan --dehs )`
+
+URL=`echo $DEHS | xsltproc debian/uscan-url.xslt -`
+VERSION=`echo $DEHS | xsltproc debian/uscan-upstream-version.xslt -`
+ABI_VERSION=$(echo $VERSION | grep -o "^[[:digit:]]\+" )
+
+DEBIAN_SOURCE_VERSION="$VERSION+ds1"
+
+DESTDIR=$PWD/..
+SOURCEFILE=$DESTDIR/lucene-$VERSION-src.tar.gz
+SIGFILE=$DESTDIR/lucene-$VERSION-src.tar.gz.asc
+SOURCETAR=$DESTDIR/lucene${ABI_VERSION}_$DEBIAN_SOURCE_VERSION.orig.tar
+
+KEYURL="http://www.apache.org/dist/lucene/java/KEYS"
+KEYFILE="debian/KEYS"
+KEYRING="debian/lucene-keyring.gpg"
+
+# Download source tarball and signature file
+if [ ! -r "$SOURCEFILE" ]; then
+  wget "$URL" -O $SOURCEFILE
+fi
+
+wget "$URL.asc" -O $SIGFILE
+
+# If necessary, recreate keyring used for signing
+# Only do this if the keyring is not yet downloaded
+if [ ! -r $KEYFILE ]; then
+    wget "$KEYURL" -O "$KEYFILE"
+fi
+
+if [ ! -r $KEYRING ]; then
+    touch $KEYRING
+    gpg --no-default-keyring --primary-keyring $KEYRING --import $KEYFILE
+fi
+
+# Check signature
+gpgv --quiet --keyring $KEYRING $SIGFILE $SOURCEFILE
+
+echo "Check whether the archive has been signed by Uwe Schindler (CODE SIGNING KEY) <uschindler at apache.org>, key ID E1EE085F"
+
+# Repackage upstream source file without the third party jars
+TEMPDIR=`mktemp -d`
+echo "Unpacking into tempdir $TEMPDIR..."
+tar xzf $SOURCEFILE -C $TEMPDIR
+
+echo "Removing third party jars..."
+find $TEMPDIR -name \*.jar -exec rm {} \;
+
+echo "Removing pre-generated javacc output files..."
+# Some generated files are excepted because they are not properly generated by
+# the build system
+#fgrep -lR "Generated By:JavaCC:" $TEMPDIR | grep -v "analysis/standard/ParseException.java\|precedence\|surround" | xargs -n5 rm
+fgrep -lR "Generated By:JavaCC:" $TEMPDIR | xargs -n5 rm
+
+echo "Packing new orig source tarball $SOURCETAR..."
+rm -f $SOURCETAR $SOURCETAR.gz
+cd $TEMPDIR
+tar cf $SOURCETAR *
+gzip -9 $SOURCETAR
+cd $DESTDIR
+
+echo "Removing tempdir..."
+rm -rf "$TEMPDIR"
+

Deleted: branches/lucene3/convert-tot-quilt/debian/rules
===================================================================
--- trunk/lucene3/debian/rules	2011-06-14 14:04:17 UTC (rev 13800)
+++ branches/lucene3/convert-tot-quilt/debian/rules	2011-06-14 14:24:30 UTC (rev 13802)
@@ -1,122 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-
-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.
-#export DH_VERBOSE=1
-
-# Build with OpenJDK
-#JAVA_HOME := /usr/lib/jvm/java-6-openjdk
-export JAVA_HOME=/usr/lib/jvm/default-java
-JH_DEPENDS_ARGS = --verbose --jvm=headless
-
-DEB_ANT_BUILD_TARGET := javacc jar-core build-contrib war-demo # javadocs
-DEB_ANT_CHECK_TARGET := test
-DEB_ANT_CLEAN_TARGET := clean clean-javacc
-
-# Needed for running javacc and the unit tests
-DEB_JARS = ant-nodeps ant-contrib ant-junit junit
-
-# Upstream Lucene name
-UPSTREAM_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | grep -o "^[^+]*" | sed -e "s/~/-/" )
-ABI_VERSION := $(shell echo $(UPSTREAM_VERSION) | grep -o "^[[:digit:]]\+" )
-UPSTREAM_BASENAME := lucene-$(UPSTREAM_VERSION)
-CHANGESFILE = ../lucene$(ABI_VERSION)_$(DEB_VERSION)_$(DEB_BUILD_ARCH).changes
-
-JH_INSTALLLIBS_ARGS = --upstream-version=${UPSTREAM_VERSION}
-
-DEB_INSTALL_CHANGELOGS_liblucene$(ABI_VERSION)-java := CHANGES.txt
-
-clean::
-	# 'ant test' in contrib/db leaves some stuff behind...
-	rm -rf $(CURDIR)/contrib/db/bdb/index
-	rm -f junit*.properties
-	# Same for 'ant test' in contrib/benchmark
-	rm -rf $(CURDIR)/contrib/benchmark/temp/*
-	rm -rf $(CURDIR)/contrib/benchmark/work/index
-	rm -rf $(CURDIR)/contrib/benchmark/work/reuters
-	rm -rf $(CURDIR)/contrib/benchmark/work/reuters-out
-	# Tags for backward compatibility testing
-	rm -rf $(CURDIR)/tags
-	# remove keyring, since it is a binary file
-	rm -f debian/lucene-keyring.gpg
-	rm -f debian/KEYS
-	# remove all javacc-generated files from src and contrib, except those
-	# that are not regenerated properly 
-	# Now done in build.xml target clean-javacc
-	#fgrep -Rl "Generated By:JavaCC:" $(CURDIR)/src/ $(CURDIR)/contrib/ | grep -v analysis/standard/ParseException.java\\\|precedence\\\|surround | xargs rm -f
-	# clean-javacc misses this
-	grep -Rl "Generated.*By.*JavaCC" $(CURDIR)/contrib/misc/src/  | xargs rm -f
-
-install/liblucene$(ABI_VERSION)-java::
-	# 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 contrib libraries
-	#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-contrib/usr/lib/liblucene$(ABI_VERSION)-java-contrib
-	install contrib/lucli/run.sh $(CURDIR)/debian/liblucene$(ABI_VERSION)-java-contrib/usr/lib/liblucene$(ABI_VERSION)-java-contrib/lucli
-	gzip <debian/lucli.1 >$(CURDIR)/debian/liblucene$(ABI_VERSION)-java-contrib/usr/lib/liblucene$(ABI_VERSION)-java-contrib/lucli.1.gz
-
-install/liblucene$(ABI_VERSION)-java-doc::
-	# Install the documentation into the libluceneX-java-doc package
-	mkdir -p docs
-	mkdir -p build/docs
-	mkdir -p  $(CURDIR)/debian/liblucene$(ABI_VERSION)-java-doc/usr/share/doc/liblucene$(ABI_VERSION)-java-doc/
-	cp -r docs $(CURDIR)/debian/liblucene$(ABI_VERSION)-java-doc/usr/share/doc/liblucene$(ABI_VERSION)-java-doc/
-	cp -r build/docs/* $(CURDIR)/debian/liblucene$(ABI_VERSION)-java-doc/usr/share/doc/liblucene$(ABI_VERSION)-java-doc/docs/
-	# Remove empty directories
-	rmdir --ignore-fail-on-non-empty $(CURDIR)/debian/liblucene$(ABI_VERSION)-java-doc/usr/share/doc/liblucene$(ABI_VERSION)-java-doc/docs/skin/css
-	rmdir --ignore-fail-on-non-empty $(CURDIR)/debian/liblucene$(ABI_VERSION)-java-doc/usr/share/doc/liblucene$(ABI_VERSION)-java-doc/docs/skin/scripts
-	rmdir --ignore-fail-on-non-empty $(CURDIR)/debian/liblucene$(ABI_VERSION)-java-doc/usr/share/doc/liblucene$(ABI_VERSION)-java-doc/docs/skin/translations
-	# Remove unused embedded prototype library
-	rm -f $(CURDIR)/debian/liblucene$(ABI_VERSION)-java-doc/usr/share/doc/liblucene$(ABI_VERSION)-java-doc/docs/skin/prototype.js
-	install -d $(CURDIR)/debian/liblucene$(ABI_VERSION)-java-doc/usr/share/doc/liblucene$(ABI_VERSION)-java-doc/demo
-	install -m 644 build/lucene-demos-$(UPSTREAM_VERSION).jar $(CURDIR)/debian/liblucene$(ABI_VERSION)-java-doc/usr/share/doc/liblucene$(ABI_VERSION)-java-doc/demo/
-	install -m 644 build/luceneweb.war $(CURDIR)/debian/liblucene$(ABI_VERSION)-java-doc/usr/share/doc/liblucene$(ABI_VERSION)-java-doc/demo/
-
-remove-source:
-	rm -f build.xml
-	rm -f common-build.xml
-	rm -f *.txt
-	rm -f *stamp
-	rm -f *pom.xml.template
-	rm -f junit*.properties
-	rm -rf debian/patched
-	rm -rf build dist docs example lib src contrib test
-
-restore-from-source: remove-source
-	tar xzf ../lucene$(ABI_VERSION)_$(DEB_UPSTREAM_VERSION).orig.tar.gz
-	mv $(UPSTREAM_BASENAME)/* .
-	rmdir $(UPSTREAM_BASENAME)
-
-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 ]
-	( for p in $(DEB_ALL_PACKAGES); do \
-              echo $${p}_$(DEB_VERSION): ; \
-	      dpkg --contents ../$${p}_$(DEB_VERSION)_all.deb ; \
-	  done ) | less
-
-.PHONY: patched build clean binary-indep binary-arch binary install install-indep install-arch configure

Copied: branches/lucene3/convert-tot-quilt/debian/rules (from rev 13801, trunk/lucene3/debian/rules)
===================================================================
--- branches/lucene3/convert-tot-quilt/debian/rules	                        (rev 0)
+++ branches/lucene3/convert-tot-quilt/debian/rules	2011-06-14 14:24:30 UTC (rev 13802)
@@ -0,0 +1,124 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+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.
+#export DH_VERBOSE=1
+
+# Build with OpenJDK
+#JAVA_HOME := /usr/lib/jvm/java-6-openjdk
+export JAVA_HOME=/usr/lib/jvm/default-java
+JH_DEPENDS_ARGS = --verbose --jvm=headless
+
+DEB_ANT_BUILD_TARGET := javacc jar-core build-contrib war-demo # javadocs
+DEB_ANT_CHECK_TARGET := test
+DEB_ANT_CLEAN_TARGET := clean clean-javacc
+
+# Needed for running javacc and the unit tests
+DEB_JARS = ant-nodeps ant-contrib ant-junit junit
+
+# Upstream Lucene name
+UPSTREAM_VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | grep -o "^[^+]*" | sed -e "s/~/-/" )
+ABI_VERSION := $(shell echo $(UPSTREAM_VERSION) | grep -o "^[[:digit:]]\+" )
+UPSTREAM_BASENAME := lucene-$(UPSTREAM_VERSION)
+CHANGESFILE = ../lucene$(ABI_VERSION)_$(DEB_VERSION)_$(DEB_BUILD_ARCH).changes
+
+JH_INSTALLLIBS_ARGS = --upstream-version=${UPSTREAM_VERSION}
+
+DEB_INSTALL_CHANGELOGS_liblucene$(ABI_VERSION)-java := CHANGES.txt
+
+clean::
+	# 'ant test' in contrib/db leaves some stuff behind...
+	rm -rf $(CURDIR)/contrib/db/bdb/index
+	rm -f junit*.properties
+	# Same for 'ant test' in contrib/benchmark
+	rm -rf $(CURDIR)/contrib/benchmark/temp/*
+	rm -rf $(CURDIR)/contrib/benchmark/work/index
+	rm -rf $(CURDIR)/contrib/benchmark/work/reuters
+	rm -rf $(CURDIR)/contrib/benchmark/work/reuters-out
+	# Tags for backward compatibility testing
+	rm -rf $(CURDIR)/tags
+	# remove keyring, since it is a binary file
+	rm -f debian/lucene-keyring.gpg
+	rm -f debian/KEYS
+	# remove all javacc-generated files from src and contrib, except those
+	# that are not regenerated properly 
+	# Now done in build.xml target clean-javacc
+	#fgrep -Rl "Generated By:JavaCC:" $(CURDIR)/src/ $(CURDIR)/contrib/ | grep -v analysis/standard/ParseException.java\\\|precedence\\\|surround | xargs rm -f
+	# clean-javacc misses this
+	grep -Rl "Generated.*By.*JavaCC" $(CURDIR)/contrib/misc/src/  | xargs rm -f
+
+install/liblucene$(ABI_VERSION)-java::
+	# 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 contrib libraries
+	#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-contrib/usr/lib/liblucene$(ABI_VERSION)-java-contrib
+	install contrib/lucli/run.sh $(CURDIR)/debian/liblucene$(ABI_VERSION)-java-contrib/usr/lib/liblucene$(ABI_VERSION)-java-contrib/lucli
+	gzip <debian/lucli.1 >$(CURDIR)/debian/liblucene$(ABI_VERSION)-java-contrib/usr/lib/liblucene$(ABI_VERSION)-java-contrib/lucli.1.gz
+
+install/liblucene$(ABI_VERSION)-java-doc::
+	# Install the documentation into the libluceneX-java-doc package
+	mkdir -p docs
+	mkdir -p build/docs
+	touch build/docs/a
+	mkdir -p  $(CURDIR)/debian/liblucene$(ABI_VERSION)-java-doc/usr/share/doc/liblucene$(ABI_VERSION)-java-doc/
+	cp -r docs $(CURDIR)/debian/liblucene$(ABI_VERSION)-java-doc/usr/share/doc/liblucene$(ABI_VERSION)-java-doc/
+	cp -r build/docs/* $(CURDIR)/debian/liblucene$(ABI_VERSION)-java-doc/usr/share/doc/liblucene$(ABI_VERSION)-java-doc/docs/
+	# Remove empty directories
+	rmdir --ignore-fail-on-non-empty $(CURDIR)/debian/liblucene$(ABI_VERSION)-java-doc/usr/share/doc/liblucene$(ABI_VERSION)-java-doc/docs/skin/css
+	rmdir --ignore-fail-on-non-empty $(CURDIR)/debian/liblucene$(ABI_VERSION)-java-doc/usr/share/doc/liblucene$(ABI_VERSION)-java-doc/docs/skin/scripts
+	rmdir --ignore-fail-on-non-empty $(CURDIR)/debian/liblucene$(ABI_VERSION)-java-doc/usr/share/doc/liblucene$(ABI_VERSION)-java-doc/docs/skin/translations
+	# Remove unused embedded prototype library
+	rm -f $(CURDIR)/debian/liblucene$(ABI_VERSION)-java-doc/usr/share/doc/liblucene$(ABI_VERSION)-java-doc/docs/skin/prototype.js
+	install -d $(CURDIR)/debian/liblucene$(ABI_VERSION)-java-doc/usr/share/doc/liblucene$(ABI_VERSION)-java-doc/demo
+	install -m 644 build/lucene-demos-$(UPSTREAM_VERSION).jar $(CURDIR)/debian/liblucene$(ABI_VERSION)-java-doc/usr/share/doc/liblucene$(ABI_VERSION)-java-doc/demo/
+	install -m 644 build/luceneweb.war $(CURDIR)/debian/liblucene$(ABI_VERSION)-java-doc/usr/share/doc/liblucene$(ABI_VERSION)-java-doc/demo/
+
+remove-source:
+	rm -f build.xml
+	rm -f common-build.xml
+	rm -f *.txt
+	rm -f *stamp
+	rm -f *pom.xml.template
+	rm -f junit*.properties
+	rm -f index.html
+	rm -rf debian/patched
+	rm -rf build dist docs example lib src contrib test backwards
+
+restore-from-source: remove-source
+	tar xzf ../lucene$(ABI_VERSION)_$(DEB_UPSTREAM_VERSION).orig.tar.gz
+	mv $(UPSTREAM_BASENAME)/* .
+	rmdir $(UPSTREAM_BASENAME)
+
+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 ]
+	( for p in $(DEB_ALL_PACKAGES); do \
+              echo $${p}_$(DEB_VERSION): ; \
+	      dpkg --contents ../$${p}_$(DEB_VERSION)_all.deb ; \
+	  done ) | less
+
+.PHONY: patched build clean binary-indep binary-arch binary install install-indep install-arch configure

Deleted: branches/lucene3/convert-tot-quilt/debian/watch
===================================================================
--- trunk/lucene3/debian/watch	2011-06-14 14:04:17 UTC (rev 13800)
+++ branches/lucene3/convert-tot-quilt/debian/watch	2011-06-14 14:24:30 UTC (rev 13802)
@@ -1,3 +0,0 @@
-version=3
-opts=dversionmangle=s/\+ds\d// \
-http://www.apache.org/dist/lucene/java/(3\..*)/lucene-(3\..*)-src\.tar\.gz

Copied: branches/lucene3/convert-tot-quilt/debian/watch (from rev 13801, trunk/lucene3/debian/watch)
===================================================================
--- branches/lucene3/convert-tot-quilt/debian/watch	                        (rev 0)
+++ branches/lucene3/convert-tot-quilt/debian/watch	2011-06-14 14:24:30 UTC (rev 13802)
@@ -0,0 +1,3 @@
+version=3
+opts=dversionmangle=s/\+ds\d// \
+http://www.apache.org/dist/lucene/java/(3\..*)/lucene-(3\..*)-src(?:\.tar\.gz|\.tgz)

More information about the pkg-java-commits mailing list