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

[Jan-Pascal van Best]

Author: janpascal-guest
Date: 2010-08-23 13:34:00 +0000 (Mon, 23 Aug 2010)
New Revision: 12930

Removed:
   trunk/lucene3/debian/liblucene3-java-contrib.manpages
Modified:
   trunk/lucene3/debian/README.Debian
   trunk/lucene3/debian/TODO.Debian
   trunk/lucene3/debian/changelog
   trunk/lucene3/debian/rules
Log:
Put lucli under control of update-alternatives

Modified: trunk/lucene3/debian/README.Debian
===================================================================
--- trunk/lucene3/debian/README.Debian	2010-08-23 13:29:16 UTC (rev 12929)
+++ trunk/lucene3/debian/README.Debian	2010-08-23 13:34:00 UTC (rev 12930)
@@ -1,16 +1,14 @@
 Debian notes for Lucene-3.0.2
 -----------------------------
 
-There are two binary packages:
-- liblucene3-java contains the core lucene library and most 
-  contrib libraries
+Lucene 3 consists of a number of binary packages:
+- liblucene3-java is a metapackage depending on liblucene3-java-core
+  and liblucene3-java-contrib
+- liblucene3-java-core contains the core Lucene library
+- liblucene3-java contains the Lucene contrib libraries
 - liblucene3-java-doc contains Lucene documentation, API
   docs, and example applications
 
-Not all contrib libraries are included:
-- gdata-server depends on many libraries, of which at least the 
-  Google Data API (com.google.gdata) packages are not in Debian
-
 The Javadoc(TM) for Lucene are included in the liblucene3-java-doc
 package, in /usr/share/doc/liblucene3-java-doc/docs/api
 

Modified: trunk/lucene3/debian/TODO.Debian
===================================================================
--- trunk/lucene3/debian/TODO.Debian	2010-08-23 13:29:16 UTC (rev 12929)
+++ trunk/lucene3/debian/TODO.Debian	2010-08-23 13:34:00 UTC (rev 12930)
@@ -1,9 +1,12 @@
 TODO
 ----
 
- - Check README.Debian for lucene3
+- Check README.Debian for lucene3
+- The symlinks to the jars are not yet correct, they do not contain the ABI
+  version number
+- Possibly generate and install maven artifacts
+- Possibly split up liblucene3-java-contrib into the constituent library
+  packages, and supply a metapackage for everything now in -contrib
+- Look at the API docs, which are included twice, once in /core 
+  and /contrib-* and once in /all.
 
-Stuff to do regarding packaging of lucene-2.x.x:
-
-- Split into -core and -contrib package (maybe even further split up -contrib).
-

Modified: trunk/lucene3/debian/changelog
===================================================================
--- trunk/lucene3/debian/changelog	2010-08-23 13:29:16 UTC (rev 12929)
+++ trunk/lucene3/debian/changelog	2010-08-23 13:34:00 UTC (rev 12930)
@@ -3,12 +3,15 @@
   * 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.
+  * 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.
-  * Use javahelper as much as possibl
+  * Use javahelper as much as possible
+  * Put lucli under control of update-alternatives (needed for coexistence with
+    liblucene2-java)
   * Bump standards version to 3.9.1 (no changes needed)
 
- -- Jan-Pascal van Best <janpascal at vanbest.org>  Fri, 20 Aug 2010 14:26:31 +0200
+ -- Jan-Pascal van Best <janpascal at vanbest.org>  Fri, 20 Aug 2010 14:40:39 +0200
 
 lucene2 (2.9.3+ds1-1) unstable; urgency=low
 

Deleted: trunk/lucene3/debian/liblucene3-java-contrib.manpages
===================================================================
--- trunk/lucene3/debian/liblucene3-java-contrib.manpages	2010-08-23 13:29:16 UTC (rev 12929)
+++ trunk/lucene3/debian/liblucene3-java-contrib.manpages	2010-08-23 13:34:00 UTC (rev 12930)
@@ -1 +0,0 @@
-debian/lucli.1

Modified: trunk/lucene3/debian/rules
===================================================================
--- trunk/lucene3/debian/rules	2010-08-23 13:29:16 UTC (rev 12929)
+++ trunk/lucene3/debian/rules	2010-08-23 13:34:00 UTC (rev 12930)
@@ -25,6 +25,8 @@
 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::
@@ -62,8 +64,9 @@
 	    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/bin/
-	install contrib/lucli/run.sh $(CURDIR)/debian/liblucene$(ABI_VERSION)-java-contrib/usr/bin/lucli
+	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
@@ -109,6 +112,7 @@
 	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