[pkg-java] r4503 - trunk/libproxool-java/debian

[varun-guest at alioth.debian.org]

Author: varun-guest
Date: 2007-10-30 07:29:01 +0000 (Tue, 30 Oct 2007)
New Revision: 4503

Added:
   trunk/libproxool-java/debian/doc-base
Modified:
   trunk/libproxool-java/debian/ant.properties
   trunk/libproxool-java/debian/build.xml
   trunk/libproxool-java/debian/control
   trunk/libproxool-java/debian/orig-tar.exclude
   trunk/libproxool-java/debian/orig-tar.sh
   trunk/libproxool-java/debian/rules
Log:
* Build javadoc
* Add doc-base
* Fix orig-tar.sh add orig-tar.exclude



Modified: trunk/libproxool-java/debian/ant.properties
===================================================================
--- trunk/libproxool-java/debian/ant.properties	2007-10-30 06:10:41 UTC (rev 4502)
+++ trunk/libproxool-java/debian/ant.properties	2007-10-30 07:29:01 UTC (rev 4503)
@@ -1,4 +1,5 @@
 project.name=proxool
 class.dir=class
 source.dir=src/java
+doc.dir=doc/api
 jar.name=proxool.jar

Modified: trunk/libproxool-java/debian/build.xml
===================================================================
--- trunk/libproxool-java/debian/build.xml	2007-10-30 06:10:41 UTC (rev 4502)
+++ trunk/libproxool-java/debian/build.xml	2007-10-30 07:29:01 UTC (rev 4503)
@@ -5,6 +5,7 @@
   <target name="clean">
     <delete dir="${class.dir}" quiet="true"/>
     <delete file="${jar.name}" quiet="true"/>
+    <delete file="${doc.dir}" quiet="true"/>
   </target>
 
   <target name="compile">
@@ -19,4 +20,10 @@
     </jar>
   </target>
 
+  <target name="javadoc" description="Creates Javadoc documentation">
+    <mkdir dir="${doc.dir}"/>
+    <javadoc packagenames="org.logicalcobwebs.*"
+      sourcepath="${source.dir}" destdir="${doc.dir}"/>
+  </target>
+
 </project>

Modified: trunk/libproxool-java/debian/control
===================================================================
--- trunk/libproxool-java/debian/control	2007-10-30 06:10:41 UTC (rev 4502)
+++ trunk/libproxool-java/debian/control	2007-10-30 07:29:01 UTC (rev 4503)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Varun Hiremath <varunhiremath at gmail.com>, Torsten Werner <twerner at debian.org>
-Build-Depends: cdbs, debhelper (>= 5)
+Build-Depends: cdbs, debhelper (>= 5), quilt
 Build-Depends-Indep: ant, java-gcj-compat-dev, libavalon-framework-java, 
  libcommons-logging-java, libservlet2.4-java, libcglib2.1-java
 Standards-Version: 3.7.2

Added: trunk/libproxool-java/debian/doc-base
===================================================================
--- trunk/libproxool-java/debian/doc-base	                        (rev 0)
+++ trunk/libproxool-java/debian/doc-base	2007-10-30 07:29:01 UTC (rev 4503)
@@ -0,0 +1,9 @@
+Document: libproxool-java
+Title: API for proxool
+Authors: Bill Horsman <billhorsman at users.sourceforge.net>
+Abstract: Java JDBC connection pool
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libproxool-java/doc/api/index.html
+Files: /usr/share/doc/libproxool-java/doc/api/*.html

Modified: trunk/libproxool-java/debian/orig-tar.exclude
===================================================================
--- trunk/libproxool-java/debian/orig-tar.exclude	2007-10-30 06:10:41 UTC (rev 4502)
+++ trunk/libproxool-java/debian/orig-tar.exclude	2007-10-30 07:29:01 UTC (rev 4503)
@@ -1,3 +1,4 @@
-*jarjar*
-*lib*
-*api*
+*/jarjar*
+*/lib/*
+*/api/*
+*/api-dev*

Modified: trunk/libproxool-java/debian/orig-tar.sh
===================================================================
--- trunk/libproxool-java/debian/orig-tar.sh	2007-10-30 06:10:41 UTC (rev 4502)
+++ trunk/libproxool-java/debian/orig-tar.sh	2007-10-30 07:29:01 UTC (rev 4503)
@@ -4,8 +4,8 @@
 DIR=libproxool-java-$2.orig
 
 # clean up the upstream tarball
-tar -z -x -f  $3
-mv proxool* $DIR
+tar zxf $3
+mv proxool-$2 $DIR
 GZIP=--best tar -c -z -f $3 -X debian/orig-tar.exclude $DIR
 rm -rf $DIR
 
@@ -13,5 +13,5 @@
 if [ -r .svn/deb-layout ]; then
   . .svn/deb-layout
   mv $3 $origDir
-  echo "moved $TAR to $origDir"
+  echo "moved $3 to $origDir"
 fi

Modified: trunk/libproxool-java/debian/rules
===================================================================
--- trunk/libproxool-java/debian/rules	2007-10-30 06:10:41 UTC (rev 4502)
+++ trunk/libproxool-java/debian/rules	2007-10-30 07:29:01 UTC (rev 4503)
@@ -2,9 +2,10 @@
 
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 JAVA_HOME 		:= /usr/lib/jvm/java-gcj
-DEB_ANT_BUILD_TARGET	:= jar
+DEB_ANT_BUILD_TARGET	:= jar javadoc
 DEB_ANT_BUILDFILE	:= debian/build.xml
 DEB_JARS		:= commons-logging servlet-api jsp-api cglib avalon-framework