[pkg-java] r17852 - trunk/libcommons-dbcp-java/debian

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Mon Mar 10 13:58:22 UTC 2014 

Author: ebourg-guest
Date: 2014-03-10 13:58:22 +0000 (Mon, 10 Mar 2014)
New Revision: 17852

Modified:
   trunk/libcommons-dbcp-java/debian/README.source
   trunk/libcommons-dbcp-java/debian/changelog
   trunk/libcommons-dbcp-java/debian/compat
   trunk/libcommons-dbcp-java/debian/control
   trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java.poms
   trunk/libcommons-dbcp-java/debian/maven.ignoreRules
   trunk/libcommons-dbcp-java/debian/orig-tar.sh
   trunk/libcommons-dbcp-java/debian/rules
Log:
Removed the unused build dependency on libclirr-maven-plugin-java
Suggest the optional Maven dependencies instead of recommending them
Standards-Version updated to 3.9.5 (no changes)
Use canonical URLs for the Vcs-* fields
Install the upstream changelog
Use XZ compression for the upstream tarball
Switch to debhelper level 9



Modified: trunk/libcommons-dbcp-java/debian/README.source
===================================================================
--- trunk/libcommons-dbcp-java/debian/README.source	2014-03-10 02:21:19 UTC (rev 17851)
+++ trunk/libcommons-dbcp-java/debian/README.source	2014-03-10 13:58:22 UTC (rev 17852)
@@ -1,5 +1,5 @@
 Information about libcommons-dbcp-java
-------------------------------
+--------------------------------------
 
 This package was debianized using the mh_make command
 from the maven-debian-helper package.

Modified: trunk/libcommons-dbcp-java/debian/changelog
===================================================================
--- trunk/libcommons-dbcp-java/debian/changelog	2014-03-10 02:21:19 UTC (rev 17851)
+++ trunk/libcommons-dbcp-java/debian/changelog	2014-03-10 13:58:22 UTC (rev 17852)
@@ -1,3 +1,16 @@
+libcommons-dbcp-java (1.4-4) UNRELEASED; urgency=medium
+
+  * debian/control:
+    - Removed the unused build dependency on libclirr-maven-plugin-java
+    - Suggest the optional Maven dependencies instead of recommending them
+    - Standards-Version updated to 3.9.5 (no changes)
+    - Use canonical URLs for the Vcs-* fields
+  * Install the upstream changelog
+  * Use XZ compression for the upstream tarball
+  * Switch to debhelper level 9
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 10 Mar 2014 14:16:28 +0100
+
 libcommons-dbcp-java (1.4-3) unstable; urgency=low
 
   * Team upload.

Modified: trunk/libcommons-dbcp-java/debian/compat
===================================================================
--- trunk/libcommons-dbcp-java/debian/compat	2014-03-10 02:21:19 UTC (rev 17851)
+++ trunk/libcommons-dbcp-java/debian/compat	2014-03-10 13:58:22 UTC (rev 17852)
@@ -1 +1 @@
-7
+9

Modified: trunk/libcommons-dbcp-java/debian/control
===================================================================
--- trunk/libcommons-dbcp-java/debian/control	2014-03-10 02:21:19 UTC (rev 17851)
+++ trunk/libcommons-dbcp-java/debian/control	2014-03-10 13:58:22 UTC (rev 17852)
@@ -2,20 +2,19 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4)
-Build-Depends-Indep: libclirr-maven-plugin-java, libmaven-javadoc-plugin-java, libcommons-pool-java,  
+Uploaders: Damien Raude-Morvan <drazzib at debian.org>, Emmanuel Bourg <ebourg at apache.org>
+Build-Depends: debhelper (>= 9), cdbs, default-jdk, maven-debian-helper (>= 1.4)
+Build-Depends-Indep: libmaven-javadoc-plugin-java, libcommons-pool-java,
  default-jdk-doc, libcommons-pool-java-doc, libgeronimo-jta-1.1-spec-java
-Standards-Version: 3.9.1
+Standards-Version: 3.9.5
+Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libcommons-dbcp-java/
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libcommons-dbcp-java/
 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/
 
 Package: libcommons-dbcp-java
 Architecture: all
 Depends: ${misc:Depends}, ${maven:Depends}
-Recommends: ${maven:OptionalDepends}
-Suggests: libcommons-dbcp-java-doc
+Suggests: ${maven:OptionalDepends}, libcommons-dbcp-java-doc
 Description: Database Connection Pooling Services
  The DBCP package provides database connection pooling services. The
  following features are supported

Modified: trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java.poms
===================================================================
--- trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java.poms	2014-03-10 02:21:19 UTC (rev 17851)
+++ trunk/libcommons-dbcp-java/debian/libcommons-dbcp-java.poms	2014-03-10 13:58:22 UTC (rev 17852)
@@ -2,7 +2,9 @@
 # Format of this file is:
 # <path to pom file> [option]*
 # where option can be:
-#   --ignore: ignore this POM or
+#   --ignore: ignore this POM and its artifact if any
+#   --ignore-pom: don't install the POM. To use on POM files that are created
+#     temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
 #   --no-parent: remove the <parent> tag from the POM
 #   --package=<package>: an alternative package to use when installing this POM
 #      and its artifact
@@ -11,16 +13,16 @@
 #   --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
 #      during a clean operation with mh_cleanpom or mh_installpom
 #   --artifact=<path>: path to the build artifact associated with this POM,
-#      it will be installed when using the command mh_install
+#      it will be installed when using the command mh_install. [mh_install]
 #   --java-lib: install the jar into /usr/share/java to comply with Debian
 #      packaging guidelines
 #   --usj-name=<name>: name to use when installing the library in /usr/share/java
 #   --usj-version=<version>: version to use when installing the library in /usr/share/java
 #   --no-usj-versionless: don't install the versionless link in /usr/share/java
-#   --dest-jar=<path>: the destination for the real jar
-#   it will be installed with mh_install.
+#   --dest-jar=<path>: the destination for the real jar.
+#     It will be installed with mh_install. [mh_install]
 #   --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
-#   --ignore-pom: don't install the POM with mh_install or mh_installpoms. To use with POM files that are created
-#     temporarily for certain artifacts such as Javadoc jars.
+#   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+#     Empty by default. [mh_install]
 #
 pom.xml --no-parent --has-package-version --java-lib

Modified: trunk/libcommons-dbcp-java/debian/maven.ignoreRules
===================================================================
--- trunk/libcommons-dbcp-java/debian/maven.ignoreRules	2014-03-10 02:21:19 UTC (rev 17851)
+++ trunk/libcommons-dbcp-java/debian/maven.ignoreRules	2014-03-10 13:58:22 UTC (rev 17852)
@@ -22,6 +22,7 @@
 org.apache.maven.plugins maven-checkstyle-plugin * * * *
 org.apache.maven.plugins maven-pmd-plugin * * * *
 org.apache.maven.plugins maven-surefire-plugin * * * *
+org.codehaus.mojo clirr-maven-plugin * * * *
 org.codehaus.mojo cobertura-maven-plugin * * * *
 org.codehaus.mojo findbugs-maven-plugin * * * *
 tomcat naming-common * * * *

Modified: trunk/libcommons-dbcp-java/debian/orig-tar.sh
===================================================================
--- trunk/libcommons-dbcp-java/debian/orig-tar.sh	2014-03-10 02:21:19 UTC (rev 17851)
+++ trunk/libcommons-dbcp-java/debian/orig-tar.sh	2014-03-10 13:58:22 UTC (rev 17852)
@@ -3,7 +3,7 @@
 # $2 version
 # $3 upstream tarball
 
-TAR=../libcommons-dbcp-java_$2.orig.tar.gz
+TAR=../libcommons-dbcp-java_$2.orig.tar.xz
 DIR=libcommons-dbcp-java-$2.orig
 
 # From SVN
@@ -17,7 +17,7 @@
 mv commons-dbcp-* $DIR
 
 # Repack
-GZIP=--best tar -c -z -f $TAR $DIR
+XZ_OPT=--best tar -c -J -f $TAR $DIR
 rm -rf $DIR
 
 # move to directory 'tarballs'

Modified: trunk/libcommons-dbcp-java/debian/rules
===================================================================
--- trunk/libcommons-dbcp-java/debian/rules	2014-03-10 02:21:19 UTC (rev 17851)
+++ trunk/libcommons-dbcp-java/debian/rules	2014-03-10 13:58:22 UTC (rev 17852)
@@ -5,5 +5,7 @@
 
 JAVA_HOME := /usr/lib/jvm/default-java
 
+DEB_INSTALL_CHANGELOGS_ALL := RELEASE-NOTES.txt
+
 get-orig-source:
 	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename

More information about the pkg-java-commits mailing list