r2109 - trunk/lucene/debian

Barry Hawkins barryh-guest at costa.debian.org
Sat May 6 04:36:42 UTC 2006 

Author: barryh-guest
Date: 2006-05-06 04:36:41 +0000 (Sat, 06 May 2006)
New Revision: 2109

Modified:
   trunk/lucene/debian/
   trunk/lucene/debian/README.Debian
   trunk/lucene/debian/ant.properties
   trunk/lucene/debian/changelog
   trunk/lucene/debian/control
   trunk/lucene/debian/liblucene-java-doc.dirs
   trunk/lucene/debian/liblucene-java-doc.files
   trunk/lucene/debian/liblucene-java.dirs
   trunk/lucene/debian/liblucene-java.files
   trunk/lucene/debian/liblucene-java.links
   trunk/lucene/debian/rules
Log:
Remove reference to jikes as compiler to be used with kaffe
Update standards version to 3.7.2
Relocate luceneweb.war to reside under /usr/share/liblucene-java instead of tomcat4




Property changes on: trunk/lucene/debian
___________________________________________________________________
Name: svn:ignore
   - files
liblucene-java
liblucene-java-doc
patched
semantic.cache
tmp
   + files
liblucene-java
liblucene-java-doc
patched
semantic.cache
tmp
liblucene-java-doc.postinst.debhelper
liblucene-java-doc.prerm.debhelper


Modified: trunk/lucene/debian/README.Debian
===================================================================
--- trunk/lucene/debian/README.Debian	2006-05-06 02:50:00 UTC (rev 2108)
+++ trunk/lucene/debian/README.Debian	2006-05-06 04:36:41 UTC (rev 2109)
@@ -8,7 +8,7 @@
 The Lucene demo applications are included in the liblucene-java
 package.  It includes the following files:
 
- /var/lib/tomcat4/webapps/luceneweb.war
+ /usr/share/liblucene-java/luceneweb.war
  /usr/share/java/lucene-demos-x.x.jar
 
 The demonstration applications require additional configuration to be
@@ -47,4 +47,4 @@
 permission java.io.FilePermission "/var/lib/tomcat4/temp", "read,write,delete";
 permission java.io.FilePermission "/var/lib/tomcat4/temp/*", "read,write,delete";
 
- -- Barry Hawkins <barry at alltc.com>, Tue, 22 Mar 2005 14:20:38 -0500
+ -- Barry Hawkins <barryh at case.internal.alltc.org>, Fri,  5 May 2006 23:53:38 -0400

Modified: trunk/lucene/debian/ant.properties
===================================================================
--- trunk/lucene/debian/ant.properties	2006-05-06 02:50:00 UTC (rev 2108)
+++ trunk/lucene/debian/ant.properties	2006-05-06 04:36:41 UTC (rev 2109)
@@ -11,8 +11,4 @@
 javac.debug=on
 javac.nowarn=off
 javac.verbose=yes
-# Sun 1.4.2 SDK does not support classic compiler
-build.compiler=jikes
 build.rmic=kaffe
-#compile.debug=
-#compile.optimize=

Modified: trunk/lucene/debian/changelog
===================================================================
--- trunk/lucene/debian/changelog	2006-05-06 02:50:00 UTC (rev 2108)
+++ trunk/lucene/debian/changelog	2006-05-06 04:36:41 UTC (rev 2109)
@@ -1,3 +1,12 @@
+lucene (1.4.3-10) unstable; urgency=low
+
+  * Removed explicit use of jikes compiler to reflect change in
+    compiler used by kaffe (Closes: #359862)
+  * Updated standards version to 3.7.2
+  * Changed installation of demo .war file to reside with examples
+
+ -- Barry Hawkins <barry at alltc.com>  Fri, 05 May 2006 22:10:54 -0400
+
 lucene (1.4.3-9) unstable; urgency=low
 
   * Upload to remediate issue with .orig.tar.gz not being in main

Modified: trunk/lucene/debian/control
===================================================================
--- trunk/lucene/debian/control	2006-05-06 02:50:00 UTC (rev 2108)
+++ trunk/lucene/debian/control	2006-05-06 04:36:41 UTC (rev 2109)
@@ -2,9 +2,10 @@
 Section: text
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Barry Hawkins <barry at bytemason.org>, Jeff Breidenbach <jab at debian.org>
-Build-Depends-Indep: debhelper (>= 4.0.0), dpatch (>= 1.11), kaffe (>= 2:1.1.6), ant (>= 1.6.5-2), ant-optional (>= 1.6.5-2), javacc, junit, libxalan2-java
-Standards-Version: 3.6.2.1
+Uploaders: Barry Hawkins <barry at alltc.com>, Jeff Breidenbach <jab at debian.org>
+Build-Depends: debhelper (>= 4.0.0), dpatch (>= 1.11)
+Build-Depends-Indep: kaffe (>= 2:1.1.6), ant (>= 1.6.5-2), ant-optional (>= 1.6.5-2), javacc, junit, libxalan2-java
+Standards-Version: 3.7.2
 
 Package: liblucene-java
 Architecture: all

Modified: trunk/lucene/debian/liblucene-java-doc.dirs
===================================================================
--- trunk/lucene/debian/liblucene-java-doc.dirs	2006-05-06 02:50:00 UTC (rev 2108)
+++ trunk/lucene/debian/liblucene-java-doc.dirs	2006-05-06 04:36:41 UTC (rev 2109)
@@ -1,2 +1 @@
-var/lib/tomcat4/webapps
 usr/share/doc/liblucene-java-doc

Modified: trunk/lucene/debian/liblucene-java-doc.files
===================================================================
--- trunk/lucene/debian/liblucene-java-doc.files	2006-05-06 02:50:00 UTC (rev 2108)
+++ trunk/lucene/debian/liblucene-java-doc.files	2006-05-06 04:36:41 UTC (rev 2109)
@@ -1 +0,0 @@
-var/lib/tomcat4/webapps/luceneweb.war

Modified: trunk/lucene/debian/liblucene-java.dirs
===================================================================
--- trunk/lucene/debian/liblucene-java.dirs	2006-05-06 02:50:00 UTC (rev 2108)
+++ trunk/lucene/debian/liblucene-java.dirs	2006-05-06 04:36:41 UTC (rev 2109)
@@ -1 +1,2 @@
 usr/share/java
+usr/share/liblucene-java

Modified: trunk/lucene/debian/liblucene-java.files
===================================================================
--- trunk/lucene/debian/liblucene-java.files	2006-05-06 02:50:00 UTC (rev 2108)
+++ trunk/lucene/debian/liblucene-java.files	2006-05-06 04:36:41 UTC (rev 2109)
@@ -1,2 +1,3 @@
 usr/share/java/lucene-1.4.3.jar
 usr/share/java/lucene-demos-1.4.3.jar
+usr/share/liblucene-java/luceneweb.war
\ No newline at end of file

Modified: trunk/lucene/debian/liblucene-java.links
===================================================================
--- trunk/lucene/debian/liblucene-java.links	2006-05-06 02:50:00 UTC (rev 2108)
+++ trunk/lucene/debian/liblucene-java.links	2006-05-06 04:36:41 UTC (rev 2109)
@@ -1,2 +1,2 @@
 usr/share/java/lucene-1.4.3.jar usr/share/java/lucene.jar
-usr/share/java/lucene-demos-1.4.3.jar /usr/share/java/lucene-demos.jar
+usr/share/java/lucene-demos-1.4.3.jar usr/share/java/lucene-demos.jar

Modified: trunk/lucene/debian/rules
===================================================================
--- trunk/lucene/debian/rules	2006-05-06 02:50:00 UTC (rev 2108)
+++ trunk/lucene/debian/rules	2006-05-06 04:36:41 UTC (rev 2109)
@@ -35,7 +35,7 @@
 # place '-verbose' before -propertyfile to 
 # obtain detailed build output.
 ANT=$(JAVACMD) -classpath $(ANT_CLASSPATH) \
-        org.apache.tools.ant.Main -verbose -propertyfile $(ANT_PROPS)
+        org.apache.tools.ant.Main -propertyfile $(ANT_PROPS)
 
 build: build-stamp
 
@@ -53,7 +53,7 @@
 	$(ANT) clean
 	dh_clean
 	rm -rf $(TEMPDIR)/usr/share/java
-	rm -rf $(TEMPDIR)/var/lib/tomcat4/webapps
+	rm -rf $(TEMPDIR)/usr/share/liblucene-java
 
 install: build
 	dh_testdir
@@ -61,15 +61,14 @@
 	dh_clean -k
 	dh_installdirs
 	mkdir -p $(TEMPDIR)/usr/share/java
-	mkdir -p $(TEMPDIR)/var/lib/tomcat4/webapps
+	mkdir -p $(TEMPDIR)/usr/share/liblucene-java
 
-	# Add here commands to install the package into debian/lucene.
 	install -m 644	build/$(PNAME)-$(VERSION).jar \
 			build/$(PNAME)-demos-$(VERSION).jar \
 			$(TEMPDIR)/usr/share/java
 
 	install -m 644	build/luceneweb.war \
-			$(TEMPDIR)/var/lib/tomcat4/webapps
+			$(TEMPDIR)/usr/share/liblucene-java
 
 	dh_movefiles

More information about the pkg-java-commits mailing list