[pkg-java] r14715 - trunk/commons-configuration/debian

[Damien Raude-Morvan]

Author: drazzib
Date: 2011-09-04 12:12:52 +0000 (Sun, 04 Sep 2011)
New Revision: 14715

Modified:
   trunk/commons-configuration/debian/changelog
   trunk/commons-configuration/debian/compat
   trunk/commons-configuration/debian/control
   trunk/commons-configuration/debian/rules
Log:
* Add myself as Uploaders.
* Switch to servlet-api 2.5:
  - d/control: Update Build-Depends and Depends to libservlet2.5-java.
  - d/rules: Set DEB_JARS to servlet-api-2.5.
* Use default-jdk for build.
* d/control: Drop Depends on classpath-doc but
  add Recommends on default-jdk-doc.
* d/control: Fix Vcs-* to use anonymous connection.
* d/control: Update Standards-Version to 3.9.2: no changes needed.
* Bump debhelper compat level to 7.

Modified: trunk/commons-configuration/debian/changelog
===================================================================
--- trunk/commons-configuration/debian/changelog	2011-09-03 23:45:08 UTC (rev 14714)
+++ trunk/commons-configuration/debian/changelog	2011-09-04 12:12:52 UTC (rev 14715)
@@ -1,3 +1,18 @@
+commons-configuration (1.6-6) unstable; urgency=low
+
+  * Add myself as Uploaders.
+  * Switch to servlet-api 2.5:
+    - d/control: Update Build-Depends and Depends to libservlet2.5-java.
+    - d/rules: Set DEB_JARS to servlet-api-2.5.
+  * Use default-jdk for build.
+  * d/control: Drop Depends on classpath-doc but
+    add Recommends on default-jdk-doc.
+  * d/control: Fix Vcs-* to use anonymous connection.
+  * d/control: Update Standards-Version to 3.9.2: no changes needed.
+  * Bump debhelper compat level to 7.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sun, 04 Sep 2011 14:04:06 +0200
+
 commons-configuration (1.6-5) unstable; urgency=low
 
   * Change Build-Depends: default-jdk-doc.

Modified: trunk/commons-configuration/debian/compat
===================================================================
--- trunk/commons-configuration/debian/compat	2011-09-03 23:45:08 UTC (rev 14714)
+++ trunk/commons-configuration/debian/compat	2011-09-04 12:12:52 UTC (rev 14715)
@@ -1 +1 @@
-5
+7

Modified: trunk/commons-configuration/debian/control
===================================================================
--- trunk/commons-configuration/debian/control	2011-09-03 23:45:08 UTC (rev 14714)
+++ trunk/commons-configuration/debian/control	2011-09-04 12:12:52 UTC (rev 14715)
@@ -2,15 +2,15 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Torsten Werner <twerner at debian.org>
-Build-Depends: ant, ant-optional, cdbs, debhelper (>= 5), openjdk-6-jdk
+Uploaders: Torsten Werner <twerner at debian.org>, Damien Raude-Morvan <drazzib at debian.org>
+Build-Depends: ant, ant-optional, cdbs, debhelper (>= 7), default-jdk
 Build-Depends-Indep: maven-repo-helper, libcommons-beanutils-java, libcommons-codec-java,
  libcommons-collections3-java, libcommons-digester-java, libcommons-jxpath-java,
- libcommons-lang-java (>= 2.3), libcommons-logging-java, libservlet2.4-java,
+ libcommons-lang-java (>= 2.3), libcommons-logging-java, libservlet2.5-java,
  default-jdk-doc
-Standards-Version: 3.8.4
+Standards-Version: 3.9.2
 Homepage: http://commons.apache.org/configuration/
-Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/commons-configuration
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/commons-configuration
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/commons-configuration/
 
 Package: libcommons-configuration-java
@@ -18,7 +18,7 @@
 Depends: ${shlibs:Depends}, ${misc:Depends}, libcommons-collections3-java, 
  libcommons-lang-java (>= 2.3), libcommons-logging-java, libcommons-digester-java,
  libcommons-beanutils-java, libcommons-codec-java,
-Recommends: libcommons-jxpath-java, libservlet2.4-java
+Recommends: libcommons-jxpath-java, libservlet2.5-java
 Suggests: java-virtual-machine
 Description: Java based library providing a generic configuration interface
  Commons Configuration provides a generic configuration interface which enables
@@ -38,7 +38,8 @@
 Package: libcommons-configuration-java-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}, classpath-doc
+Depends: ${misc:Depends}
+Recommends: default-jdk-doc
 Suggests: libcommons-configuration-java
 Description: API Documentation for commons-configuration
  Commons Configuration provides a generic configuration interface which enables

Modified: trunk/commons-configuration/debian/rules
===================================================================
--- trunk/commons-configuration/debian/rules	2011-09-03 23:45:08 UTC (rev 14714)
+++ trunk/commons-configuration/debian/rules	2011-09-04 12:12:52 UTC (rev 14715)
@@ -5,10 +5,10 @@
 
 PACKAGE			   := $(DEB_SOURCE_PACKAGE)
 VERSION			   := $(DEB_UPSTREAM_VERSION)
-JAVA_HOME          := /usr/lib/jvm/java-6-openjdk
+JAVA_HOME                  := /usr/lib/jvm/default-java
 DEB_JARS  := ant-nodeps commons-beanutils commons-codec commons-collections3 \
              commons-digester commons-jxpath commons-lang commons-logging    \
-	     servlet-api
+	     servlet-api-2.5
 DEB_ANT_BUILD_TARGET := jar javadoc
 DEB_ANT_BUILDFILE    := build.xml
 DEB_ANT_ARGS         := -Dpackage=$(PACKAGE) -DartifactId=$(PACKAGE) -Dversion=$(VERSION)