[pkg-java] r9341 - in trunk/libcommons-dbcp-java/debian: . patches

Damien Raude-Morvan drazzib-guest at alioth.debian.org
Tue Jul 14 17:51:41 UTC 2009


Author: drazzib-guest
Date: 2009-07-14 17:51:40 +0000 (Tue, 14 Jul 2009)
New Revision: 9341

Added:
   trunk/libcommons-dbcp-java/debian/README.source
   trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java-doc.doc-base
   trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java-doc.docs
   trunk/libcommons-dbcp-java/debian/patches/
   trunk/libcommons-dbcp-java/debian/patches/01_build.patch
   trunk/libcommons-dbcp-java/debian/patches/series
Removed:
   trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java.dirs
   trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java.docs
   trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java.links
Modified:
   trunk/libcommons-dbcp-java/debian/changelog
   trunk/libcommons-dbcp-java/debian/compat
   trunk/libcommons-dbcp-java/debian/control
   trunk/libcommons-dbcp-java/debian/copyright
   trunk/libcommons-dbcp-java/debian/rules
Log:
libcommons-dbcp-java (1.2.2-2) UNRELEASED; urgency=low

  [ Emmanuel Bourg ]
  * Update of the URLs
  * Rename Jakarta Commons to Apache Commons
  * debian/copyright: Switch to Apache License 2.0. Closes: #532888.

  [ Damien Raude-Morvan ]
  * Add myself as Uploaders
  * Bump Debhelper to 5
  * Use default-jdk/jre:
    - Build-Depends on default-jdk
    - Depends on default-jre-headless
    - Use /usr/lib/jvm/default-java as JAVA_HOME
  * Updated Standards-Version to 3.8.2:
    - Change section to "java"
    - Include a get-orig-source target
    - Add Homepage field
  * Remove useless dirs/links debhelper files
  * Split Javadoc API in a -doc package
  * Use quilt as patch system

 -- Damien Raude-Morvan <drazzib at drazzib.com>  Tue, 14 Jul 2009 19:47:18 +0200



Added: trunk/libcommons-dbcp-java/debian/README.source
===================================================================
--- trunk/libcommons-dbcp-java/debian/README.source	                        (rev 0)
+++ trunk/libcommons-dbcp-java/debian/README.source	2009-07-14 17:51:40 UTC (rev 9341)
@@ -0,0 +1,6 @@
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+See /usr/share/doc/quilt/README.source for a detailed explanation.
+

Modified: trunk/libcommons-dbcp-java/debian/changelog
===================================================================
--- trunk/libcommons-dbcp-java/debian/changelog	2009-07-14 15:56:59 UTC (rev 9340)
+++ trunk/libcommons-dbcp-java/debian/changelog	2009-07-14 17:51:40 UTC (rev 9341)
@@ -1,14 +1,27 @@
-libcommons-dbcp-java (1.2.2-1.1) UNRELEASED; urgency=low
+libcommons-dbcp-java (1.2.2-2) UNRELEASED; urgency=low
 
-  * Non-maintainer upload.
-
   [ Emmanuel Bourg ]
   * Update of the URLs
   * Rename Jakarta Commons to Apache Commons
   * debian/copyright: Switch to Apache License 2.0. Closes: #532888.
 
- -- Sylvestre Ledru <sylvestre.ledru at inria.fr>  Wed, 17 Jun 2009 10:50:10 +0200
+  [ Damien Raude-Morvan ]
+  * Add myself as Uploaders
+  * Bump Debhelper to 5
+  * Use default-jdk/jre:
+    - Build-Depends on default-jdk
+    - Depends on default-jre-headless
+    - Use /usr/lib/jvm/default-java as JAVA_HOME
+  * Updated Standards-Version to 3.8.2:
+    - Change section to "java"
+    - Include a get-orig-source target
+    - Add Homepage field
+  * Remove useless dirs/links debhelper files
+  * Split Javadoc API in a -doc package
+  * Use quilt as patch system
 
+ -- Damien Raude-Morvan <drazzib at drazzib.com>  Tue, 14 Jul 2009 19:47:18 +0200
+
 libcommons-dbcp-java (1.2.2-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/libcommons-dbcp-java/debian/compat
===================================================================
--- trunk/libcommons-dbcp-java/debian/compat	2009-07-14 15:56:59 UTC (rev 9340)
+++ trunk/libcommons-dbcp-java/debian/compat	2009-07-14 17:51:40 UTC (rev 9341)
@@ -1 +1 @@
-4
+5

Modified: trunk/libcommons-dbcp-java/debian/control
===================================================================
--- trunk/libcommons-dbcp-java/debian/control	2009-07-14 15:56:59 UTC (rev 9340)
+++ trunk/libcommons-dbcp-java/debian/control	2009-07-14 17:51:40 UTC (rev 9341)
@@ -1,15 +1,18 @@
 Source: libcommons-dbcp-java
-Section: libs
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 4.2.30), cdbs
-Build-Depends-Indep: libcommons-pool-java, libcommons-collections-java, junit, ant, java-gcj-compat-dev
-Standards-Version: 3.7.2
+Uploaders: Arnaud Vandyck <avdyk at debian.org>, Michael Koch <konqueror at gmx.de>, Damien Raude-Morvan <drazzib at drazzib.com>
+Build-Depends: debhelper (>= 5), cdbs, default-jdk, ant, quilt
+Build-Depends-Indep: libcommons-pool-java, libcommons-collections-java, junit
+Standards-Version: 3.8.2
+Homepage: http://commons.apache.org/dbcp/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-dbcp-java/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-dbcp-java/
 
 Package: libcommons-dbcp-java
 Architecture: all
-Depends: java-gcj-compat | java1-runtime | java2-runtime, libcommons-pool-java, libcommons-collections-java
+Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless, libcommons-pool-java, libcommons-collections-java
 Description: Database Connection Pooling Services
  The DBCP package provides database connection pooling services. The
  following features are supported
@@ -23,4 +26,25 @@
   * XML configuration.
  .
  This is a part of the Apache Commons Project.
- Home: <http://commons.apache.org/dbcp/>
+
+Package: libcommons-dbcp-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Recommends: libcommons-pool-java-doc, classpath-doc
+Suggests: libcommons-dbcp-java
+Description: Database Connection Pooling Services - documentation
+ The DBCP package provides database connection pooling services. The
+ following features are supported
+ .
+  * DataSource and Driver interfaces to the pool.
+  * Support for arbitrary sources of the underlying Connections.
+  * Integration with arbitrary org.apache.commons.pool.ObjectPool
+    implementations.
+  * Support for Connection validation, expiration, etc.
+  * Support for PreparedStatement pooling.
+  * XML configuration.
+ .
+ This is a part of the Apache Commons Project.
+ .
+ This package contains Javadoc API Documentation of Commons DBCP.

Modified: trunk/libcommons-dbcp-java/debian/copyright
===================================================================
--- trunk/libcommons-dbcp-java/debian/copyright	2009-07-14 15:56:59 UTC (rev 9340)
+++ trunk/libcommons-dbcp-java/debian/copyright	2009-07-14 17:51:40 UTC (rev 9341)
@@ -13,14 +13,14 @@
                   Dirk Verbeeck,
                   Yoav Shapira <yoavs at apache.org>,
                   Phil Steitz,
-                  Jörg Schaible <joerg.schaible at gmx.de>,
+                  Jörg Schaible <joerg.schaible at gmx.de>,
                   Todd Carmichael <toddc at concur.com>,
                   Wayne Woodfield,
                   Dain Sundstrom <dain at apache.org>
 
-Copyright: © 2001-2008 The Apache Software Foundation
+Copyright: © 2001-2008 The Apache Software Foundation
 
 License: Apache 2.0
 
-On Debian systems the full text of the Apache License can be found
-in `/usr/share/common-licenses/Apache-2.0'.
+  On Debian systems the full text of the Apache License can be found
+  in `/usr/share/common-licenses/Apache-2.0'.

Added: trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java-doc.doc-base
===================================================================
--- trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java-doc.doc-base	                        (rev 0)
+++ trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java-doc.doc-base	2009-07-14 17:51:40 UTC (rev 9341)
@@ -0,0 +1,10 @@
+Document: libcommons-dbcp-java
+Title: API Javadoc for libcommons-dbcp-java
+Author: libcommons-dbcp-java developers
+Abstract: This is the API Javadoc provided by the libcommons-dbcp-java library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libcommons-dbcp-java-doc/api/index.html
+Files: /usr/share/doc/libcommons-dbcp-java-doc/api/*
+

Copied: trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java-doc.docs (from rev 9287, trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java.docs)
===================================================================
--- trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java-doc.docs	                        (rev 0)
+++ trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java-doc.docs	2009-07-14 17:51:40 UTC (rev 9341)
@@ -0,0 +1 @@
+dist/docs/*

Deleted: trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java.dirs
===================================================================
--- trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java.dirs	2009-07-14 15:56:59 UTC (rev 9340)
+++ trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java.dirs	2009-07-14 17:51:40 UTC (rev 9341)
@@ -1,2 +0,0 @@
-usr/share/java
-

Deleted: trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java.docs
===================================================================
--- trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java.docs	2009-07-14 15:56:59 UTC (rev 9340)
+++ trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java.docs	2009-07-14 17:51:40 UTC (rev 9341)
@@ -1 +0,0 @@
-dist/docs/*

Deleted: trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java.links
===================================================================
--- trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java.links	2009-07-14 15:56:59 UTC (rev 9340)
+++ trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java.links	2009-07-14 17:51:40 UTC (rev 9341)
@@ -1 +0,0 @@
-usr/share/java/commons-dbcp-1.2.1.jar usr/share/java/commons-dbcp.jar

Added: trunk/libcommons-dbcp-java/debian/patches/01_build.patch
===================================================================
--- trunk/libcommons-dbcp-java/debian/patches/01_build.patch	                        (rev 0)
+++ trunk/libcommons-dbcp-java/debian/patches/01_build.patch	2009-07-14 17:51:40 UTC (rev 9341)
@@ -0,0 +1,31 @@
+Description: Cleanup upstream build.xml:
+ - Use local Javadoc index
+ - Set test.failonerror to false
+Origin: vendor
+Forwarded: not-needed
+Author: Damien Raude-Morvan <drazzib at drazzib.com>
+Last-Update: 2009-07-14
+--- a/build.xml
++++ b/build.xml
+@@ -133,8 +133,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="/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 @@
++test.failonerror=false

Added: trunk/libcommons-dbcp-java/debian/patches/series
===================================================================
--- trunk/libcommons-dbcp-java/debian/patches/series	                        (rev 0)
+++ trunk/libcommons-dbcp-java/debian/patches/series	2009-07-14 17:51:40 UTC (rev 9341)
@@ -0,0 +1 @@
+01_build.patch

Modified: trunk/libcommons-dbcp-java/debian/rules
===================================================================
--- trunk/libcommons-dbcp-java/debian/rules	2009-07-14 15:56:59 UTC (rev 9340)
+++ trunk/libcommons-dbcp-java/debian/rules	2009-07-14 17:51:40 UTC (rev 9341)
@@ -1,22 +1,26 @@
 #!/usr/bin/make -f
 # debian/rules for libcommons-dbcp-java
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME_DIRS       := /usr/lib/jvm/java-gcj
-ANT_HOME             := /usr/share/ant
-DEB_JARS             := commons-collections commons-pool junit $(ANT_HOME)/lib/ant-launcher.jar
+JAVA_HOME            := /usr/lib/jvm/default-java
+DEB_JARS             := commons-collections commons-pool junit
+BASENAME=commons-dbcp
+
+DEB_ANT_CLEAN_TARGET := clean
 DEB_ANT_BUILD_TARGET := build
+#DEB_ANT_CHECK_TARGET := test
 
-LIBRARY=commons-dbcp
-VERSION=1.2.1
+# 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
 
-install/lib${LIBRARY}-java::
-	install -m 644 dist/${LIBRARY}.jar debian/libcommons-dbcp-java/usr/share/java/${LIBRARY}-${VERSION}.jar
-
 clean::
 	-rm -fr doc/api
+
+get-orig-source:
+	uscan --force-download --rename




More information about the pkg-java-commits mailing list