[pkg-java] r13563 - trunk/lucene3/debian

[Jan-Pascal van Best]

Author: janpascal-guest
Date: 2011-04-23 20:22:16 +0000 (Sat, 23 Apr 2011)
New Revision: 13563

Modified:
   trunk/lucene3/debian/changelog
   trunk/lucene3/debian/control
   trunk/lucene3/debian/rules
   trunk/lucene3/debian/watch
Log:
working version, still conflict with 2.9

Modified: trunk/lucene3/debian/changelog
===================================================================
--- trunk/lucene3/debian/changelog	2011-04-22 18:21:31 UTC (rev 13562)
+++ trunk/lucene3/debian/changelog	2011-04-23 20:22:16 UTC (rev 13563)
@@ -3,6 +3,8 @@
   * New upstream release. Lucene3 is not backwards compatible with lucene2; 
     source using lucene will need to be recompiled and possibly patched.
     Lucene3 uses Java5 features (such as generics) and removes deprecated APIs.
+  * liblucene3-java Conflicts with liblucene2-java because of the symlinks to
+    the actual jar files. May be resolved in a later version
   * Split package into a liblucene3-java-core and liblucene3-java-contrib
   * Add Class-Path entries to the contrib jar files' MANIFEST.MF containing
     the lucene-core jar files and other dependencies.

Modified: trunk/lucene3/debian/control
===================================================================
--- trunk/lucene3/debian/control	2011-04-22 18:21:31 UTC (rev 13562)
+++ trunk/lucene3/debian/control	2011-04-23 20:22:16 UTC (rev 13563)
@@ -8,8 +8,9 @@
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/lucene3/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/lucene3/
 Homepage: http://lucene.apache.org/java/
+Conflicts: liblucene2-java (<= 3.0)
 Build-Depends: cdbs (>= 0.4.49), debhelper (>= 6), dpatch (>= 2.0),
- javahelper,
+ javahelper (>= 0.33~1),
  default-jdk (>= 1.6),
  ant-optional (>= 1.8), ant-contrib, javacc, junit
 Build-Depends-Indep: libjline-java (>= 0.9.5), 
@@ -27,7 +28,7 @@
 
 Package: liblucene3-java
 Architecture: all
-Depends: ${misc:Depends},
+Depends: ${java:Depends}, ${misc:Depends},
  liblucene3-java-core, liblucene3-java-contrib
 Description: Full-text search engine library for Java(TM)
  Lucene is a full-text search engine for the Java(TM) programming language.
@@ -38,7 +39,7 @@
 
 Package: liblucene3-java-core
 Architecture: all
-Depends: ${misc:Depends}, ${java:Depends}
+Depends: ${java:Depends}, ${misc:Depends}
 Breaks: solr-common (<< 1.2.0+ds2-3)
 Description: Full-text search engine library for Java(TM)
  Lucene is a full-text search engine for the Java(TM) programming language.
@@ -49,7 +50,7 @@
 
 Package: liblucene3-java-contrib
 Architecture: all
-Depends: ${misc:Depends}, ${java:Depends}
+Depends: ${java:Depends}, ${misc:Depends}
 Breaks: solr-common (<< 1.2.0+ds2-3)
 Description: Full-text search engine library for Java(TM)
  Lucene is a full-text search engine for the Java(TM) programming language.

Modified: trunk/lucene3/debian/rules
===================================================================
--- trunk/lucene3/debian/rules	2011-04-22 18:21:31 UTC (rev 13562)
+++ trunk/lucene3/debian/rules	2011-04-23 20:22:16 UTC (rev 13563)
@@ -10,9 +10,11 @@
 #export DH_VERBOSE=1
 
 # Build with OpenJDK
-JAVA_HOME := /usr/lib/jvm/java-6-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_BUILD_TARGET := javacc jar-core build-contrib war-demo # javadocs
 DEB_ANT_CHECK_TARGET := test
 DEB_ANT_CLEAN_TARGET := clean clean-javacc
 
@@ -25,7 +27,7 @@
 UPSTREAM_BASENAME := lucene-$(UPSTREAM_VERSION)
 CHANGESFILE = ../lucene$(ABI_VERSION)_$(DEB_VERSION)_$(DEB_BUILD_ARCH).changes
 
-JH_INSTALLLIBS_ARGS = "--upstream-version=${UPSTREAM_VERSION}"
+JH_INSTALLLIBS_ARGS = --upstream-version=${UPSTREAM_VERSION}
 
 DEB_INSTALL_CHANGELOGS_liblucene$(ABI_VERSION)-java := CHANGES.txt
 
@@ -70,7 +72,8 @@
 
 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/

Modified: trunk/lucene3/debian/watch
===================================================================
--- trunk/lucene3/debian/watch	2011-04-22 18:21:31 UTC (rev 13562)
+++ trunk/lucene3/debian/watch	2011-04-23 20:22:16 UTC (rev 13563)
@@ -1,3 +1,3 @@
 version=3
 opts=dversionmangle=s/\+ds\d// \
-http://www.apache.org/dist/lucene/java/lucene-(3\..*)-src\.tar\.gz
+http://www.apache.org/dist/lucene/java/(3\..*)/lucene-(3\..*)-src\.tar\.gz