This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libcommons-lang-java.
commit 69f6c603a0a4b82eb20678be99650b5a43cc1498 Author: Ludovic Claude <[email protected]> Date: Sun Nov 13 23:40:09 2011 +0000 * Update compat to 7 * d/control: - remove Build-Depends on cdbs - add Depends and Build-Depends on libcommons-parent-java - add cross suggest between the binary and the documentation packages - add Build-Depends-Indep on bnd * d/rules: update to use dh 7 * remove OSGi_Manifest.patch, use bnd itself to generate the OSGi manifest * Update copyright, use DEP-5 format * Update installation of the Javadoc package * poms: remove --no-parent as the parent is now packaged, use --has-package-version, add properties for mh_install and for installing the Javadoc jar --- debian/build-classpath | 1 + debian/changelog | 18 +++++ debian/commons-lang.bnd | 15 ++++ debian/compat | 2 +- debian/control | 12 +-- debian/copyright | 53 +++--------- ...-base => libcommons-lang-java-doc.doc-base.api} | 4 +- debian/libcommons-lang-java-doc.docs | 1 - debian/libcommons-lang-java-doc.install | 1 + debian/libcommons-lang-java-doc.poms | 26 ++++++ debian/libcommons-lang-java.poms | 28 ++++++- debian/maven.ignoreRules | 17 ++++ debian/maven.rules | 20 ++++- debian/patches/OSGi_Manifest.patch | 94 ---------------------- debian/patches/series | 1 - debian/rules | 31 +++---- 16 files changed, 158 insertions(+), 166 deletions(-) diff --git a/debian/build-classpath b/debian/build-classpath new file mode 100644 index 0000000..426cf2c --- /dev/null +++ b/debian/build-classpath @@ -0,0 +1 @@ +/usr/share/java/junit.jar diff --git a/debian/changelog b/debian/changelog index 372a73e..54a70ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,21 @@ +libcommons-lang-java (2.6-2) unstable; urgency=low + + * Update compat to 7 + * d/control: + - remove Build-Depends on cdbs + - add Depends and Build-Depends on libcommons-parent-java + - add cross suggest between the binary and the documentation packages + - add Build-Depends-Indep on bnd + * d/rules: update to use dh 7 + * remove OSGi_Manifest.patch, use bnd itself to generate the OSGi manifest + * Update copyright, use DEP-5 format + * Update installation of the Javadoc package + * poms: remove --no-parent as the parent is now packaged, use + --has-package-version, add properties for mh_install and for installing + the Javadoc jar + + -- Ludovic Claude <[email protected]> Thu, 13 Oct 2011 21:09:20 +0100 + libcommons-lang-java (2.6-1) unstable; urgency=low * Team upload. diff --git a/debian/commons-lang.bnd b/debian/commons-lang.bnd new file mode 100644 index 0000000..e4425dd --- /dev/null +++ b/debian/commons-lang.bnd @@ -0,0 +1,15 @@ +version=VERSION +Extension-Name: commons-lang +Package: org.apache.commons.lang +Export-Package: org.apache.commons.lang;version=${version},\ + org.apache.commons.lang.*;version=${version} +Import-Package: * +Bundle-Version: ${version} +Bundle-Description: Commons Lang, a package of Java utility classes for \ + the classes that are in java.lang's hierarchy, or are considered to \ + be so standard as to justify existence in java.lang. +Bundle-Name: Commons Lang +Bundle-DocURL: http://commons.apache.org/lang/ +Bundle-Vendor: The Apache Software Foundation +Bundle-SymbolicName: org.apache.commons.lang +Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt diff --git a/debian/compat b/debian/compat index 1e8b314..7f8f011 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -6 +7 diff --git a/debian/control b/debian/control index 347c78e..3629f92 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,8 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Arnaud Vandyck <[email protected]>, Michael Koch <[email protected]>, Kumar Appaiah <[email protected]> -Build-Depends: debhelper (>= 6), cdbs, default-jdk -Build-Depends-Indep: maven-repo-helper, ant, junit (>= 3.8.1), default-jdk-doc +Build-Depends: debhelper (>= 7.0.50~), default-jdk, maven-repo-helper (>= 1.7), ant +Build-Depends-Indep: libcommons-parent-java (>= 12), junit (>= 3.8.1), bnd, default-jdk-doc Standards-Version: 3.9.2 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-lang-java Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libcommons-lang-java @@ -13,7 +13,9 @@ Homepage: http://commons.apache.org/lang/ Package: libcommons-lang-java Architecture: all Depends: ${misc:Depends} -Description: Extension of the java.lang package +Recommends: libcommons-parent-java (>= 12) +Suggests: libcommons-lang-java-doc +Description: Commons Lang - an extension of the java.lang package The Lang Component contains a set of Java classes that provide helper methods for standard Java classes, especially those found in the java.lang package in the Sun JDK. The following classes are included: @@ -37,8 +39,8 @@ Package: libcommons-lang-java-doc Section: doc Architecture: all Depends: ${misc:Depends} -Suggests: default-jdk-doc -Description: Documentation for an extension of the java.lang package +Suggests: libcommons-lang-java, default-jdk-doc +Description: Documentation for Commons Lang - an extension of the java.lang package The Lang Component contains a set of Java classes that provide helper methods for standard Java classes, especially those found in the java.lang package in the Sun JDK. The following classes are included: diff --git a/debian/copyright b/debian/copyright index 65e95d4..b7cc028 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,43 +1,16 @@ -This package was debianized by Arnaud Vandyck <[email protected]> on -Tue, 1 Jul 2003 14:43:32 +0200. +Format: http://dep.debian.net/deps/dep5/ +Upstream-Name: Commons Lang +Source: http://commons.apache.org/lang/ -It was downloaded from http://commons.apache.org/lang/ +Files: * +Copyright: 2001-2010, The Apache Software Foundation +License: Apache-2.0 -Upstream Authors: Daniel Rall <[email protected]>, - Stephen Colebourne <[email protected]>, - Henri Yandell <[email protected]>, - Steven Caswell <[email protected]>, - Robert Burrell Donkin <[email protected]>, - Gary D. Gregory <[email protected]>, - Phil Steitz <[email protected]>, - Fredrik Westermarck, - James Carman <[email protected]>, - Niall Pemberton, Matt Benson, C. Scott Ananian, Chris Audley, - Stephane Bailliez, Michael Becke, Ola Berg, Nathan Beyer, - Stefan Bodewig, Janek Bogucki, Mike Bowler, Sean Brown, - Alexander Day Chaffee, Al Chou, Greg Coladonato, - Maarten Coene, Justin Couch, Michael Davey, Norm Deane, - Ringo De Smet, Russel Dittmar, Steve Downey, Matthias Eichel, - Christopher Elkins, Chris Feldhacker, Pete Gieser, - Jason Gritman, Matthew Hawthorne, Michael Heuer, - Oliver Heger, Chris Hyzer, Marc Johnson, Shaun Kalley, - Tetsuya Kaneuchi, Nissim Karpenstein, Ed Korthof, - Holger Krauth, Rafal Krupinski, Rafal Krzewski, - Craig R. McClanahan, Rand McNeely, Dave Meikle, - Nikolay Metchev, Kasper Nielsen, Tim O'Brien, - Brian S O'Neill, Andrew C. Oliver, Alban Peignier, - Moritz Petersen, Dmitri Plotnikov, Neeme Praks, Eric Pugh, - Stephen Putman, Travis Reeder, Antony Riley, Scott Sanders, - Ralph Schaer, Henning P. Schmiedehausen, Sean Schofield, - Reuben Sivan, Ville Skytta, Jan Sorensen, Glen Stampoultzis, - Scott Stanchfield, Jon S. Stevens, Sean C. Sullivan, - Ashwin Suresh, Helge Tesgaard, Arun Mammen Thomas, - Masato Tezuka, Jeff Varszegi, Chris Webb, Mario Winterer, - Stepan Koltsov, Holger Hoffstatte +Files: debian/* +Copyright: 2003, Arnaud Vandyck <[email protected]> + 2010, Ludovic Claude <[email protected]> +License: Apache-2.0 -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'. +License: Apache-2.0 + On Debian GNU/Linux system you can find the complete text of the + Apache-2.0 license in '/usr/share/common-licenses/Apache-2.0' diff --git a/debian/libcommons-lang-java-doc.doc-base b/debian/libcommons-lang-java-doc.doc-base.api similarity index 73% rename from debian/libcommons-lang-java-doc.doc-base rename to debian/libcommons-lang-java-doc.doc-base.api index 6bba164..a780450 100644 --- a/debian/libcommons-lang-java-doc.doc-base +++ b/debian/libcommons-lang-java-doc.doc-base.api @@ -7,5 +7,5 @@ Abstract: The Lang Component contains a set of Java classes that provide helper Section: Programming Format: HTML -Index: /usr/share/doc/libcommons-lang-java-doc/api/index.html -Files: /usr/share/doc/libcommons-lang-java-doc/api/* +Index: /usr/share/doc/libcommons-lang-java/api/index.html +Files: /usr/share/doc/libcommons-lang-java/api/* diff --git a/debian/libcommons-lang-java-doc.docs b/debian/libcommons-lang-java-doc.docs deleted file mode 100644 index e5e6d3a..0000000 --- a/debian/libcommons-lang-java-doc.docs +++ /dev/null @@ -1 +0,0 @@ -build/api diff --git a/debian/libcommons-lang-java-doc.install b/debian/libcommons-lang-java-doc.install new file mode 100644 index 0000000..749ccd2 --- /dev/null +++ b/debian/libcommons-lang-java-doc.install @@ -0,0 +1 @@ +target/apidocs/* usr/share/doc/libcommons-lang-java/api diff --git a/debian/libcommons-lang-java-doc.poms b/debian/libcommons-lang-java-doc.poms new file mode 100644 index 0000000..099b4fc --- /dev/null +++ b/debian/libcommons-lang-java-doc.poms @@ -0,0 +1,26 @@ +# List of POM files for the package +# Format of this file is: +# <path to pom file> [option]* +# where option can be: +# --ignore: ignore this POM or +# --no-parent: remove the <parent> tag from the POM +# --package=<package>: an alternative package to use when installing this POM +# and its artifact +# --has-package-version: to indicate that the original version of the POM is the same as the upstream part +# of the version for the package. +# --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 +# --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. +# --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. +# +pom.xml --ignore-pom --has-package-version --artifact=target/commons-lang-*-javadoc.jar --classifier=javadoc diff --git a/debian/libcommons-lang-java.poms b/debian/libcommons-lang-java.poms index 43e746b..2cfc971 100644 --- a/debian/libcommons-lang-java.poms +++ b/debian/libcommons-lang-java.poms @@ -1 +1,27 @@ -pom.xml --no-parent +# List of POM files for the package +# Format of this file is: +# <path to pom file> [option]* +# where option can be: +# --ignore: ignore this POM or +# --no-parent: remove the <parent> tag from the POM +# --package=<package>: an alternative package to use when installing this POM +# and its artifact +# --has-package-version: to indicate that the original version of the POM is the same as the upstream part +# of the version for the package. +# --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 +# --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. +# --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. +# +pom.xml --has-package-version --artifact=target/commons-lang.bnd.jar --java-lib + diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules new file mode 100644 index 0000000..f8f699d --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1,17 @@ +# 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-assembly-plugin * * * * diff --git a/debian/maven.rules b/debian/maven.rules index 8486979..2a7b157 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -1,2 +1,20 @@ -junit junit jar s/3\..*/3.x/ +# Maven rules - transform 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 +# - a regular expression of the form s/match/replace/ +# in this case, elements that match are transformed using +# the regex rule. +# All elements much match before a rule can be applied +# Example rule: match jar with groupid= junit, artifactid= junit +# and version starting with 3., replacing the version with 3.x +# junit junit jar s/3\\..*/3.x/ +junit junit jar s/3\..*/3.x/ * * +org.apache.commons commons-parent pom s/.*/debian/ * * diff --git a/debian/patches/OSGi_Manifest.patch b/debian/patches/OSGi_Manifest.patch deleted file mode 100644 index bf57f79..0000000 --- a/debian/patches/OSGi_Manifest.patch +++ /dev/null @@ -1,94 +0,0 @@ -Description: Add OSGi metadata -Author: Ludovic Claude <[email protected]> -Forwarded: no -Last-Update: 2011-08-02 - ---- libcommons-lang-java-2.6.orig/build.xml -+++ libcommons-lang-java-2.6/build.xml -@@ -30,7 +30,7 @@ - <property file="${basedir}/build.properties"/> - <property file="${basedir}/default.properties"/> - <!-- The Sun Javadoc for versions prior to 1.3 are off-line. --> -- <property name="jdk.javadoc" value="http://java.sun.com/j2se/1.3/docs/api/"/> -+ <property name="jdk.javadoc" value="file:///usr/share/doc/default-jdk-doc/api/"/> - - <!-- ========== Construct compile classpath =============================== --> - <path id="compile.classpath"> -@@ -52,8 +52,12 @@ - <filter token="version" value="${component.version}"/> - <filter token="compile.source" value="${compile.source}"/> - <filter token="compile.target" value="${compile.target}"/> -+ <filter token="lastmodified" value="${lastmodified}"/> - <mkdir dir="${build.home}"/> - <available property="jdk.1.5.present" classname="java.lang.StringBuilder"/> -+ <copy todir="${build.home}/conf" filtering="on"> -+ <fileset dir="${conf.home}" includes="*.MF"/> -+ </copy> - </target> - - <!-- ========== Compile Targets ========================================= --> -@@ -159,18 +163,7 @@ - <mkdir dir="${build.home}/classes/META-INF"/> - <copy file="LICENSE.txt" tofile="${build.home}/classes/META-INF/LICENSE.txt"/> - <copy file="NOTICE.txt" tofile="${build.home}/classes/META-INF/NOTICE.txt"/> -- <jar jarfile="${build.home}/${final.name}.jar"> -- <manifest> -- <attribute name="Specification-Title" value="Commons Lang"/> -- <attribute name="Specification-Version" value="${component.version}"/> -- <attribute name="Specification-Vendor" value="The Apache Software Foundation"/> -- <attribute name="Implementation-Title" value="Commons Lang"/> -- <attribute name="Implementation-Version" value="${component.version}"/> -- <attribute name="Implementation-Vendor" value="The Apache Software Foundation"/> -- <attribute name="Implementation-Vendor-Id" value="org.apache"/> -- <attribute name="X-Compile-Source-JDK" value="${compile.source}"/> -- <attribute name="X-Compile-Target-JDK" value="${compile.target}"/> -- </manifest> -+ <jar jarfile="${build.home}/${final.name}.jar" manifest="${build.home}/conf/MANIFEST.MF"> - <fileset dir="${build.home}/classes"> - <include name="**/*.class"/> - <include name="**/LICENSE.txt"/> ---- /dev/null -+++ libcommons-lang-java-2.6/src/conf/MANIFEST.MF -@@ -0,0 +1,42 @@ -+Manifest-Version: 1.0 -+Package: org.apache.commons.lang -+Extension-Name: commons-lang -+Specification-Version: @version@ -+Specification-Vendor: The Apache Software Foundation -+Specification-Title: Commons Lang -+Implementation-Version: @version@ -+Implementation-Vendor: The Apache Software Foundation -+Implementation-Title: Commons Lang -+Implementation-Vendor-Id: org.apache -+X-Compile-Source-JDK: @compile.source@ -+X-Compile-Target-JDK: @compile.target@ -+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt -+Import-Package: org.apache.commons.lang;version="@version@", -+ org.apache.commons.lang.builder;version="@version@", -+ org.apache.commons.lang.enum;version="@version@", -+ org.apache.commons.lang.enums;version="@version@", -+ org.apache.commons.lang.exception;version="@version@", -+ org.apache.commons.lang.math;version="@version@", -+ org.apache.commons.lang.mutable;version="@version@", -+ org.apache.commons.lang.text;version="@version@", -+ org.apache.commons.lang.time;version="@version@" -+Bnd-LastModified: @lastmodified@ -+Export-Package: org.apache.commons.lang.math;version="@version@", -+ org.apache.commons.lang.enums;version="@version@", -+ org.apache.commons.lang.builder;version="@version@", -+ org.apache.commons.lang.exception;version="@version@", -+ org.apache.commons.lang.enum;version="@version@", -+ org.apache.commons.lang.mutable;version="@version@", -+ org.apache.commons.lang.text;version="@version@", -+ org.apache.commons.lang.time;version="@version@", -+ org.apache.commons.lang;version="@version@" -+Bundle-Version: @version@ -+Bundle-Description: Commons Lang, a package of Java utility classes fo -+ r the classes that are in java.lang's hierarchy, or are considered -+ to be so standard as to justify existence in java.lang. -+Bundle-Name: Commons Lang -+Bundle-DocURL: http://commons.apache.org/lang/ -+Bundle-ManifestVersion: 2 -+Bundle-Vendor: The Apache Software Foundation -+Bundle-SymbolicName: org.apache.commons.lang -+Tool: Bnd-0.0.238 diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 3b14877..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -OSGi_Manifest.patch diff --git a/debian/rules b/debian/rules index c527aac..dcce2f2 100755 --- a/debian/rules +++ b/debian/rules @@ -1,28 +1,19 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk +DEB_SOURCE_PACKAGE := $(shell dpkg-parsechangelog | grep '^Source:' | cut -f 2 -d ' ') +DEB_UPSTREAM_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ' | cut -d: -f2- | sed 's/-[^-]*$$//') -PACKAGE := $(DEB_SOURCE_PACKAGE) -VERSION := $(DEB_UPSTREAM_VERSION) -JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := junit -DEB_ANT_BUILD_TARGET := jar javadoc -LAST_MODIFIED := $(shell date +%s%N | cut -c -13) -DEB_ANT_ARGS := -Dlastmodified=$(LAST_MODIFIED) +export JAVA_HOME=/usr/lib/jvm/default-java +export CLASSPATH=$(shell for jar in `cat debian/build-classpath`; do if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; done) -common-post-build-indep:: - mv build/apidocs build/api +%: + dh $@ --buildsystem=ant --with maven_repo_helper -install/libcommons-lang-java:: - mh_installpoms -p$(PACKAGE) - mh_installjar -p$(PACKAGE) -l pom.xml build/commons-lang-$(VERSION).jar - -clean:: - -rm gjdoc_rawcomment.cache - -rm -rf docs/api/* - -rm -rf debian/tmp - mh_clean +override_dh_auto_build: + ANT_ARGS="-Dbasedir=$(realpath .) -Djdk.javadoc=file:///usr/share/doc/default-jdk-doc/api/ jar javadoc javadoc-jar" dh_auto_build + cat debian/commons-lang.bnd | sed s/VERSION/$(DEB_UPSTREAM_VERSION)/ > debian/.commons-lang-versioned.bnd + echo debian/.commons-lang-versioned.bnd >> debian/.mh_clean + bnd wrap -properties debian/.commons-lang-versioned.bnd -output target/commons-lang.bnd.jar target/commons-lang-$(DEB_UPSTREAM_VERSION).jar get-orig-source: -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libcommons-lang-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
