[pkg-java] r3946 - in trunk/lucene2/debian: . patches

[janpascal-guest at alioth.debian.org]

Author: janpascal-guest
Date: 2007-08-01 20:30:10 +0000 (Wed, 01 Aug 2007)
New Revision: 3946

Modified:
   trunk/lucene2/debian/TODO.Debian
   trunk/lucene2/debian/patches/02_full.dpatch
   trunk/lucene2/debian/patches/03_fix-benchmark-jar-locations.dpatch
   trunk/lucene2/debian/rules
Log:
Rationalised package a bit

Modified: trunk/lucene2/debian/TODO.Debian
===================================================================
--- trunk/lucene2/debian/TODO.Debian	2007-08-01 20:30:05 UTC (rev 3945)
+++ trunk/lucene2/debian/TODO.Debian	2007-08-01 20:30:10 UTC (rev 3946)
@@ -1,6 +1,8 @@
-TODO list for Debian package of Lucene 2
-----------------------------------------
+TODO
+----
 
+Stuff to do regarding packaging of lucene-2.x.x:
+
 - Split up patches/02_full.dpatch
 - Add patch to prevent downloading of external libraries by ant
 - Put pressure on the release of jtidy for Debian, so contrib/ant can be

Modified: trunk/lucene2/debian/patches/02_full.dpatch
===================================================================
--- trunk/lucene2/debian/patches/02_full.dpatch	2007-08-01 20:30:05 UTC (rev 3945)
+++ trunk/lucene2/debian/patches/02_full.dpatch	2007-08-01 20:30:10 UTC (rev 3946)
@@ -1,7 +1,6 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## 02_full.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
 ##
-## All lines beginning with `## DP:' are a description of the patch.
 ## DP: This patch file contains various patches to get Lucene to work
 ## DP: nicely with Debian. Needs to be split up in separate patches.
 

Modified: trunk/lucene2/debian/patches/03_fix-benchmark-jar-locations.dpatch
===================================================================
--- trunk/lucene2/debian/patches/03_fix-benchmark-jar-locations.dpatch	2007-08-01 20:30:05 UTC (rev 3945)
+++ trunk/lucene2/debian/patches/03_fix-benchmark-jar-locations.dpatch	2007-08-01 20:30:10 UTC (rev 3946)
@@ -1,7 +1,6 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## 03_fix-benchmark-jar-locations.dpatch by Jan-Pascal van Best <janpascal at vanbest.org>
 ##
-## All lines beginning with `## DP:' are a description of the patch.
 ## DP: Fix build.xml of contrib/benchmark so that it uses the jar files
 ## DP: in /usr/share/java instead of those in the Lucene source tarball
 

Modified: trunk/lucene2/debian/rules
===================================================================
--- trunk/lucene2/debian/rules	2007-08-01 20:30:05 UTC (rev 3945)
+++ trunk/lucene2/debian/rules	2007-08-01 20:30:10 UTC (rev 3946)
@@ -1,6 +1,5 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
 #
 # This file was originally written by Joey Hess and Craig Small.
 # As a special exception, when this file is copied by dh-make into a
@@ -113,9 +112,7 @@
 	dh_clean -k -i 
 	dh_installdirs -i
 
-	# Add here commands to install the indep part of the package into
-	# debian/<package>-doc.
-	#INSTALLDOC#
+	# Install the libraries into the liblucene2-java package
 
 	install -m 0644 build/lucene-core-$(LUCENE_VERSION).jar $(CURDIR)/debian/liblucene2-java/usr/share/java
 	ln -s lucene-core-$(LUCENE_VERSION).jar $(CURDIR)/debian/liblucene2-java/usr/share/java/lucene-core.jar
@@ -134,6 +131,7 @@
 	install -d $(CURDIR)/debian/liblucene2-java/usr/share/doc/liblucene2-java
 	cp -a contrib/javascript $(CURDIR)/debian/liblucene2-java/usr/share/doc/liblucene2-java/
 
+	# Install the documentation into the liblucene2-java-doc package
 
 	mkdir -p  $(CURDIR)/debian/liblucene2-java-doc/usr/share/doc/liblucene2-java-doc/
 	cp -r docs $(CURDIR)/debian/liblucene2-java-doc/usr/share/doc/liblucene2-java-doc/