[pkg-java] r3299 - in trunk/jta/debian: . patches

[Paul Cager]

Author: paulcager-guest
Date: 2007-04-21 22:31:31 +0000 (Sat, 21 Apr 2007)
New Revision: 3299

Added:
   trunk/jta/debian/patches/
   trunk/jta/debian/patches/help-file.patch
Modified:
   trunk/jta/debian/changelog
   trunk/jta/debian/control
   trunk/jta/debian/rules
Log:
Patched build.xml to include index.html as a help file.
Added cdbs as a dependency

Modified: trunk/jta/debian/changelog
===================================================================
--- trunk/jta/debian/changelog	2007-04-21 20:39:16 UTC (rev 3298)
+++ trunk/jta/debian/changelog	2007-04-21 22:31:31 UTC (rev 3299)
@@ -6,7 +6,8 @@
   * Converted to use CDBS (usual build system in pkg-java).
   * Compiles using java-gcj-compat-dev.
   * Changed to debheler version 5.
-  * Swapped from Makefile to build.xml, as upstream's intention.
+  * Upstream provide both a Makefile and a build.xml, but the
+    Makefile is out of date. Swapped to build.xml.
   * Removed dependency on Java runtime (as required by draft Java
     policy).
   * Renamed binary package to "libjta-java".
@@ -15,6 +16,8 @@
     (Closes: #393377)
   * Expanded description, and added end-user documentation.
     (Closes: #34130, #417544)
+  * Amended build.xml to include index.html as a help file.
+    (Closes: #341405)
 
  -- Paul Cager <paul-debian at home.paulcager.org>  Sat, 21 Apr 2007 21:37:36 +0100
 

Modified: trunk/jta/debian/control
===================================================================
--- trunk/jta/debian/control	2007-04-21 20:39:16 UTC (rev 3298)
+++ trunk/jta/debian/control	2007-04-21 22:31:31 UTC (rev 3299)
@@ -4,7 +4,7 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Jaldhar H. Vyas <jaldhar at debian.org>, Arnaud Vandyck <avdyk at debian.org>,
            Michael Koch <konqueror at gmx.de>, Paul Cager <paul-debian at home.paulcager.org>
-Build-Depends: debhelper (>= 5), ant, dpatch (>= 2.0)
+Build-Depends: debhelper (>= 5), ant, dpatch (>= 2.0), cdbs
 Build-Depends-Indep: java-gcj-compat-dev (>= 1.0.65), libxerces2-java,
                      libgnu-regexp-java, libcrimson-java, libjdom0-java,
 		     classpath-doc

Added: trunk/jta/debian/patches/help-file.patch
===================================================================
--- trunk/jta/debian/patches/help-file.patch	2007-04-21 20:39:16 UTC (rev 3298)
+++ trunk/jta/debian/patches/help-file.patch	2007-04-21 22:31:31 UTC (rev 3299)
@@ -0,0 +1,11 @@
+diff -Nur jta_2.6+dfsg.orig/build.xml jta_2.6+dfsg.orig.new/build.xml
+--- jta_2.6+dfsg.orig/build.xml	2007-04-16 23:15:29.000000000 +0100
++++ jta_2.6+dfsg.orig.new/build.xml	2007-04-21 23:17:05.000000000 +0100
+@@ -82,6 +82,7 @@
+       <fileset dir="." includes="de/**/*.class"/>
+       <fileset dir="." includes="de/**/*.conf"/>
+       <fileset dir="." includes="license/**" excludes="license/CVS"/>
++      <fileset dir="." includes="index.html"/>
+     </jar>
+   </target>
+ 

Modified: trunk/jta/debian/rules
===================================================================
--- trunk/jta/debian/rules	2007-04-21 20:39:16 UTC (rev 3298)
+++ trunk/jta/debian/rules	2007-04-21 22:31:31 UTC (rev 3299)
@@ -38,7 +38,7 @@
 	-mkdir jar
 
 makebuilddir/lib$(PACKAGE)-java-doc::
-	echo "$(API_DOCS) usr/share/doc/lib$(PACKAGE)-java" >debian/lib$(PACKAGE)-java-doc.install
+	dh_install -plib$(PACKAGE)-java-doc $(API_DOCS) usr/share/doc/lib$(PACKAGE)-java"
 
 cleanbuilddir/lib$(PACKAGE)-java::
 	rm -rf jar doc/source