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

Fri Apr 15 18:43:32 UTC 2011

Author: drazzib
Date: 2011-04-15 18:43:31 +0000 (Fri, 15 Apr 2011)
New Revision: 13536

Modified:
   trunk/commons-pool/debian/changelog
   trunk/commons-pool/debian/control
   trunk/commons-pool/debian/copyright
   trunk/commons-pool/debian/patches/01_build.patch
   trunk/commons-pool/debian/rules
Log:
* New upstream release.
* d/control: Bump Standards-Version to 3.9.2 (no changes needed).
* d/patches/01_build.patch: Refreshed.
* d/rules: Use mh_clean in clean target.
* d/copyright: Update and format using DEP-5.

Modified: trunk/commons-pool/debian/changelog
===================================================================

--- trunk/commons-pool/debian/changelog	2011-04-15 18:36:23 UTC (rev 13535)
+++ trunk/commons-pool/debian/changelog	2011-04-15 18:43:31 UTC (rev 13536)
@@ -1,3 +1,13 @@
+commons-pool (1.5.6-1) unstable; urgency=low
+
+  * New upstream release.
+  * d/control: Bump Standards-Version to 3.9.2 (no changes needed).
+  * d/patches/01_build.patch: Refreshed.
+  * d/rules: Use mh_clean in clean target.
+  * d/copyright: Update and format using DEP-5.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Fri, 15 Apr 2011 20:25:07 +0200
+
 commons-pool (1.5.5-1) unstable; urgency=low
 
   * New upstream version.

Modified: trunk/commons-pool/debian/control
===================================================================
--- trunk/commons-pool/debian/control	2011-04-15 18:36:23 UTC (rev 13535)
+++ trunk/commons-pool/debian/control	2011-04-15 18:43:31 UTC (rev 13536)
@@ -4,7 +4,7 @@
   Marcus Better <marcus at better.se>, Damien Raude-Morvan <drazzib at debian.org>
 Section: java
 Priority: optional
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 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	2011-04-15 18:36:23 UTC (rev 13535)
+++ trunk/commons-pool/debian/copyright	2011-04-15 18:43:31 UTC (rev 13536)
@@ -1,20 +1,22 @@
-This package was debianized by Adam Heath <doogie at brainfood.com> on
-Sunday, July 21, 2002.
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166
+Upstream-Name: Commons Pool
+Upstream-Contact: Apache Commons: <http://commons.apache.org/pool/>
+Source: http://www.apache.org/dist/commons/pool/
 
-It is currently maintained by the Debian Java Maintainers
-<pkg-java-maintainers at lists.alioth.debian.org>.
+Files: *
+Copyright: Copyright (C) 1999-2011 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'.
+Comment:
+ Upstream authors: Craig McClanahan, David Weinrich, Dirk Verbeeck,
+ Geir Magnusson, Morgan Delagrange, Robert Burrell Donkin, Rodney
+ Waldhoff, Sandy McArthur, Todd Carmichael.
 
-The source was downloaded from <http://commons.apache.org/pool/>.
-
-Upstream authors: Craig McClanahan, David Weinrich, Dirk Verbeeck,
-Geir Magnusson, Morgan Delagrange, Robert Burrell Donkin, Rodney
-Waldhoff, Sandy McArthur, Todd Carmichael.
-
-Copyright (C) 1999-2009 The Apache Software Foundation.
-License: Apache 2.0
+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>
+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'.
-
-The contributions to the Debian packaging by Marcus Better are
-Copyright (C) 2006 Marcus Better <marcus at better.se> and are licensed
-under the Apache License, Version 2.0.

Modified: trunk/commons-pool/debian/patches/01_build.patch
===================================================================
--- trunk/commons-pool/debian/patches/01_build.patch	2011-04-15 18:36:23 UTC (rev 13535)
+++ trunk/commons-pool/debian/patches/01_build.patch	2011-04-15 18:43:31 UTC (rev 13536)
@@ -8,13 +8,13 @@
 +++ b/build.xml
 @@ -52,7 +52,7 @@
        <property name="dist.dir" value="${basedir}/dist"/>
-       <property name="dist.jar" value="${dist.dir}/${name}.jar"/>
+       <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="&lt;small&gt;Copyright &amp;copy; 2001-2003 Apache Software Foundation. Documenation generated ${TODAY}&lt;/small&gt;."/>
+       <property name="javadoc.bottom" value="&lt;small&gt;Copyright &amp;copy; 2001-2011 Apache Software Foundation. Documenation generated ${TODAY}&lt;/small&gt;."/>
 @@ -94,7 +94,7 @@
                 nonavbar="false"
                 serialwarn="false"

Modified: trunk/commons-pool/debian/rules
===================================================================
--- trunk/commons-pool/debian/rules	2011-04-15 18:36:23 UTC (rev 13535)
+++ trunk/commons-pool/debian/rules	2011-04-15 18:43:31 UTC (rev 13536)
@@ -6,6 +6,7 @@
 JAVA_HOME	:= /usr/lib/jvm/default-java
 DEB_JARS        := junit ant-junit
 PACKAGE		:= $(DEB_SOURCE_PACKAGE)
+VERSION 	:= $(DEB_UPSTREAM_VERSION)
 
 DEB_ANT_CLEAN_TARGET := clean
 DEB_ANT_BUILD_TARGET := dist
@@ -14,10 +15,10 @@
 # Per Debian Java Policy, install a versioned JAR and an unversioned symlink
 binary-post-install/lib$(PACKAGE)-java::
 	mh_installpoms -plib$(PACKAGE)-java
-	mh_installjar -plib$(PACKAGE)-java -l pom.xml dist/$(PACKAGE).jar
+	mh_installjar -plib$(PACKAGE)-java -l pom.xml dist/$(PACKAGE)-$(VERSION).jar
 
 clean::
-	-rm -rf debian/tmp
+	mh_clean
 
 get-orig-source:
 	uscan --force-download --rename


