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

Damien Raude-Morvan drazzib at alioth.debian.org
Sat Feb 20 21:53:38 UTC 2010 

Author: drazzib
Date: 2010-02-20 21:53:37 +0000 (Sat, 20 Feb 2010)
New Revision: 11649

Modified:
   trunk/libcommons-dbcp-java/debian/changelog
   trunk/libcommons-dbcp-java/debian/control
   trunk/libcommons-dbcp-java/debian/orig-tar.sh
   trunk/libcommons-dbcp-java/debian/patches/01_build.patch
   trunk/libcommons-dbcp-java/debian/rules
   trunk/libcommons-dbcp-java/debian/watch
Log:
* New upstream release:
* Javadoc:
  - Build-Depends on default-jdk-doc
  - Link generated Javadoc with it
  - libcommons-dbcp-java-doc now Recommends default-jdk-doc
* Rewrite debian/watch and debian/orig-tar.sh to work with upstream
  stable release instead of svn snapshot.

Modified: trunk/libcommons-dbcp-java/debian/changelog
===================================================================
--- trunk/libcommons-dbcp-java/debian/changelog	2010-02-20 13:51:02 UTC (rev 11648)
+++ trunk/libcommons-dbcp-java/debian/changelog	2010-02-20 21:53:37 UTC (rev 11649)
@@ -1,12 +1,19 @@
-libcommons-dbcp-java (1.3~svn828639-2) UNRELEASED; urgency=low
+libcommons-dbcp-java (1.4-1) unstable; urgency=low
 
+  * New upstream release:
   * Use commons-collections 3.x:
     - Build-Depends and Depends on libcommons-collection3-java
     - Update classpath in DEB_JARS from debian/rules
     - Fix transformation in debian/maven.rules
   * Remove Arnaud Vandyck from Uploaders
+  * Javadoc:
+    - Build-Depends on default-jdk-doc
+    - Link generated Javadoc with it
+    - libcommons-dbcp-java-doc now Recommends default-jdk-doc
+  * Rewrite debian/watch and debian/orig-tar.sh to work with upstream
+    stable release instead of svn snapshot.
 
- -- Damien Raude-Morvan <drazzib at debian.org>  Thu, 26 Nov 2009 23:48:43 +0100
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 20 Feb 2010 22:50:18 +0100
 
 libcommons-dbcp-java (1.3~svn828639-1) unstable; urgency=low
 

Modified: trunk/libcommons-dbcp-java/debian/control
===================================================================
--- trunk/libcommons-dbcp-java/debian/control	2010-02-20 13:51:02 UTC (rev 11648)
+++ trunk/libcommons-dbcp-java/debian/control	2010-02-20 21:53:37 UTC (rev 11649)
@@ -4,8 +4,9 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Michael Koch <konqueror at gmx.de>, Damien Raude-Morvan <drazzib at debian.org>
 Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant, quilt
-Build-Depends-Indep: libcommons-pool-java, libcommons-collections3-java, junit, glassfish-javaee, maven-repo-helper
-Standards-Version: 3.8.3
+Build-Depends-Indep: libcommons-pool-java, libcommons-collections3-java, junit,
+ glassfish-javaee, maven-repo-helper, default-jdk-doc, libcommons-pool-java-doc
+Standards-Version: 3.8.4
 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/
@@ -32,7 +33,7 @@
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}
-Recommends: libcommons-pool-java-doc, classpath-doc
+Recommends: libcommons-pool-java-doc, default-jdk-doc
 Suggests: libcommons-dbcp-java
 Description: Database Connection Pooling Services - documentation
  The DBCP package provides database connection pooling services. The

Modified: trunk/libcommons-dbcp-java/debian/orig-tar.sh
===================================================================
--- trunk/libcommons-dbcp-java/debian/orig-tar.sh	2010-02-20 13:51:02 UTC (rev 11648)
+++ trunk/libcommons-dbcp-java/debian/orig-tar.sh	2010-02-20 21:53:37 UTC (rev 11649)
@@ -1,14 +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'`
+# $2 version
+# $3 upstream tarball
+
+TAR=../libcommons-dbcp-java_$2.orig.tar.gz
+DIR=libcommons-dbcp-java-$2.orig
+
+# From SVN
+#VERSION=`echo $2 | sed -e 's/\+.*//g' | sed -e 's/\./_/g'`
 #REVISION=HEAD
-REVISION=`echo $1 | sed -e 's/.*svn//'`
+#REVISION=`echo $2 | sed -e 's/.*svn//'`
+#svn export -r $REVISION http://svn.apache.org/repos/asf/commons/proper/dbcp/trunk $DIR
 
-# clean up the upstream tarball
-svn export -r $REVISION http://svn.apache.org/repos/asf/commons/proper/dbcp/trunk $DIR
+# From Tarball
+tar xvzf $3
+mv commons-dbcp-* $DIR
+
+# Repack
 GZIP=--best tar -c -z -f $TAR $DIR
 rm -rf $DIR
 

Modified: trunk/libcommons-dbcp-java/debian/patches/01_build.patch
===================================================================
--- trunk/libcommons-dbcp-java/debian/patches/01_build.patch	2010-02-20 13:51:02 UTC (rev 11648)
+++ trunk/libcommons-dbcp-java/debian/patches/01_build.patch	2010-02-20 21:53:37 UTC (rev 11649)
@@ -1,20 +1,20 @@
 Description: Cleanup upstream build.xml:
- - Use local Javadoc index
+ - Use local Javadoc index from default-jdk-doc
  - Set test.failonerror to false
 Origin: vendor
 Forwarded: not-needed
-Author: Damien Raude-Morvan <drazzib at drazzib.com>
-Last-Update: 2009-07-14
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2010-02-20
 --- a/build.xml
 +++ b/build.xml
-@@ -214,8 +214,8 @@
+@@ -179,8 +179,8 @@
                 nohelp="true"
                 nonavbar="false"
                 serialwarn="false">
 -          <link href="http://java.sun.com/j2se/1.5.0/docs/api"/>
 -          <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/"/>
++          <link href="/usr/share/doc/default-jdk-doc/api/"/>
++          <link href="/usr/share/doc/libcommons-pool-java/api/"/>
        </javadoc>
     </target>
  

Modified: trunk/libcommons-dbcp-java/debian/rules
===================================================================
--- trunk/libcommons-dbcp-java/debian/rules	2010-02-20 13:51:02 UTC (rev 11648)
+++ trunk/libcommons-dbcp-java/debian/rules	2010-02-20 21:53:37 UTC (rev 11649)
@@ -24,4 +24,6 @@
 	-rm -fr doc/api
 
 get-orig-source:
-	sh debian/orig-tar.sh $(DEB_UPSTREAM_VERSION)
+	uscan --force-download --rename
+	# From SVN
+	# sh debian/orig-tar.sh --upstream-release $(DEB_UPSTREAM_VERSION)

Modified: trunk/libcommons-dbcp-java/debian/watch
===================================================================
--- trunk/libcommons-dbcp-java/debian/watch	2010-02-20 13:51:02 UTC (rev 11648)
+++ trunk/libcommons-dbcp-java/debian/watch	2010-02-20 21:53:37 UTC (rev 11649)
@@ -1,2 +1,3 @@
 version=3
-http://archive.apache.org/dist/commons/dbcp/source/commons-dbcp-(.*)-src.tar.gz
+http://archive.apache.org/dist/commons/dbcp/source/commons-dbcp-(.*)-src.tar.gz \
+	debian debian/orig-tar.sh

More information about the pkg-java-commits mailing list