[pkg-java] r4099 - branches/lucene2/2.2.0/debian

[janpascal-guest at alioth.debian.org]

Author: janpascal-guest
Date: 2007-09-04 19:21:43 +0000 (Tue, 04 Sep 2007)
New Revision: 4099

Modified:
   branches/lucene2/2.2.0/debian/changelog
   branches/lucene2/2.2.0/debian/rules
Log:
Prevent spurious files in the diff after the second build

Modified: branches/lucene2/2.2.0/debian/changelog
===================================================================
--- branches/lucene2/2.2.0/debian/changelog	2007-09-04 13:25:55 UTC (rev 4098)
+++ branches/lucene2/2.2.0/debian/changelog	2007-09-04 19:21:43 UTC (rev 4099)
@@ -4,7 +4,7 @@
   * Move to cdbs
   * Expanded man page a little
 
- -- Jan-Pascal van Best <janpascal at vanbest.org>  Tue, 04 Sep 2007 15:23:14 +0200
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Tue, 04 Sep 2007 21:02:06 +0200
 
 lucene2 (2.2.0-1) unstable; urgency=low
 

Modified: branches/lucene2/2.2.0/debian/rules
===================================================================
--- branches/lucene2/2.2.0/debian/rules	2007-09-04 13:25:55 UTC (rev 4098)
+++ branches/lucene2/2.2.0/debian/rules	2007-09-04 19:21:43 UTC (rev 4099)
@@ -25,18 +25,22 @@
 CHANGESFILE = ../lucene2_$(DEB_VERSION)_$(DEB_BUILD_ARCH).changes
 
 clean::
-	# 'ant test' in contrib/db leave some stuff behind...
+	# 'ant test' in contrib/db leaves some stuff behind...
 	rm -rf $(CURDIR)/contrib/db/bdb/index
 	# remove keyring, since it is a binary file
 	rm -f debian/lucene-keyring.gpg
+	# remove all javacc-generated files from src and contrib, except those
+	# those are not regenerated properly 
+	fgrep -Rl "Generated By:JavaCC:" $(CURDIR)/src/ $(CURDIR)/contrib/ | grep -v analysis/standard/ParseException.java\\\|precedence\\\|surround | xargs rm -f
 
 install/liblucene2-java::
 	# Install the libraries into the liblucene2-java package
 	
+	# Install the core library
 	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
+	# Install contrib libraries
 	CONTRIB_JARS=`find build/contrib/ -name \*.jar` ; \
 	for jarfile in $$CONTRIB_JARS; do \
 	    echo $$jarfile ; \
@@ -47,6 +51,7 @@
 	install -d $(CURDIR)/debian/liblucene2-java/usr/bin/
 	install contrib/lucli/run.sh $(CURDIR)/debian/liblucene2-java/usr/bin/lucli
 	
+	# Install javascript example files as docfiles
 	install -d $(CURDIR)/debian/liblucene2-java/usr/share/doc/liblucene2-java
 	cp -a contrib/javascript $(CURDIR)/debian/liblucene2-java/usr/share/doc/liblucene2-java/