Author: drazzib
Date: 2011-09-11 00:10:07 +0000 (Sun, 11 Sep 2011)
New Revision: 14805
Added:
trunk/commons-configuration/debian/maven.ignoreRules
trunk/commons-configuration/debian/maven.properties
Removed:
trunk/commons-configuration/debian/patches/case.diff
trunk/commons-configuration/debian/patches/disable-tests.diff
trunk/commons-configuration/debian/patches/series
Modified:
trunk/commons-configuration/debian/changelog
trunk/commons-configuration/debian/control
trunk/commons-configuration/debian/copyright
trunk/commons-configuration/debian/rules
Log:
* New upstream release:
- Drop all previous patches.
- Add B-D on libcommons-vfs-java (>= 2.0), libcommons-dbcp-java,
libcommons-pool-java, glassfish-mail and glassfish-activation.
* Bump Standards-Version 3.9.2: no changes needed.
* d/copyright: Use DEP-5 format.
* Switch to Maven build system:
- Add B-D on maven-debian-helper
- Use ${maven:Depends} and ${maven:OptionalDepends} for Depends
and Recommends.
Modified: trunk/commons-configuration/debian/changelog
===================================================================
--- trunk/commons-configuration/debian/changelog 2011-09-11 00:08:28 UTC
(rev 14804)
+++ trunk/commons-configuration/debian/changelog 2011-09-11 00:10:07 UTC
(rev 14805)
@@ -1,3 +1,18 @@
+commons-configuration (1.7-1) unstable; urgency=low
+
+ * New upstream release:
+ - Drop all previous patches.
+ - Add B-D on libcommons-vfs-java (>= 2.0), libcommons-dbcp-java,
+ libcommons-pool-java, glassfish-mail and glassfish-activation.
+ * Bump Standards-Version 3.9.2: no changes needed.
+ * d/copyright: Use DEP-5 format.
+ * Switch to Maven build system:
+ - Add B-D on maven-debian-helper
+ - Use ${maven:Depends} and ${maven:OptionalDepends} for Depends
+ and Recommends.
+
+ -- Damien Raude-Morvan <[email protected]> Sun, 11 Sep 2011 00:55:11 +0200
+
commons-configuration (1.6-6) unstable; urgency=low
* Add myself as Uploaders.
Modified: trunk/commons-configuration/debian/control
===================================================================
--- trunk/commons-configuration/debian/control 2011-09-11 00:08:28 UTC (rev
14804)
+++ trunk/commons-configuration/debian/control 2011-09-11 00:10:07 UTC (rev
14805)
@@ -2,12 +2,37 @@
Section: java
Priority: optional
Maintainer: Debian Java Maintainers
<[email protected]>
-Uploaders: Torsten Werner <[email protected]>, Damien Raude-Morvan
<[email protected]>
-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.5-java,
- default-jdk-doc
+Uploaders: Torsten Werner <[email protected]>,
+ Damien Raude-Morvan <[email protected]>
+Build-Depends: cdbs, debhelper (>= 7), default-jdk, maven-debian-helper
+Build-Depends-Indep: ant,
+ default-jdk-doc,
+ glassfish-activation,
+ glassfish-mail,
+ libcommons-beanutils-java,
+ libcommons-beanutils-java-doc,
+ libcommons-codec-java,
+ libcommons-codec-java-doc,
+ libcommons-collections3-java,
+ libcommons-collections3-java-doc,
+ libcommons-dbcp-java,
+ libcommons-dbcp-java-doc,
+ libcommons-digester-java,
+ libcommons-digester-java-doc,
+ libcommons-jexl-java,
+ libcommons-jxpath-java (>= 1.3-5),
+ libcommons-jxpath-java-doc,
+ libcommons-lang-java (>= 2.3),
+ libcommons-lang-java-doc,
+ libcommons-logging-java,
+ libcommons-logging-java-doc,
+ libcommons-pool-java,
+ libcommons-vfs-java (>= 2.0),
+ libcommons-vfs-java-doc,
+ liblog4j1.2-java-doc,
+ libmaven-assembly-plugin-java,
+ libmaven-javadoc-plugin-java,
+ libservlet2.5-java
Standards-Version: 3.9.2
Homepage: http://commons.apache.org/configuration/
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/commons-configuration
@@ -15,10 +40,8 @@
Package: libcommons-configuration-java
Architecture: all
-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.5-java
+Depends: ${maven:Depends}, ${misc:Depends}
+Recommends: ${maven:OptionalDepends}
Description: Java based library providing a generic configuration interface
Commons Configuration provides a generic configuration interface which enables
an application to read configuration data from a variety of sources:
@@ -56,4 +79,3 @@
configuration objects.
.
This package contains the API documentation for commons-configuration.
-
Modified: trunk/commons-configuration/debian/copyright
===================================================================
--- trunk/commons-configuration/debian/copyright 2011-09-11 00:08:28 UTC
(rev 14804)
+++ trunk/commons-configuration/debian/copyright 2011-09-11 00:10:07 UTC
(rev 14805)
@@ -1,9 +1,9 @@
-This package was debianized by Torsten Werner <[email protected]> on
-Fri Apr 20 14:51:53 CEST 2007.
-
-It was downloaded from http://commons.apache.org/configuration/
-
-Upstream Authors: Daniel Rall <[email protected]>,
+Format: http://dep.debian.net/deps/dep5/
+Upstream-Name: Apache Commons Configuration
+Upstream-Contact: http://commons.apache.org/configuration/
+Source: http://www.apache.org/dist/commons/configuration/
+Comment:
+ Upstream Authors: Daniel Rall <[email protected]>,
Jason van Zyl <[email protected]>,
Martin Poeschl <[email protected]>,
dIon Gillard <[email protected]>,
@@ -19,13 +19,15 @@
Gabriele Garuglieri <[email protected]>,
Nicolas De Loof <[email protected]>
-Copyright: © 2001-2008 The Apache Software Foundation
+Files: *
+Copyright: Copyright 2001-2011 The Apache Software Foundation
+License: Apache-2.0
-License: Apache 2.0
+Files: debian/*
+Copyright: Copyright (C) 2011, Damien Raude-Morvan <[email protected]>
+Copyright: Copyright (C) 2007, Torsten Werner <[email protected]>
+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 Debian packaging is (C) 2007, Torsten Werner <[email protected]> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
-
+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'.
Added: trunk/commons-configuration/debian/maven.ignoreRules
===================================================================
--- trunk/commons-configuration/debian/maven.ignoreRules
(rev 0)
+++ trunk/commons-configuration/debian/maven.ignoreRules 2011-09-11
00:10:07 UTC (rev 14805)
@@ -0,0 +1,25 @@
+# Maven ignore rules - ignore some Maven dependencies and plugins
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+# for the version. In this case, the element is simply matched
+# and left as it is
+# - * (the star character, alone). In this case, anything will
+# match and be left as it is. For example, using * on the
+# position of the artifact field will match any artifact id
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., this dependency is then removed
+# from the POM
+# junit junit jar s/3\\..*/3.x/
+
+org.apache.maven.plugins maven-source-plugin * * * *
+org.apache.maven.plugins maven-changes-plugin * * * *
+
+junit-addons junit-addons * * * *
+mockobjects mockobjects-core * * * *
+mockobjects mockobjects-jdk1.4-j2ee1.3 * * * *
+hsqldb hsqldb * * * *
+org.slf4j slf4j-ext * * * *
+dbunit dbunit * * * *
\ No newline at end of file
Added: trunk/commons-configuration/debian/maven.properties
===================================================================
--- trunk/commons-configuration/debian/maven.properties
(rev 0)
+++ trunk/commons-configuration/debian/maven.properties 2011-09-11 00:10:07 UTC
(rev 14805)
@@ -0,0 +1,4 @@
+maven.test.skip=true
+
+maven.compiler.source=1.5
+maven.compiler.target=1.5
Deleted: trunk/commons-configuration/debian/patches/case.diff
===================================================================
--- trunk/commons-configuration/debian/patches/case.diff 2011-09-11
00:08:28 UTC (rev 14804)
+++ trunk/commons-configuration/debian/patches/case.diff 2011-09-11
00:10:07 UTC (rev 14805)
@@ -1,16 +0,0 @@
-Index: commons-configuration-1.6/build.xml
-===================================================================
---- commons-configuration-1.6.orig/build.xml 2009-01-10 12:53:14.000000000
+0100
-+++ commons-configuration-1.6/build.xml 2009-01-10 12:53:14.000000000
+0100
-@@ -104,9 +104,9 @@
- <mkdir dir="${classesdir}/META-INF"/>
- <copy file="LICENSE.txt" todir="${metadir}"/>
- <copy file="NOTICE.txt" todir="${metadir}"/>
-- <copy file="${conf.home}/manifest.mf" todir="${defaulttargetdir}"
filtering="on"/>
-+ <copy file="${conf.home}/MANIFEST.MF" todir="${defaulttargetdir}"
filtering="on"/>
- <jar jarfile="${defaulttargetdir}/${final.name}.jar"
basedir="${classesdir}"
-- manifest="${defaulttargetdir}/manifest.mf" excludes="**/package.html">
-+ manifest="${defaulttargetdir}/MANIFEST.MF" excludes="**/package.html">
- </jar>
- </target>
- <target name="clean" description="o Clean up the generated directories">
Deleted: trunk/commons-configuration/debian/patches/disable-tests.diff
===================================================================
--- trunk/commons-configuration/debian/patches/disable-tests.diff
2011-09-11 00:08:28 UTC (rev 14804)
+++ trunk/commons-configuration/debian/patches/disable-tests.diff
2011-09-11 00:10:07 UTC (rev 14805)
@@ -1,13 +0,0 @@
-Index: commons-configuration-1.6/build.xml
-===================================================================
---- commons-configuration-1.6.orig/build.xml 2008-12-19 08:34:18.000000000
+0100
-+++ commons-configuration-1.6/build.xml 2009-01-10 12:53:39.000000000
+0100
-@@ -100,7 +100,7 @@
- </copy>
- </target>
-
-- <target name="jar" description="o Create the jar" depends="compile,test">
-+ <target name="jar" description="o Create the jar" depends="compile">
- <mkdir dir="${classesdir}/META-INF"/>
- <copy file="LICENSE.txt" todir="${metadir}"/>
- <copy file="NOTICE.txt" todir="${metadir}"/>
Deleted: trunk/commons-configuration/debian/patches/series
===================================================================
--- trunk/commons-configuration/debian/patches/series 2011-09-11 00:08:28 UTC
(rev 14804)
+++ trunk/commons-configuration/debian/patches/series 2011-09-11 00:10:07 UTC
(rev 14805)
@@ -1,2 +0,0 @@
-disable-tests.diff
-case.diff
Modified: trunk/commons-configuration/debian/rules
===================================================================
--- trunk/commons-configuration/debian/rules 2011-09-11 00:08:28 UTC (rev
14804)
+++ trunk/commons-configuration/debian/rules 2011-09-11 00:10:07 UTC (rev
14805)
@@ -1,29 +1,18 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/class/maven.mk
PACKAGE := $(DEB_SOURCE_PACKAGE)
VERSION := $(DEB_UPSTREAM_VERSION)
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-2.5
-DEB_ANT_BUILD_TARGET := jar javadoc
-DEB_ANT_BUILDFILE := build.xml
-DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -DartifactId=$(PACKAGE)
-Dversion=$(VERSION)
-API_DOCS := dist/docs/api
-binary-post-install/lib$(PACKAGE)-java::
- mh_installpoms -plib$(PACKAGE)-java
- mh_installjar -plib$(PACKAGE)-java -l pom.xml
target/$(PACKAGE)-$(VERSION).jar
+API_DOCS := target/site/apidocs/*
+DEB_MAVEN_DOC_TARGET := javadoc:aggregate
binary-post-install/lib$(PACKAGE)-java-doc::
- dh_install -plib$(PACKAGE)-java-doc $(API_DOCS)
usr/share/doc/lib$(PACKAGE)-java
+ dh_install -plib$(PACKAGE)-java-doc $(API_DOCS)
usr/share/doc/lib$(PACKAGE)-java/api/
-clean::
- -rm -rf debian/tmp
-
get-orig-source:
-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download
--rename
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
