diff -Nru libcommons-lang-java-2.6/debian/ant.properties libcommons-lang-java-2.6/debian/ant.properties --- libcommons-lang-java-2.6/debian/ant.properties 2015-07-08 15:02:22.000000000 +0000 +++ libcommons-lang-java-2.6/debian/ant.properties 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -build.home=build -dist.home=dist diff -Nru libcommons-lang-java-2.6/debian/build-classpath libcommons-lang-java-2.6/debian/build-classpath --- libcommons-lang-java-2.6/debian/build-classpath 1970-01-01 00:00:00.000000000 +0000 +++ libcommons-lang-java-2.6/debian/build-classpath 2015-11-17 15:09:35.000000000 +0000 @@ -0,0 +1 @@ +/usr/share/java/junit.jar diff -Nru libcommons-lang-java-2.6/debian/changelog libcommons-lang-java-2.6/debian/changelog --- libcommons-lang-java-2.6/debian/changelog 2015-07-08 15:00:49.000000000 +0000 +++ libcommons-lang-java-2.6/debian/changelog 2016-03-08 11:12:20.000000000 +0000 @@ -1,10 +1,20 @@ -libcommons-lang-java (2.6-5ubuntu1) wily; urgency=low +libcommons-lang-java (2.6-6ubuntu1) xenial; urgency=medium - * Merge from Debian unstable. Remaining changes: - - Revert to using Ant instead of Maven for package build for - continued inclusion in Ubuntu main. + * Resync with Debian unstable, remaining changes: + - d/control,rules,libcommons-lang-java.poms: Drop use of bnd + for generating OSGi metadata. - -- James Page Wed, 08 Jul 2015 16:00:47 +0100 + -- James Page Tue, 08 Mar 2016 11:12:15 +0000 + +libcommons-lang-java (2.6-6) unstable; urgency=medium + + * Team upload. + * Transition to bnd 2.1.0. Fix obsolete bnd parameter syntax in + debian/rules. + * wrap-and-sort -sa. + * Vcs-Browser: Use https. + + -- Markus Koschany Tue, 17 Nov 2015 16:09:31 +0100 libcommons-lang-java (2.6-5) unstable; urgency=medium @@ -18,14 +28,6 @@ -- Emmanuel Bourg Tue, 12 May 2015 01:04:09 +0200 -libcommons-lang-java (2.6-4ubuntu1) vivid; urgency=low - - * Merge from Debian unstable. Remaining changes: - - Revert to using Ant instead of Maven for package build for - continued inclusion in Ubuntu main. - - -- James Page Mon, 08 Dec 2014 17:02:51 +0000 - libcommons-lang-java (2.6-4) unstable; urgency=medium * debian/control: @@ -37,19 +39,6 @@ -- Emmanuel Bourg Fri, 10 Jan 2014 16:01:02 +0100 -libcommons-lang-java (2.6-3ubuntu2) quantal; urgency=low - - * No-change rebuild with openjdk-7 as default-jdk. - - -- James Page Fri, 18 May 2012 11:42:23 +0100 - -libcommons-lang-java (2.6-3ubuntu1) precise; urgency=low - - * Revert to 2.6-1 packaging, as 2.6-2 would pull in a plethora of Java/maven - libraries into main. - - -- Martin Pitt Wed, 14 Dec 2011 14:48:44 +0100 - libcommons-lang-java (2.6-3) unstable; urgency=low * Team upload. diff -Nru libcommons-lang-java-2.6/debian/commons-lang.bnd libcommons-lang-java-2.6/debian/commons-lang.bnd --- libcommons-lang-java-2.6/debian/commons-lang.bnd 1970-01-01 00:00:00.000000000 +0000 +++ libcommons-lang-java-2.6/debian/commons-lang.bnd 2015-11-17 15:09:35.000000000 +0000 @@ -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 -Nru libcommons-lang-java-2.6/debian/control libcommons-lang-java-2.6/debian/control --- libcommons-lang-java-2.6/debian/control 2015-07-08 15:01:39.000000000 +0000 +++ libcommons-lang-java-2.6/debian/control 2016-03-08 10:48:58.000000000 +0000 @@ -3,18 +3,30 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian Java Maintainers -Uploaders: Emmanuel Bourg -Build-Depends: cdbs, debhelper (>= 9), default-jdk, maven-repo-helper (>= 1.7), ant -Build-Depends-Indep: junit (>= 3.8.1), default-jdk-doc +Uploaders: + Emmanuel Bourg +Build-Depends: + ant, + debhelper (>= 9), + default-jdk, + maven-repo-helper (>= 1.7) +Build-Depends-Indep: + default-jdk-doc, + junit (>= 3.8.1), + libcommons-parent-java (>= 12) Standards-Version: 3.9.6 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libcommons-lang-java -Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libcommons-lang-java +Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-java/trunk/libcommons-lang-java Homepage: http://commons.apache.org/lang/ Package: libcommons-lang-java Architecture: all -Depends: ${misc:Depends} -Description: Extension of the java.lang package +Depends: + libcommons-parent-java (>= 12), + ${misc:Depends} +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,9 +49,12 @@ 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 +Depends: + ${misc:Depends} +Suggests: + default-jdk-doc, + libcommons-lang-java +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 -Nru libcommons-lang-java-2.6/debian/libcommons-lang-java-doc.doc-base libcommons-lang-java-2.6/debian/libcommons-lang-java-doc.doc-base --- libcommons-lang-java-2.6/debian/libcommons-lang-java-doc.doc-base 2009-07-02 12:07:30.000000000 +0000 +++ libcommons-lang-java-2.6/debian/libcommons-lang-java-doc.doc-base 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -Document: libcommons-lang-java -Title: Programmer API for Commons Lang -Author: Apache Commons Lang developers -Abstract: 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. -Section: Programming - -Format: HTML -Index: /usr/share/doc/libcommons-lang-java-doc/api/index.html -Files: /usr/share/doc/libcommons-lang-java-doc/api/* diff -Nru libcommons-lang-java-2.6/debian/libcommons-lang-java-doc.doc-base.api libcommons-lang-java-2.6/debian/libcommons-lang-java-doc.doc-base.api --- libcommons-lang-java-2.6/debian/libcommons-lang-java-doc.doc-base.api 1970-01-01 00:00:00.000000000 +0000 +++ libcommons-lang-java-2.6/debian/libcommons-lang-java-doc.doc-base.api 2015-11-17 15:09:35.000000000 +0000 @@ -0,0 +1,11 @@ +Document: libcommons-lang-java +Title: Programmer API for Commons Lang +Author: Apache Commons Lang developers +Abstract: 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. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libcommons-lang-java/api/index.html +Files: /usr/share/doc/libcommons-lang-java/api/* diff -Nru libcommons-lang-java-2.6/debian/libcommons-lang-java-doc.docs libcommons-lang-java-2.6/debian/libcommons-lang-java-doc.docs --- libcommons-lang-java-2.6/debian/libcommons-lang-java-doc.docs 2011-08-02 16:51:38.000000000 +0000 +++ libcommons-lang-java-2.6/debian/libcommons-lang-java-doc.docs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -build/api diff -Nru libcommons-lang-java-2.6/debian/libcommons-lang-java-doc.install libcommons-lang-java-2.6/debian/libcommons-lang-java-doc.install --- libcommons-lang-java-2.6/debian/libcommons-lang-java-doc.install 1970-01-01 00:00:00.000000000 +0000 +++ libcommons-lang-java-2.6/debian/libcommons-lang-java-doc.install 2015-11-17 15:09:35.000000000 +0000 @@ -0,0 +1 @@ +target/apidocs/* usr/share/doc/libcommons-lang-java/api diff -Nru libcommons-lang-java-2.6/debian/libcommons-lang-java-doc.poms libcommons-lang-java-2.6/debian/libcommons-lang-java-doc.poms --- libcommons-lang-java-2.6/debian/libcommons-lang-java-doc.poms 1970-01-01 00:00:00.000000000 +0000 +++ libcommons-lang-java-2.6/debian/libcommons-lang-java-doc.poms 2015-11-17 15:09:35.000000000 +0000 @@ -0,0 +1,26 @@ +# List of POM files for the package +# Format of this file is: +# [option]* +# where option can be: +# --ignore: ignore this POM or +# --no-parent: remove the tag from the POM +# --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=: a list of XML elements to keep in the POM +# during a clean operation with mh_cleanpom or mh_installpom +# --artifact=: 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 to use when installing the library in /usr/share/java +# --usj-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=: the destination for the real jar +# it will be installed with mh_install. +# --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 -Nru libcommons-lang-java-2.6/debian/libcommons-lang-java.poms libcommons-lang-java-2.6/debian/libcommons-lang-java.poms --- libcommons-lang-java-2.6/debian/libcommons-lang-java.poms 2015-05-12 04:10:38.000000000 +0000 +++ libcommons-lang-java-2.6/debian/libcommons-lang-java.poms 2016-03-08 11:03:22.000000000 +0000 @@ -1 +1,26 @@ -pom.xml --no-parent +# List of POM files for the package +# Format of this file is: +# [option]* +# where option can be: +# --ignore: ignore this POM or +# --no-parent: remove the tag from the POM +# --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=: a list of XML elements to keep in the POM +# during a clean operation with mh_cleanpom or mh_installpom +# --artifact=: 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 to use when installing the library in /usr/share/java +# --usj-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=: the destination for the real jar +# it will be installed with mh_install. +# --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*.jar --java-lib diff -Nru libcommons-lang-java-2.6/debian/maven.ignoreRules libcommons-lang-java-2.6/debian/maven.ignoreRules --- libcommons-lang-java-2.6/debian/maven.ignoreRules 1970-01-01 00:00:00.000000000 +0000 +++ libcommons-lang-java-2.6/debian/maven.ignoreRules 2015-11-17 15:09:35.000000000 +0000 @@ -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 -Nru libcommons-lang-java-2.6/debian/maven.rules libcommons-lang-java-2.6/debian/maven.rules --- libcommons-lang-java-2.6/debian/maven.rules 2015-05-12 04:10:38.000000000 +0000 +++ libcommons-lang-java-2.6/debian/maven.rules 2015-11-17 15:09:35.000000000 +0000 @@ -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 -Nru libcommons-lang-java-2.6/debian/patches/OSGi_Manifest.patch libcommons-lang-java-2.6/debian/patches/OSGi_Manifest.patch --- libcommons-lang-java-2.6/debian/patches/OSGi_Manifest.patch 2011-08-02 20:02:40.000000000 +0000 +++ libcommons-lang-java-2.6/debian/patches/OSGi_Manifest.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,94 +0,0 @@ -Description: Add OSGi metadata -Author: Ludovic Claude -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 @@ - - - -- -+ - - - -@@ -52,8 +52,12 @@ - - - -+ - - -+ -+ -+ - - - -@@ -159,18 +163,7 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -+ - - - ---- /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 -Nru libcommons-lang-java-2.6/debian/patches/series libcommons-lang-java-2.6/debian/patches/series --- libcommons-lang-java-2.6/debian/patches/series 2009-07-02 12:07:30.000000000 +0000 +++ libcommons-lang-java-2.6/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -OSGi_Manifest.patch diff -Nru libcommons-lang-java-2.6/debian/rules libcommons-lang-java-2.6/debian/rules --- libcommons-lang-java-2.6/debian/rules 2015-05-12 04:10:38.000000000 +0000 +++ libcommons-lang-java-2.6/debian/rules 2016-03-08 10:46:45.000000000 +0000 @@ -1,28 +1,16 @@ #!/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 get-orig-source: -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename