[pkg-java] r13342 - in trunk/commons-pool/debian: . patches source

[Damien Raude-Morvan]

Author: drazzib
Date: 2011-02-22 20:59:37 +0000 (Tue, 22 Feb 2011)
New Revision: 13342

Added:
   trunk/commons-pool/debian/source/
   trunk/commons-pool/debian/source/format
Removed:
   trunk/commons-pool/debian/README.source
Modified:
   trunk/commons-pool/debian/changelog
   trunk/commons-pool/debian/control
   trunk/commons-pool/debian/patches/01_build.patch
   trunk/commons-pool/debian/rules
Log:
* New upstream version.
  - d/patches/01_build.patch: Refreshed.
* Bump Standards-Version to 3.9.1 (no changes needed).
* Switch to 3.0 (quilt) source format:
  - d/rules: drop pathsys-quilt.mk.
  - d/control: remove B-D on quilt.
  - d/source/format: set 3.0 (quilt).
  - d/README.source: drop.
* d/control: Remove Depends on JRE (per Debian Java Policy) as this is
  a library package.

Deleted: trunk/commons-pool/debian/README.source
===================================================================
--- trunk/commons-pool/debian/README.source	2011-02-22 20:39:01 UTC (rev 13341)
+++ trunk/commons-pool/debian/README.source	2011-02-22 20:59:37 UTC (rev 13342)
@@ -1,6 +0,0 @@
-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/commons-pool/debian/changelog
===================================================================
--- trunk/commons-pool/debian/changelog	2011-02-22 20:39:01 UTC (rev 13341)
+++ trunk/commons-pool/debian/changelog	2011-02-22 20:59:37 UTC (rev 13342)
@@ -1,3 +1,18 @@
+commons-pool (1.5.5-1) unstable; urgency=low
+
+  * New upstream version.
+    - d/patches/01_build.patch: Refreshed.
+  * Bump Standards-Version to 3.9.1 (no changes needed).
+  * Switch to 3.0 (quilt) source format:
+    - d/rules: drop pathsys-quilt.mk.
+    - d/control: remove B-D on quilt.
+    - d/source/format: set 3.0 (quilt).
+    - d/README.source: drop.
+  * d/control: Remove Depends on JRE (per Debian Java Policy) as this is
+    a library package.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Tue, 22 Feb 2011 21:55:44 +0100
+
 commons-pool (1.5.4-2) unstable; urgency=low
 
   * Remove Arnaud Vandyck from Uploaders

Modified: trunk/commons-pool/debian/control
===================================================================
--- trunk/commons-pool/debian/control	2011-02-22 20:39:01 UTC (rev 13341)
+++ trunk/commons-pool/debian/control	2011-02-22 20:59:37 UTC (rev 13342)
@@ -4,8 +4,8 @@
   Marcus Better <marcus at better.se>, Damien Raude-Morvan <drazzib at debian.org>
 Section: java
 Priority: optional
-Standards-Version: 3.8.4
-Build-Depends: debhelper (>= 7), default-jdk, ant, cdbs, quilt
+Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 7), default-jdk, ant, cdbs
 Build-Depends-Indep: ant-optional, junit, default-jdk-doc, maven-repo-helper
 Homepage: http://commons.apache.org/pool/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/commons-pool/
@@ -13,7 +13,7 @@
 
 Package: libcommons-pool-java
 Architecture: all
-Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless
+Depends: ${misc:Depends}
 Description: pooling implementation for Java objects
  Pool provides an Object-pooling API, with three major aspects:
   1. A generic object pool interface that clients and implementors can use to

Modified: trunk/commons-pool/debian/patches/01_build.patch
===================================================================
--- trunk/commons-pool/debian/patches/01_build.patch	2011-02-22 20:39:01 UTC (rev 13341)
+++ trunk/commons-pool/debian/patches/01_build.patch	2011-02-22 20:59:37 UTC (rev 13342)
@@ -1,22 +1,21 @@
 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
+Last-Update: 2011-02-22
 --- a/build.xml
 +++ b/build.xml
-@@ -53,7 +53,7 @@
+@@ -52,7 +52,7 @@
+       <property name="dist.dir" value="${basedir}/dist"/>
        <property name="dist.jar" value="${dist.dir}/${name}.jar"/>
  
-       <property name="test.entry" value="org.apache.commons.pool.TestAll"/>
 -      <property name="test.failonerror" value="true" /> 
 +      <property name="test.failonerror" value="false" /> 
       
        <property name="javadoc.dir" value="${dist.dir}/docs/api"/>
        <property name="javadoc.bottom" value="&lt;small&gt;Copyright &amp;copy; 2001-2003 Apache Software Foundation. Documenation generated ${TODAY}&lt;/small&gt;."/>
-@@ -95,7 +95,7 @@
+@@ -94,7 +94,7 @@
                 nonavbar="false"
                 serialwarn="false"
                 source="${javac.src.version}">

Modified: trunk/commons-pool/debian/rules
===================================================================
--- trunk/commons-pool/debian/rules	2011-02-22 20:39:01 UTC (rev 13341)
+++ trunk/commons-pool/debian/rules	2011-02-22 20:59:37 UTC (rev 13342)
@@ -1,7 +1,6 @@
 #!/usr/bin/make -f
 
 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	:= /usr/lib/jvm/default-java

Added: trunk/commons-pool/debian/source/format
===================================================================
--- trunk/commons-pool/debian/source/format	                        (rev 0)
+++ trunk/commons-pool/debian/source/format	2011-02-22 20:59:37 UTC (rev 13342)
@@ -0,0 +1 @@
+3.0 (quilt)