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

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-03-25 18:14:43 +0000 (Mon, 25 Mar 2013)
New Revision: 16429

Modified:
   trunk/commons-pool/debian/changelog
   trunk/commons-pool/debian/control
   trunk/commons-pool/debian/copyright
   trunk/commons-pool/debian/patches/01_build.patch
Log:
New upstream release (1.6)

Modified: trunk/commons-pool/debian/changelog
===================================================================
--- trunk/commons-pool/debian/changelog	2013-03-24 18:19:25 UTC (rev 16428)
+++ trunk/commons-pool/debian/changelog	2013-03-25 18:14:43 UTC (rev 16429)
@@ -1,3 +1,13 @@
+commons-pool (1.6-1) unstable; urgency=low
+
+  * Team upload
+  * New upstream release.
+  * d/control: Bump Standards-Version to 3.9.4 (no changes needed).
+  * d/patches/01_build.patch: Refreshed.
+  * d/copyright: Fixed duplicate copyright fields
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 25 Mar 2013 16:46:27 +0100
+
 commons-pool (1.5.6-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/commons-pool/debian/control
===================================================================
--- trunk/commons-pool/debian/control	2013-03-24 18:19:25 UTC (rev 16428)
+++ trunk/commons-pool/debian/control	2013-03-25 18:14:43 UTC (rev 16429)
@@ -1,10 +1,10 @@
 Source: commons-pool
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Adam Heath <doogie at brainfood.com>,
-  Marcus Better <marcus at better.se>, Damien Raude-Morvan <drazzib at debian.org>
+  Marcus Better <marcus at better.se>, Damien Raude-Morvan <drazzib at debian.org>, Emmanuel Bourg <ebourg at apache.org>
 Section: java
 Priority: optional
-Standards-Version: 3.9.2
+Standards-Version: 3.9.4
 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/

Modified: trunk/commons-pool/debian/copyright
===================================================================
--- trunk/commons-pool/debian/copyright	2013-03-24 18:19:25 UTC (rev 16428)
+++ trunk/commons-pool/debian/copyright	2013-03-25 18:14:43 UTC (rev 16429)
@@ -1,5 +1,5 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166
-Upstream-Name: Commons Pool
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Apache Commons Pool
 Upstream-Contact: Apache Commons: <http://commons.apache.org/pool/>
 Source: http://www.apache.org/dist/commons/pool/
 
@@ -14,9 +14,9 @@
  Waldhoff, Sandy McArthur, Todd Carmichael.
 
 Files: debian/*
-Copyright: Copyright (C) 2002 Adam Heath <doogie at brainfood.com>
-Copyright: Copyright (C) 2006 Marcus Better <marcus at better.se>
-Copyright: Copyright (C) 2010-2011 Damien Raude-Morvan <drazzib at debian.org>
+Copyright: 2002 Adam Heath <doogie at brainfood.com>
+           2006 Marcus Better <marcus at better.se>
+           2010-2011 Damien Raude-Morvan <drazzib at debian.org>
 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'.

Modified: trunk/commons-pool/debian/patches/01_build.patch
===================================================================
--- trunk/commons-pool/debian/patches/01_build.patch	2013-03-24 18:19:25 UTC (rev 16428)
+++ trunk/commons-pool/debian/patches/01_build.patch	2013-03-25 18:14:43 UTC (rev 16429)
@@ -1,26 +1,36 @@
 Description: Cleanup upstream build.xml:
  - Use local Javadoc index
  - Set test.failonerror to false
+ - Remove the -SNAPSHOT suffix from the version
 Forwarded: not-needed
 Author: Damien Raude-Morvan <drazzib at drazzib.com>
-Last-Update: 2011-02-22
+Last-Update: 2013-03-25
 --- a/build.xml
 +++ b/build.xml
+@@ -40,7 +40,7 @@
+ 
+       <property name="name" value="commons-pool"/>
+       <property name="title" value="Apache Commons Object Pooling Package"/>
+-      <property name="version" value="1.6-SNAPSHOT"/>
++      <property name="version" value="1.6"/>
+       <property name="package" value="org.apache.commons.pool.*"/>
+ 
+       <property name="src.dir" value="${basedir}/src"/>
 @@ -52,7 +52,7 @@
-       <property name="dist.dir" value="${basedir}/dist"/>
-       <property name="dist.jar" value="${dist.dir}/${name}-${version}.jar"/>
- 
--      <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="<small>Copyright &copy; 2001-2011 Apache Software Foundation. Documenation generated ${TODAY}</small>."/>
+       <property name="dist.dir" value="${basedir}/dist"/>
+       <property name="dist.jar" value="${dist.dir}/${name}-${version}.jar"/>
+ 
+-      <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="<small>Copyright &copy; 2001-2012 Apache Software Foundation. Documenation generated ${TODAY}</small>."/>
 @@ -94,7 +94,7 @@
-                nonavbar="false"
-                serialwarn="false"
-                source="${javac.src.version}">
--          <link href="http://java.sun.com/j2se/1.4.2/docs/api"/>
-+          <link href="/usr/share/doc/default-jdk-doc/api/"/>
-       </javadoc>
-    </target>
- 
+                nonavbar="false"
+                serialwarn="false"
+                source="${javac.src.version}">
+-          <link href="http://java.sun.com/j2se/1.4.2/docs/api"/>
++          <link href="/usr/share/doc/default-jdk-doc/api"/>
+       </javadoc>
+    </target>
+