[pkg-java] r5134 - in trunk/libxapool-java/debian: . patches

[twerner at alioth.debian.org]

Author: twerner
Date: 2007-12-18 21:43:20 +0000 (Tue, 18 Dec 2007)
New Revision: 5134

Added:
   trunk/libxapool-java/debian/patches/
   trunk/libxapool-java/debian/patches/database.diff
   trunk/libxapool-java/debian/patches/series
Modified:
   trunk/libxapool-java/debian/
   trunk/libxapool-java/debian/control
   trunk/libxapool-java/debian/orig-tar.sh
   trunk/libxapool-java/debian/rules
Log:
package builds now



Property changes on: trunk/libxapool-java/debian
___________________________________________________________________
Name: mergeWithUpstream
   + 1

Modified: trunk/libxapool-java/debian/control
===================================================================
--- trunk/libxapool-java/debian/control	2007-12-18 21:23:31 UTC (rev 5133)
+++ trunk/libxapool-java/debian/control	2007-12-18 21:43:20 UTC (rev 5134)
@@ -3,7 +3,8 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>
-Build-Depends: ant, cdbs, debhelper (>= 5), java-gcj-compat-dev
+Build-Depends: ant, cdbs, debhelper (>= 5), java-gcj-compat-dev,
+ libcommons-logging-java, quilt
 Standards-Version: 3.7.3
 Homepage: http://xapool.experlog.com/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libxapool/

Modified: trunk/libxapool-java/debian/orig-tar.sh
===================================================================
--- trunk/libxapool-java/debian/orig-tar.sh	2007-12-18 21:23:31 UTC (rev 5133)
+++ trunk/libxapool-java/debian/orig-tar.sh	2007-12-18 21:43:20 UTC (rev 5134)
@@ -9,7 +9,7 @@
 
 # clean up the upstream tarball
 tar -x -z -f $3
-tar -c -z -f $3 --exclude '*.ppt' --exclude '*.jar' $DIR
+tar -c -z -f $3 --exclude '*.ppt' --exclude '*.jar' --exclude '*/CVS*' $DIR
 rm -rf $DIR
 
 # move to directory 'tarballs'

Added: trunk/libxapool-java/debian/patches/database.diff
===================================================================
--- trunk/libxapool-java/debian/patches/database.diff	                        (rev 0)
+++ trunk/libxapool-java/debian/patches/database.diff	2007-12-18 21:43:20 UTC (rev 5134)
@@ -0,0 +1,13 @@
+Index: libxapool-java-1.5.0/build.xml
+===================================================================
+--- libxapool-java-1.5.0.orig/build.xml	2005-05-03 12:09:01.000000000 +0200
++++ libxapool-java-1.5.0/build.xml	2007-12-18 22:36:27.000000000 +0100
+@@ -79,6 +79,8 @@
+       optimize="${compiler.optimize}">
+       <classpath refid="externals.classpath"/>
+       <include name="**/*.java"/>
++      <exclude name="**/org/enhydra/jdbc/instantdb/*.java"/>
++      <exclude name="**/org/enhydra/jdbc/oracle/*.java"/>
+     </javac>
+   </target>
+ 

Added: trunk/libxapool-java/debian/patches/series
===================================================================
--- trunk/libxapool-java/debian/patches/series	                        (rev 0)
+++ trunk/libxapool-java/debian/patches/series	2007-12-18 21:43:20 UTC (rev 5134)
@@ -0,0 +1 @@
+database.diff

Modified: trunk/libxapool-java/debian/rules
===================================================================
--- trunk/libxapool-java/debian/rules	2007-12-18 21:23:31 UTC (rev 5133)
+++ trunk/libxapool-java/debian/rules	2007-12-18 21:43:20 UTC (rev 5134)
@@ -2,11 +2,15 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-DEB_BUILDDIR         := build
 JAVA_HOME            := /usr/lib/jvm/java-gcj
-DEB_ANT_BUILD_TARGET := jxl docs
-DEB_ANT_CLEAN_TARGET := clean
+DEB_ANT_BUILD_TARGET := dist
+DEB_JARS             := commons-logging
 
+install/libxapool-java:: 
+	install -m644 -D output/dist/lib/xapool.jar $(DEB_DESTDIR)/usr/share/java/xapool-$(DEB_UPSTREAM_VERSION).jar
+	dh_link -plibxapool-java /usr/share/java/xapool-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/xapool.jar
+
 get-orig-source:
 	uscan --upstream-version 0 --rename