Author: drazzib-guest
Date: 2009-08-14 09:43:42 +0000 (Fri, 14 Aug 2009)
New Revision: 9972
Added:
trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java-doc.install
trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java.poms
trunk/libcommons-dbcp-java/debian/maven.rules
trunk/libcommons-dbcp-java/debian/orig-tar.sh
Removed:
trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java-doc.docs
Modified:
trunk/libcommons-dbcp-java/debian/changelog
trunk/libcommons-dbcp-java/debian/control
trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java-doc.doc-base
trunk/libcommons-dbcp-java/debian/patches/01_build.patch
trunk/libcommons-dbcp-java/debian/rules
Log:
[commons-dbcp]
[ Damien Raude-Morvan ]
* New upstream SVN snapshot (r803474).
- Add Build-Depends and Suggests on glassfish-javaee
* Maven POMs:
- Add a Build-Depends-Indep dependency on maven-repo-helper
- Use mh_installpom and mh_installjar to install the POM and the jar to the
Maven repository
* Move api documentation to /usr/share/doc/libcommons-dbcp-java/api
Modified: trunk/libcommons-dbcp-java/debian/changelog
===================================================================
--- trunk/libcommons-dbcp-java/debian/changelog 2009-08-14 04:24:29 UTC (rev
9971)
+++ trunk/libcommons-dbcp-java/debian/changelog 2009-08-14 09:43:42 UTC (rev
9972)
@@ -1,4 +1,4 @@
-libcommons-dbcp-java (1.2.2-2) UNRELEASED; urgency=low
+libcommons-dbcp-java (1.3~svn803474-1) UNRELEASED; urgency=low
[ Emmanuel Bourg ]
* Update of the URLs
@@ -6,6 +6,8 @@
* debian/copyright: Switch to Apache License 2.0. Closes: #532888.
[ Damien Raude-Morvan ]
+ * New upstream SVN snapshot (r803474).
+ - Add Build-Depends and Suggests on glassfish-javaee
* Add myself as Uploaders
* Bump Debhelper to 5
* Use default-jdk/jre:
@@ -19,8 +21,13 @@
* Remove useless dirs/links debhelper files
* Split Javadoc API in a -doc package
* Use quilt as patch system
+ * Maven POMs:
+ - Add a Build-Depends-Indep dependency on maven-repo-helper
+ - Use mh_installpom and mh_installjar to install the POM and the jar to the
+ Maven repository
+ * Move api documentation to /usr/share/doc/libcommons-dbcp-java/api
- -- Damien Raude-Morvan <[email protected]> Tue, 14 Jul 2009 19:47:18 +0200
+ -- Damien Raude-Morvan <[email protected]> Fri, 14 Aug 2009 01:58:53 +0200
libcommons-dbcp-java (1.2.2-1) unstable; urgency=low
Modified: trunk/libcommons-dbcp-java/debian/control
===================================================================
--- trunk/libcommons-dbcp-java/debian/control 2009-08-14 04:24:29 UTC (rev
9971)
+++ trunk/libcommons-dbcp-java/debian/control 2009-08-14 09:43:42 UTC (rev
9972)
@@ -4,7 +4,7 @@
Maintainer: Debian Java Maintainers
<[email protected]>
Uploaders: Arnaud Vandyck <[email protected]>, Michael Koch <[email protected]>,
Damien Raude-Morvan <[email protected]>
Build-Depends: debhelper (>= 5), cdbs, default-jdk, ant, quilt
-Build-Depends-Indep: libcommons-pool-java, libcommons-collections-java, junit
+Build-Depends-Indep: libcommons-pool-java, libcommons-collections-java, junit,
glassfish-javaee, maven-repo-helper
Standards-Version: 3.8.2
Homepage: http://commons.apache.org/dbcp/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-dbcp-java/
@@ -13,6 +13,7 @@
Package: libcommons-dbcp-java
Architecture: all
Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless,
libcommons-pool-java, libcommons-collections-java
+Suggests: glassfish-javaee
Description: Database Connection Pooling Services
The DBCP package provides database connection pooling services. The
following features are supported
Modified: trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java-doc.doc-base
===================================================================
--- trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java-doc.doc-base
2009-08-14 04:24:29 UTC (rev 9971)
+++ trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java-doc.doc-base
2009-08-14 09:43:42 UTC (rev 9972)
@@ -5,6 +5,6 @@
Section: Programming
Format: HTML
-Index: /usr/share/doc/libcommons-dbcp-java-doc/api/index.html
-Files: /usr/share/doc/libcommons-dbcp-java-doc/api/*
+Index: /usr/share/doc/libcommons-dbcp-java/api/index.html
+Files: /usr/share/doc/libcommons-dbcp-java/api/*
Deleted: trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java-doc.docs
===================================================================
--- trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java-doc.docs
2009-08-14 04:24:29 UTC (rev 9971)
+++ trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java-doc.docs
2009-08-14 09:43:42 UTC (rev 9972)
@@ -1 +0,0 @@
-dist/docs/*
Copied: trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java-doc.install
(from rev 9970, trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java-doc.docs)
===================================================================
--- trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java-doc.install
(rev 0)
+++ trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java-doc.install
2009-08-14 09:43:42 UTC (rev 9972)
@@ -0,0 +1 @@
+dist/docs/* /usr/share/doc/libcommons-dbcp-java
Added: trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java.poms
===================================================================
--- trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java.poms
(rev 0)
+++ trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java.poms 2009-08-14
09:43:42 UTC (rev 9972)
@@ -0,0 +1 @@
+pom.xml --no-parent
Added: trunk/libcommons-dbcp-java/debian/maven.rules
===================================================================
--- trunk/libcommons-dbcp-java/debian/maven.rules
(rev 0)
+++ trunk/libcommons-dbcp-java/debian/maven.rules 2009-08-14 09:43:42 UTC
(rev 9972)
@@ -0,0 +1,2 @@
+junit junit jar s/3\..*/3.x/ *
+s/org.apache.geronimo.specs/glassfish/ s/geronimo-jta_1.1_spec/javaee/ jar
s/.*/debian/
Added: trunk/libcommons-dbcp-java/debian/orig-tar.sh
===================================================================
--- trunk/libcommons-dbcp-java/debian/orig-tar.sh
(rev 0)
+++ trunk/libcommons-dbcp-java/debian/orig-tar.sh 2009-08-14 09:43:42 UTC
(rev 9972)
@@ -0,0 +1,22 @@
+#!/bin/sh -e
+
+# $1 version
+TAR=../libcommons-dbcp-java_$1.orig.tar.gz
+DIR=libcommons-dbcp-java-$1.orig
+VERSION=`echo $1 | sed -e 's/\+.*//g' | sed -e 's/\./_/g'`
+#REVISION=HEAD
+REVISION=`echo $1 | sed -e 's/.*svn//'`
+
+# clean up the upstream tarball
+svn export -r $REVISION
http://svn.apache.org/repos/asf/commons/proper/dbcp/trunk $DIR
+GZIP=--best tar -c -z -f $TAR $DIR
+rm -rf $DIR
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+ . .svn/deb-layout
+ mv $TAR $origDir
+ echo "moved $TAR to $origDir"
+fi
+
+exit 0
Modified: trunk/libcommons-dbcp-java/debian/patches/01_build.patch
===================================================================
--- trunk/libcommons-dbcp-java/debian/patches/01_build.patch 2009-08-14
04:24:29 UTC (rev 9971)
+++ trunk/libcommons-dbcp-java/debian/patches/01_build.patch 2009-08-14
09:43:42 UTC (rev 9972)
@@ -7,24 +7,17 @@
Last-Update: 2009-07-14
--- a/build.xml
+++ b/build.xml
-@@ -133,8 +133,8 @@
+@@ -214,8 +214,8 @@
nohelp="true"
nonavbar="false"
serialwarn="false">
- <link href="http://java.sun.com/j2se/1.5.0/docs/api"/>
-- <link href="http://jakarta.apache.org/commons/pool/apidocs"/>
+- <link href="http://commons.apache.org/pool/apidocs"/>
+ <link href="/usr/share/doc/classpath-doc/api/"/>
+ <link href="/usr/share/doc/libcommons-pool-java-doc/api/"/>
</javadoc>
</target>
-@@ -211,4 +211,4 @@
-
- <target name="dist" depends="build" description="gump target"/>
-
--</project>
-\ No newline at end of file
-+</project>
--- /dev/null
+++ b/build.properties
@@ -0,0 +1 @@
Modified: trunk/libcommons-dbcp-java/debian/rules
===================================================================
--- trunk/libcommons-dbcp-java/debian/rules 2009-08-14 04:24:29 UTC (rev
9971)
+++ trunk/libcommons-dbcp-java/debian/rules 2009-08-14 09:43:42 UTC (rev
9972)
@@ -6,21 +6,22 @@
include /usr/share/cdbs/1/class/ant.mk
JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := commons-collections commons-pool junit
-BASENAME=commons-dbcp
+DEB_JARS := commons-collections commons-pool junit glassfish-javaee
+PACKAGE=commons-dbcp
+
DEB_ANT_CLEAN_TARGET := clean
DEB_ANT_BUILD_TARGET := build
#DEB_ANT_CHECK_TARGET := test
# Per Debian Java Policy, install a versioned JAR and an unversioned symlink
-binary-post-install/lib$(BASENAME)-java::
- mv dist/$(BASENAME).jar dist/$(BASENAME)-$(DEB_UPSTREAM_VERSION).jar
- dh_install dist/$(BASENAME)-$(DEB_UPSTREAM_VERSION).jar /usr/share/java
- dh_link /usr/share/java/$(BASENAME)-$(DEB_UPSTREAM_VERSION).jar
/usr/share/java/$(BASENAME).jar
+binary-post-install/lib$(PACKAGE)-java::
+ mh_installpoms -plib$(PACKAGE)-java
+ mh_installjar -plib$(PACKAGE)-java -l pom.xml dist/$(PACKAGE).jar
clean::
+ -rm -rf debian/tmp
-rm -fr doc/api
get-orig-source:
- uscan --force-download --rename
+ sh debian/orig-tar.sh $(DEB_UPSTREAM_VERSION)
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
