[pkg-java] r4247 - trunk/lucene/debian

Fri Sep 21 19:26:48 UTC 2007

Author: mkoch
Date: 2007-09-21 19:26:48 +0000 (Fri, 21 Sep 2007)
New Revision: 4247

Modified:
   trunk/lucene/debian/ant.properties
   trunk/lucene/debian/changelog
   trunk/lucene/debian/compat
   trunk/lucene/debian/control
   trunk/lucene/debian/rules
Log:
lucene (1.4.3.dfsg-3) unstable; urgency=low

  * Copy generated javadocs into liblucene-java-doc package. Closes: #440729.
  * debian/ant.properties. Dont link to SUN online javadocs.
  * Replaced ${Source-Version} by ${source:Version} in debian/control.
  * Cleaned up debian/rules. Removed debian/liblucene-java.install and
    debian/liblucene-java.links files and do this in debian/rules.
  * Don't suggest tomcat5.
  * Updated debhelper level to 5.

 -- Michael Koch <konqueror at gmx.de>  Fri, 21 Sep 2007 21:25:06 +0200



Modified: trunk/lucene/debian/ant.properties
===================================================================

--- trunk/lucene/debian/ant.properties	2007-09-21 18:59:56 UTC (rev 4246)
+++ trunk/lucene/debian/ant.properties	2007-09-21 19:26:48 UTC (rev 4247)
@@ -11,3 +11,5 @@
 javac.debug=on
 javac.nowarn=off
 javac.verbose=yes
+
+javadoc.link=

Modified: trunk/lucene/debian/changelog
===================================================================
--- trunk/lucene/debian/changelog	2007-09-21 18:59:56 UTC (rev 4246)
+++ trunk/lucene/debian/changelog	2007-09-21 19:26:48 UTC (rev 4247)
@@ -1,3 +1,15 @@
+lucene (1.4.3.dfsg-3) unstable; urgency=low
+
+  * Copy generated javadocs into liblucene-java-doc package. Closes: #440729.
+  * debian/ant.properties. Dont link to SUN online javadocs.
+  * Replaced ${Source-Version} by ${source:Version} in debian/control.
+  * Cleaned up debian/rules. Removed debian/liblucene-java.install and
+    debian/liblucene-java.links files and do this in debian/rules.
+  * Don't suggest tomcat5.
+  * Updated debhelper level to 5.
+
+ -- Michael Koch <konqueror at gmx.de>  Fri, 21 Sep 2007 21:25:06 +0200
+
 lucene (1.4.3.dfsg-2) unstable; urgency=low
 
   * added myself as an uploader

Modified: trunk/lucene/debian/compat
===================================================================
--- trunk/lucene/debian/compat	2007-09-21 18:59:56 UTC (rev 4246)
+++ trunk/lucene/debian/compat	2007-09-21 19:26:48 UTC (rev 4247)
@@ -1 +1 @@
-4
+5

Modified: trunk/lucene/debian/control
===================================================================
--- trunk/lucene/debian/control	2007-09-21 18:59:56 UTC (rev 4246)
+++ trunk/lucene/debian/control	2007-09-21 19:26:48 UTC (rev 4247)
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Barry Hawkins <barry at alltc.com>, Jeff Breidenbach <jab at debian.org>, Michael Koch <konqueror at gmx.de>, Arnaud Vandyck <avdyk at debian.org>
-Build-Depends: debhelper (>= 4.0.0), dpatch (>= 1.11)
-Build-Depends-Indep: java-gcj-compat-dev, ant (>= 1.6.5-2), ant-optional (>= 1.6.5-2), javacc, junit, libxalan2-java
+Build-Depends: debhelper (>= 5), dpatch (>= 1.11)
+Build-Depends-Indep: java-gcj-compat-dev, ant-optional (>= 1.6.5-2), javacc, junit, libxalan2-java
 Standards-Version: 3.7.2
 
 Package: liblucene-java
@@ -12,7 +12,7 @@
 Section: text
 Depends: java-gcj-compat | java2-runtime | java1-runtime
 Replaces: liblucene-java-doc (<= 1.4.3-5)
-Suggests: liblucene-java-doc (>= ${Source-Version}), tomcat5 | tomcat5.5
+Suggests: liblucene-java-doc (>= ${source:Version}), tomcat5.5
 Description: full-text search engine library for Java(TM) and demonstration programs
  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 
@@ -23,7 +23,7 @@
 Package: liblucene-java-doc
 Architecture: all
 Section: doc
-Suggests: liblucene-java (>= ${Source-Version})
+Suggests: liblucene-java (>= ${source:Version})
 Description: demonstration programs and example code for Lucene
  Documentation and example code for Lucene, which is a full-text 
  search engine for the Java(TM) programming language.

Modified: trunk/lucene/debian/rules
===================================================================
--- trunk/lucene/debian/rules	2007-09-21 18:59:56 UTC (rev 4246)
+++ trunk/lucene/debian/rules	2007-09-21 19:26:48 UTC (rev 4247)
@@ -1,39 +1,19 @@
 #!/usr/bin/make -f
-# debian/rules for lucene
 
-# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
 # Set a locale; currently using default
 export LANG=C
 
-# Include dpatch stuff per the documentation
 include /usr/share/dpatch/dpatch.make
 
 VERSION=1.4.3
-PNAME=lucene
 
-TEMPDIR=debian/tmp
-
-# Set JAVA_HOME to be used for Java commands
 JAVA_HOME=/usr/lib/jvm/java-gcj
-
-# Set the invocation of the java command;
-export JAVACMD=$(JAVA_HOME)/bin/java
-
-# 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=debian/ant.properties
-
-# Universal Ant invocation for reliable builds;
-# place '-verbose' before -propertyfile to 
-# obtain detailed build output.
 ANT=ant -propertyfile $(ANT_PROPS)
 
 build: build-stamp
@@ -53,34 +33,22 @@
 	rm -f build-stamp 
 	$(ANT) clean
 	dh_clean
-	rm -rf $(TEMPDIR)/usr/share/java
-	rm -rf $(TEMPDIR)/usr/share/liblucene-java
 
 install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k
 	dh_installdirs
-	mkdir -p $(TEMPDIR)/usr/share/java
-	mkdir -p $(TEMPDIR)/usr/share/liblucene-java
 
-	install -m 644	build/$(PNAME)-$(VERSION).jar \
-			$(TEMPDIR)/usr/share/java
+	dh_install -pliblucene-java build/lucene-$(VERSION).jar usr/share/java/lucene-$(VERSION).jar
+	dh_link -pliblucene-java usr/share/lucene-$(VERSION).jar usr/share/java/lucene.jar
+#	install -m 644 -D build/lucene-$(VERSION).jar build/lucene-demos-$(VERSION).jar $(TEMPDIR)/usr/share/java
+#	install -m 644 -D build/luceneweb.war $(TEMPDIR)/usr/share/liblucene-java
+	mkdir -p debian/liblucene-java-doc/usr/share/doc/liblucene-java-doc/docs
+	cp -r build/docs/api debian/liblucene-java-doc/usr/share/doc/liblucene-java-doc/docs
 
-#	install -m 644	build/$(PNAME)-$(VERSION).jar \
-#			build/$(PNAME)-demos-$(VERSION).jar \
-#			$(TEMPDIR)/usr/share/java
-
-#	install -m 644	build/luceneweb.war \
-#			$(TEMPDIR)/usr/share/liblucene-java
-
-	dh_movefiles
-
-# Build architecture-independent files here.
 binary-indep: build install
-# We have nothing to do by default.
 
-# Build architecture-dependent files here.
 binary-arch: build install
 	dh_testdir
 	dh_testroot


