[pkg-java] r14810 - in tags/commons-configuration: . 1.7-1/debian 1.7-1/debian/patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Sun Sep 11 00:19:04 UTC 2011
Author: drazzib
Date: 2011-09-11 00:19:04 +0000 (Sun, 11 Sep 2011)
New Revision: 14810
Added:
tags/commons-configuration/1.7-1/
tags/commons-configuration/1.7-1/debian/changelog
tags/commons-configuration/1.7-1/debian/control
tags/commons-configuration/1.7-1/debian/copyright
tags/commons-configuration/1.7-1/debian/maven.ignoreRules
tags/commons-configuration/1.7-1/debian/maven.properties
tags/commons-configuration/1.7-1/debian/rules
Removed:
tags/commons-configuration/1.7-1/debian/changelog
tags/commons-configuration/1.7-1/debian/control
tags/commons-configuration/1.7-1/debian/copyright
tags/commons-configuration/1.7-1/debian/patches/case.diff
tags/commons-configuration/1.7-1/debian/patches/disable-tests.diff
tags/commons-configuration/1.7-1/debian/patches/series
tags/commons-configuration/1.7-1/debian/rules
Log:
[svn-buildpackage] Tagging commons-configuration 1.7-1
Deleted: tags/commons-configuration/1.7-1/debian/changelog
===================================================================
--- trunk/commons-configuration/debian/changelog 2011-09-09 22:28:03 UTC (rev 14793)
+++ tags/commons-configuration/1.7-1/debian/changelog 2011-09-11 00:19:04 UTC (rev 14810)
@@ -1,97 +0,0 @@
-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. (Closes: #567269).
- * 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.
- * d/control: Remove Suggests on java-virtual-machine.
-
- -- Damien Raude-Morvan <drazzib at debian.org> Sun, 04 Sep 2011 14:19:17 +0200
-
-commons-configuration (1.6-5) unstable; urgency=low
-
- * Change Build-Depends: default-jdk-doc.
- * Convert copyright file to UTF-8.
- * Switch to source format 3.0.
- * Update Standards-Version: 3.8.4
-
- -- Torsten Werner <twerner at debian.org> Sun, 11 Apr 2010 16:00:02 +0200
-
-commons-configuration (1.6-4) unstable; urgency=low
-
- * Upload to unstable.
-
- -- Torsten Werner <twerner at debian.org> Sun, 09 Aug 2009 10:41:44 +0200
-
-commons-configuration (1.6-3) experimental; urgency=low
-
- * Update debian/control as previous version missed all my changes
- * Use openjdk-6-jdk for the build; add a Build-Depends on this
- package.
-
- -- Ludovic Claude <ludovic.claude at laposte.net> Sun, 12 Jul 2009 23:20:28 +0100
-
-commons-configuration (1.6-2) experimental; urgency=low
-
- [ Ludovic Claude ]
- * Change section to java, bump up Standards-Version to 3.8.1
- * Add the Maven POM to the package,
- * Add a Build-Depends-Indep dependency on maven-repo-helper
- * Use mh_installpom and mh_installjar to install the POM and the jar to the
- Maven repository
- * Add missing dependencies on the binary package
- * Add new java-doc package
- * Use default-jdk to build the package, otherwise javadoc generation fails
-
- [ Torsten Werner ]
- * Fix Build-Depends.
- * Upload to experimental.
-
- -- Torsten Werner <twerner at debian.org> Sun, 12 Jul 2009 22:45:20 +0200
-
-commons-configuration (1.6-1) unstable; urgency=low
-
- * new upstream release
- * Refresh our patches.
-
- -- Torsten Werner <twerner at debian.org> Sat, 10 Jan 2009 12:54:01 +0100
-
-commons-configuration (1.5-2) unstable; urgency=low
-
- * Change Maintainer to the pkg-java team.
- * Bump up Standards-Version: 3.8.0 (no changes needed).
- * Do no longer quote the full text of the Apache license in
- debian/copyright.
-
- -- Torsten Werner <twerner at debian.org> Fri, 15 Aug 2008 01:39:18 +0200
-
-commons-configuration (1.5-1) unstable; urgency=low
-
- * new upstream release
- * Move package to Alioth and add Vcs headers in debian/control.
- * Update all references to the homepage and download address to the new
- apache structure. (Closes: #450063)
- * Add target 'get-orig-source' to debian/rules.
- * Bumped up Standards-Version to 3.7.3; no changes needed.
- * Switch from kaffe to java-gcj-compat-dev.
-
- -- Torsten Werner <twerner at debian.org> Sun, 09 Dec 2007 10:50:51 +0100
-
-commons-configuration (1.4-2) unstable; urgency=low
-
- * Remove some of the Depends because one of them was wrong and the others
- might not be real Depends. (Closes: #425017)
-
- -- Torsten Werner <twerner at debian.org> Fri, 18 May 2007 18:43:24 +0200
-
-commons-configuration (1.4-1) unstable; urgency=low
-
- * Initial release (Closes: #420165)
-
- -- Torsten Werner <twerner at debian.org> Fri, 20 Apr 2007 15:42:11 +0200
Copied: tags/commons-configuration/1.7-1/debian/changelog (from rev 14805, trunk/commons-configuration/debian/changelog)
===================================================================
--- tags/commons-configuration/1.7-1/debian/changelog (rev 0)
+++ tags/commons-configuration/1.7-1/debian/changelog 2011-09-11 00:19:04 UTC (rev 14810)
@@ -0,0 +1,112 @@
+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 <drazzib at debian.org> Sun, 11 Sep 2011 00:55:11 +0200
+
+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. (Closes: #567269).
+ * 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.
+ * d/control: Remove Suggests on java-virtual-machine.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Sun, 04 Sep 2011 14:19:17 +0200
+
+commons-configuration (1.6-5) unstable; urgency=low
+
+ * Change Build-Depends: default-jdk-doc.
+ * Convert copyright file to UTF-8.
+ * Switch to source format 3.0.
+ * Update Standards-Version: 3.8.4
+
+ -- Torsten Werner <twerner at debian.org> Sun, 11 Apr 2010 16:00:02 +0200
+
+commons-configuration (1.6-4) unstable; urgency=low
+
+ * Upload to unstable.
+
+ -- Torsten Werner <twerner at debian.org> Sun, 09 Aug 2009 10:41:44 +0200
+
+commons-configuration (1.6-3) experimental; urgency=low
+
+ * Update debian/control as previous version missed all my changes
+ * Use openjdk-6-jdk for the build; add a Build-Depends on this
+ package.
+
+ -- Ludovic Claude <ludovic.claude at laposte.net> Sun, 12 Jul 2009 23:20:28 +0100
+
+commons-configuration (1.6-2) experimental; urgency=low
+
+ [ Ludovic Claude ]
+ * Change section to java, bump up Standards-Version to 3.8.1
+ * Add the Maven POM to the package,
+ * Add a Build-Depends-Indep dependency on maven-repo-helper
+ * Use mh_installpom and mh_installjar to install the POM and the jar to the
+ Maven repository
+ * Add missing dependencies on the binary package
+ * Add new java-doc package
+ * Use default-jdk to build the package, otherwise javadoc generation fails
+
+ [ Torsten Werner ]
+ * Fix Build-Depends.
+ * Upload to experimental.
+
+ -- Torsten Werner <twerner at debian.org> Sun, 12 Jul 2009 22:45:20 +0200
+
+commons-configuration (1.6-1) unstable; urgency=low
+
+ * new upstream release
+ * Refresh our patches.
+
+ -- Torsten Werner <twerner at debian.org> Sat, 10 Jan 2009 12:54:01 +0100
+
+commons-configuration (1.5-2) unstable; urgency=low
+
+ * Change Maintainer to the pkg-java team.
+ * Bump up Standards-Version: 3.8.0 (no changes needed).
+ * Do no longer quote the full text of the Apache license in
+ debian/copyright.
+
+ -- Torsten Werner <twerner at debian.org> Fri, 15 Aug 2008 01:39:18 +0200
+
+commons-configuration (1.5-1) unstable; urgency=low
+
+ * new upstream release
+ * Move package to Alioth and add Vcs headers in debian/control.
+ * Update all references to the homepage and download address to the new
+ apache structure. (Closes: #450063)
+ * Add target 'get-orig-source' to debian/rules.
+ * Bumped up Standards-Version to 3.7.3; no changes needed.
+ * Switch from kaffe to java-gcj-compat-dev.
+
+ -- Torsten Werner <twerner at debian.org> Sun, 09 Dec 2007 10:50:51 +0100
+
+commons-configuration (1.4-2) unstable; urgency=low
+
+ * Remove some of the Depends because one of them was wrong and the others
+ might not be real Depends. (Closes: #425017)
+
+ -- Torsten Werner <twerner at debian.org> Fri, 18 May 2007 18:43:24 +0200
+
+commons-configuration (1.4-1) unstable; urgency=low
+
+ * Initial release (Closes: #420165)
+
+ -- Torsten Werner <twerner at debian.org> Fri, 20 Apr 2007 15:42:11 +0200
Deleted: tags/commons-configuration/1.7-1/debian/control
===================================================================
--- trunk/commons-configuration/debian/control 2011-09-09 22:28:03 UTC (rev 14793)
+++ tags/commons-configuration/1.7-1/debian/control 2011-09-11 00:19:04 UTC (rev 14810)
@@ -1,59 +0,0 @@
-Source: commons-configuration
-Section: java
-Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-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.5-java,
- default-jdk-doc
-Standards-Version: 3.9.2
-Homepage: http://commons.apache.org/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
-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
-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:
- - Properties files
- - XML documents
- - Windows INI files
- - Property list files (.plist)
- - JNDI
- - JDBC Datasource
- - System properties
- - Applet parameters
- - Servlet parameters
- Additional sources of configuration parameters can be created by using custom
- configuration objects.
-
-Package: libcommons-configuration-java-doc
-Architecture: all
-Section: 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
- an application to read configuration data from a variety of sources:
- - Properties files
- - XML documents
- - Windows INI files
- - Property list files (.plist)
- - JNDI
- - JDBC Datasource
- - System properties
- - Applet parameters
- - Servlet parameters
- Additional sources of configuration parameters can be created by using custom
- configuration objects.
- .
- This package contains the API documentation for commons-configuration.
-
Copied: tags/commons-configuration/1.7-1/debian/control (from rev 14805, trunk/commons-configuration/debian/control)
===================================================================
--- tags/commons-configuration/1.7-1/debian/control (rev 0)
+++ tags/commons-configuration/1.7-1/debian/control 2011-09-11 00:19:04 UTC (rev 14810)
@@ -0,0 +1,81 @@
+Source: commons-configuration
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Torsten Werner <twerner at debian.org>,
+ Damien Raude-Morvan <drazzib at debian.org>
+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
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/commons-configuration/
+
+Package: libcommons-configuration-java
+Architecture: all
+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:
+ - Properties files
+ - XML documents
+ - Windows INI files
+ - Property list files (.plist)
+ - JNDI
+ - JDBC Datasource
+ - System properties
+ - Applet parameters
+ - Servlet parameters
+ Additional sources of configuration parameters can be created by using custom
+ configuration objects.
+
+Package: libcommons-configuration-java-doc
+Architecture: all
+Section: 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
+ an application to read configuration data from a variety of sources:
+ - Properties files
+ - XML documents
+ - Windows INI files
+ - Property list files (.plist)
+ - JNDI
+ - JDBC Datasource
+ - System properties
+ - Applet parameters
+ - Servlet parameters
+ Additional sources of configuration parameters can be created by using custom
+ configuration objects.
+ .
+ This package contains the API documentation for commons-configuration.
Deleted: tags/commons-configuration/1.7-1/debian/copyright
===================================================================
--- trunk/commons-configuration/debian/copyright 2011-09-09 22:28:03 UTC (rev 14793)
+++ tags/commons-configuration/1.7-1/debian/copyright 2011-09-11 00:19:04 UTC (rev 14810)
@@ -1,31 +0,0 @@
-This package was debianized by Torsten Werner <twerner at debian.org> on
-Fri Apr 20 14:51:53 CEST 2007.
-
-It was downloaded from http://commons.apache.org/configuration/
-
-Upstream Authors: Daniel Rall <dlr at finemaltcoding.com>,
- Jason van Zyl <jason at zenplex.com>,
- Martin Poeschl <mpoeschl at marmot.at>,
- dIon Gillard <dion at multitask.com.au>,
- Henning P. Schmiedehausen <hps at intermeta.de>,
- Eric Pugh <epugh at upstate.com>,
- Brian E. Dunbar <bdunbar at dunbarconsulting.org>,
- Emmanuel Bourg <ebourg at apache.org>,
- Oliver Heger <oheger at apache.org>,
- Jörg Schaible <joerg.schaible at gmx.de>,
- Konstantin Shaposhnikov <ksh at scand.com>,
- Jamie M. Guillemette <JMGuillemette at gmail.com>,
- Jorge Ferrer <jorge.ferrer at gmail.com>,
- Gabriele Garuglieri <gabriele.garuglieri at infoblu.it>,
- Nicolas De Loof <nicolas.deloof at gmail.com>
-
-Copyright: © 2001-2008 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'.
-
-The Debian packaging is (C) 2007, Torsten Werner <twerner at debian.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
-
Copied: tags/commons-configuration/1.7-1/debian/copyright (from rev 14805, trunk/commons-configuration/debian/copyright)
===================================================================
--- tags/commons-configuration/1.7-1/debian/copyright (rev 0)
+++ tags/commons-configuration/1.7-1/debian/copyright 2011-09-11 00:19:04 UTC (rev 14810)
@@ -0,0 +1,33 @@
+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 <dlr at finemaltcoding.com>,
+ Jason van Zyl <jason at zenplex.com>,
+ Martin Poeschl <mpoeschl at marmot.at>,
+ dIon Gillard <dion at multitask.com.au>,
+ Henning P. Schmiedehausen <hps at intermeta.de>,
+ Eric Pugh <epugh at upstate.com>,
+ Brian E. Dunbar <bdunbar at dunbarconsulting.org>,
+ Emmanuel Bourg <ebourg at apache.org>,
+ Oliver Heger <oheger at apache.org>,
+ Jörg Schaible <joerg.schaible at gmx.de>,
+ Konstantin Shaposhnikov <ksh at scand.com>,
+ Jamie M. Guillemette <JMGuillemette at gmail.com>,
+ Jorge Ferrer <jorge.ferrer at gmail.com>,
+ Gabriele Garuglieri <gabriele.garuglieri at infoblu.it>,
+ Nicolas De Loof <nicolas.deloof at gmail.com>
+
+Files: *
+Copyright: Copyright 2001-2011 The Apache Software Foundation
+License: Apache-2.0
+
+Files: debian/*
+Copyright: Copyright (C) 2011, Damien Raude-Morvan <drazzib at drazzib.com>
+Copyright: Copyright (C) 2007, Torsten Werner <twerner at debian.org>
+License: Apache-2.0
+
+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'.
Copied: tags/commons-configuration/1.7-1/debian/maven.ignoreRules (from rev 14805, trunk/commons-configuration/debian/maven.ignoreRules)
===================================================================
--- tags/commons-configuration/1.7-1/debian/maven.ignoreRules (rev 0)
+++ tags/commons-configuration/1.7-1/debian/maven.ignoreRules 2011-09-11 00:19:04 UTC (rev 14810)
@@ -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
Copied: tags/commons-configuration/1.7-1/debian/maven.properties (from rev 14805, trunk/commons-configuration/debian/maven.properties)
===================================================================
--- tags/commons-configuration/1.7-1/debian/maven.properties (rev 0)
+++ tags/commons-configuration/1.7-1/debian/maven.properties 2011-09-11 00:19:04 UTC (rev 14810)
@@ -0,0 +1,4 @@
+maven.test.skip=true
+
+maven.compiler.source=1.5
+maven.compiler.target=1.5
Deleted: tags/commons-configuration/1.7-1/debian/patches/case.diff
===================================================================
--- trunk/commons-configuration/debian/patches/case.diff 2011-09-09 22:28:03 UTC (rev 14793)
+++ tags/commons-configuration/1.7-1/debian/patches/case.diff 2011-09-11 00:19:04 UTC (rev 14810)
@@ -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: tags/commons-configuration/1.7-1/debian/patches/disable-tests.diff
===================================================================
--- trunk/commons-configuration/debian/patches/disable-tests.diff 2011-09-09 22:28:03 UTC (rev 14793)
+++ tags/commons-configuration/1.7-1/debian/patches/disable-tests.diff 2011-09-11 00:19:04 UTC (rev 14810)
@@ -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: tags/commons-configuration/1.7-1/debian/patches/series
===================================================================
--- trunk/commons-configuration/debian/patches/series 2011-09-09 22:28:03 UTC (rev 14793)
+++ tags/commons-configuration/1.7-1/debian/patches/series 2011-09-11 00:19:04 UTC (rev 14810)
@@ -1,2 +0,0 @@
-disable-tests.diff
-case.diff
Deleted: tags/commons-configuration/1.7-1/debian/rules
===================================================================
--- trunk/commons-configuration/debian/rules 2011-09-09 22:28:03 UTC (rev 14793)
+++ tags/commons-configuration/1.7-1/debian/rules 2011-09-11 00:19:04 UTC (rev 14810)
@@ -1,29 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.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
-
-binary-post-install/lib$(PACKAGE)-java-doc::
- dh_install -plib$(PACKAGE)-java-doc $(API_DOCS) usr/share/doc/lib$(PACKAGE)-java
-
-clean::
- -rm -rf debian/tmp
-
-get-orig-source:
- -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
-
Copied: tags/commons-configuration/1.7-1/debian/rules (from rev 14805, trunk/commons-configuration/debian/rules)
===================================================================
--- tags/commons-configuration/1.7-1/debian/rules (rev 0)
+++ tags/commons-configuration/1.7-1/debian/rules 2011-09-11 00:19:04 UTC (rev 14810)
@@ -0,0 +1,18 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/maven.mk
+
+PACKAGE := $(DEB_SOURCE_PACKAGE)
+VERSION := $(DEB_UPSTREAM_VERSION)
+JAVA_HOME := /usr/lib/jvm/default-java
+
+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/api/
+
+get-orig-source:
+ -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+
More information about the pkg-java-commits
mailing list