diff -Nru plexus-containers-1.7.1/debian/changelog plexus-containers-1.7.1/debian/changelog --- plexus-containers-1.7.1/debian/changelog 2017-11-07 10:22:49.000000000 +0000 +++ plexus-containers-1.7.1/debian/changelog 2017-11-07 12:32:00.000000000 +0000 @@ -1,3 +1,14 @@ +plexus-containers (1.7.1-7) unstable; urgency=medium + + * Team upload. + * Renamed the libplexus-container-default1.5-java package to + libplexus-container-default-java (but keep a transitional package) + * Removed libplexus-containers1.5-java (no longer used) + * Relocate the version 1.5.5 of the plexus-component-metadata plugin + to the current version instead of patching the pom + + -- Emmanuel Bourg Tue, 07 Nov 2017 13:32:00 +0100 + plexus-containers (1.7.1-6) unstable; urgency=medium * Team upload. diff -Nru plexus-containers-1.7.1/debian/control plexus-containers-1.7.1/debian/control --- plexus-containers-1.7.1/debian/control 2017-11-07 09:40:35.000000000 +0000 +++ plexus-containers-1.7.1/debian/control 2017-11-07 12:13:51.000000000 +0000 @@ -23,38 +23,36 @@ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/plexus-containers.git Homepage: https://github.com/codehaus-plexus/plexus-containers -Package: libplexus-containers1.5-java +Package: libplexus-container-default-java Architecture: all Depends: - libplexus-component-annotations-java (= ${source:Version}), - libplexus-component-metadata-java (= ${source:Version}), - libplexus-container-default1.5-java (= ${source:Version}), + libguava-java, + libplexus-classworlds-java (>= 2.5.2), + libplexus-utils2-java, + libxbean-reflect-java, ${misc:Depends} -Description: Plexus IoC Container core with companion tools +Breaks: libplexus-containers1.5-java (<< 1.6-2~), libplexus-containers-java, libplexus-container-default1.5-java (<< 1.7.1-7~) +Replaces: libplexus-containers1.5-java (<< 1.6-2~), libplexus-containers-java, libplexus-container-default1.5-java (<< 1.7.1-7~) +Description: Plexus Inversion-of-control Container The Plexus project provides a full software stack for creating and executing software projects. Based on the Plexus container, the applications can utilise component-oriented programming to build modular, reusable components that can easily be assembled and reused. . - This package replaces plexus-containers from 1.0.x branch. + This package contains the plexus-container-default module. Package: libplexus-container-default1.5-java Architecture: all -Depends: - libguava-java, - libplexus-classworlds-java (>= 2.5.2), - libplexus-utils2-java, - libxbean-reflect-java, - ${misc:Depends} -Breaks: libplexus-containers1.5-java (<< 1.6-2~), libplexus-containers-java -Replaces: libplexus-containers1.5-java (<< 1.6-2~), libplexus-containers-java -Description: Plexus Inversion-of-control Container +Section: oldlibs +Depends: ${misc:Depends}, libplexus-container-default-java (>= 1.7.1-7~) +Description: Plexus Inversion-of-control Container (transitional package) The Plexus project provides a full software stack for creating and executing software projects. Based on the Plexus container, the applications can utilise component-oriented programming to build modular, reusable components that can easily be assembled and reused. . - This package contains the plexus-container-default module. + This is a transitional package, please use libplexus-container-default-java + instead. Package: libplexus-component-annotations-java Architecture: all @@ -75,7 +73,7 @@ libmaven3-core-java, libplexus-cli-java, libplexus-component-annotations-java (= ${source:Version}), - libplexus-container-default1.5-java (= ${source:Version}), + libplexus-container-default-java (= ${source:Version}), libqdox2-java, ${misc:Depends} Breaks: libplexus-containers1.5-java (<< 1.6-2~) diff -Nru plexus-containers-1.7.1/debian/libplexus-container-default1.5-java.links plexus-containers-1.7.1/debian/libplexus-container-default1.5-java.links --- plexus-containers-1.7.1/debian/libplexus-container-default1.5-java.links 2017-11-07 10:01:37.000000000 +0000 +++ plexus-containers-1.7.1/debian/libplexus-container-default1.5-java.links 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -/usr/share/java/plexus-container-default.jar /usr/share/java/plexus-container-default-1.5.jar diff -Nru plexus-containers-1.7.1/debian/libplexus-container-default-java.links plexus-containers-1.7.1/debian/libplexus-container-default-java.links --- plexus-containers-1.7.1/debian/libplexus-container-default-java.links 1970-01-01 00:00:00.000000000 +0000 +++ plexus-containers-1.7.1/debian/libplexus-container-default-java.links 2017-11-07 10:01:37.000000000 +0000 @@ -0,0 +1 @@ +/usr/share/java/plexus-container-default.jar /usr/share/java/plexus-container-default-1.5.jar diff -Nru plexus-containers-1.7.1/debian/libplexus-container-default-java.poms plexus-containers-1.7.1/debian/libplexus-container-default-java.poms --- plexus-containers-1.7.1/debian/libplexus-container-default-java.poms 1970-01-01 00:00:00.000000000 +0000 +++ plexus-containers-1.7.1/debian/libplexus-container-default-java.poms 2017-11-07 12:19:11.000000000 +0000 @@ -0,0 +1,32 @@ +# List of POM files for the package +# Format of this file is: +# [option]* +# where option can be: +# --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 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. [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. [mh_install] +# --classifier=: Optional, the classifier for the jar. Empty by default. +# --site-xml=: Optional, the location for site.xml if it needs to be installed. +# Empty by default. [mh_install] +# +pom.xml --no-parent --has-package-version --package=libplexus-container-default-java +plexus-component-annotations/pom.xml --no-parent --has-package-version --package=libplexus-component-annotations-java --relocate=org.codehaus.plexus:plexus-component-annotations:1.5.5 +plexus-component-metadata/pom.xml --has-package-version --package=libplexus-component-metadata-java --relocate=org.codehaus.plexus:plexus-component-metadata:1.5.5 +plexus-component-javadoc/pom.xml --ignore +plexus-container-default/pom.xml --has-package-version --package=libplexus-container-default-java --relocate=org.codehaus.plexus:plexus-container-default:1.5.5 diff -Nru plexus-containers-1.7.1/debian/libplexus-containers1.5-java.lintian-overrides plexus-containers-1.7.1/debian/libplexus-containers1.5-java.lintian-overrides --- plexus-containers-1.7.1/debian/libplexus-containers1.5-java.lintian-overrides 2017-11-07 08:41:28.000000000 +0000 +++ plexus-containers-1.7.1/debian/libplexus-containers1.5-java.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -# Deprecated package, preserved to avoid breaking the reverse dependencies until they are updated -libplexus-containers1.5-java: empty-binary-package diff -Nru plexus-containers-1.7.1/debian/libplexus-containers1.5-java.poms plexus-containers-1.7.1/debian/libplexus-containers1.5-java.poms --- plexus-containers-1.7.1/debian/libplexus-containers1.5-java.poms 2017-11-07 10:00:42.000000000 +0000 +++ plexus-containers-1.7.1/debian/libplexus-containers1.5-java.poms 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -# List of POM files for the package -# Format of this file is: -# [option]* -# where option can be: -# --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 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. [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. [mh_install] -# --classifier=: Optional, the classifier for the jar. Empty by default. -# --site-xml=: Optional, the location for site.xml if it needs to be installed. -# Empty by default. [mh_install] -# -pom.xml --no-parent --has-package-version --package=libplexus-container-default1.5-java -plexus-component-annotations/pom.xml --no-parent --has-package-version --package=libplexus-component-annotations-java --relocate=org.codehaus.plexus:plexus-component-annotations:1.5.5 -plexus-component-metadata/pom.xml --has-package-version --package=libplexus-component-metadata-java -plexus-component-javadoc/pom.xml --ignore -plexus-container-default/pom.xml --has-package-version --package=libplexus-container-default1.5-java --relocate=org.codehaus.plexus:plexus-container-default:1.5.5 diff -Nru plexus-containers-1.7.1/debian/maven.rules plexus-containers-1.7.1/debian/maven.rules --- plexus-containers-1.7.1/debian/maven.rules 2017-11-07 09:55:12.000000000 +0000 +++ plexus-containers-1.7.1/debian/maven.rules 2017-11-07 12:19:23.000000000 +0000 @@ -23,7 +23,5 @@ org.codehaus.plexus plexus-utils jar s/.*/2.x/ * * -org.codehaus.plexus plexus-component-metadata maven-plugin * * * - org.apache.maven s/maven-project/maven-core/ * s/.*/3.x/ * * org.apache.maven maven-* * s/.*/3.x/ * * diff -Nru plexus-containers-1.7.1/debian/patches/04-plexus-component-metadata-version.patch plexus-containers-1.7.1/debian/patches/04-plexus-component-metadata-version.patch --- plexus-containers-1.7.1/debian/patches/04-plexus-component-metadata-version.patch 2017-11-07 08:41:28.000000000 +0000 +++ plexus-containers-1.7.1/debian/patches/04-plexus-component-metadata-version.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,10 +0,0 @@ ---- a/plexus-component-metadata/pom.xml -+++ b/plexus-component-metadata/pom.xml -@@ -11,6 +11,7 @@ - - plexus-component-metadata - maven-plugin -+ 1.5.5 - - Plexus :: Component Metadata - A Maven plugin to generate Plexus descriptors from source tags and class annotations. diff -Nru plexus-containers-1.7.1/debian/patches/series plexus-containers-1.7.1/debian/patches/series --- plexus-containers-1.7.1/debian/patches/series 2017-11-07 08:41:28.000000000 +0000 +++ plexus-containers-1.7.1/debian/patches/series 2017-11-07 12:20:40.000000000 +0000 @@ -1,3 +1,2 @@ 03-reproducible-metadata.patch -04-plexus-component-metadata-version.patch 05-qdox-compatibility.patch