Package: sisu-ioc
Version: 2.3.0-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Dear Maintainer,
In Ubuntu, the attached patch was applied to achieve the following:
* Fix FTBFS (LP: #935445):
- d/maven.rules: Map plexus-component-annotations to version 1.5.5.
* d/libsisu-ioc-java.poms: Added --java-lib to ensure jar files still get
installed to /usr/share/java.
The latest version of libplexus-containers1.5-java does not create 1.5.x
symbolic links causing a FTBFS with this package - an exact version match
is now required.
Also the default behaviour of maven-debian-helper has changed so I also
added a fix to ensure jars are still installed in /usr/share/java.
Thanks for considering the patch.
- -- System Information:
Debian Release: wheezy/sid
APT prefers precise-updates
APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500,
'precise')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-18-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIcBAEBCAAGBQJPVgHOAAoJEL/srsug59jDnCIQAMlT2M0PjjvEoEn39+bXpIBE
//K5LncEIVQeakjJZYwXqkCq0bJbqF4mR4VLYjYJCQ5Uk7+7J8kDUg8UviBuly8e
kW8OzJu7nIShoDliLf6GpC3DqBy4KnFKR5563mUA9qWCagcRyZRsEq2NKnmhw4hO
/03xivlXMK51yyqlJlfbFgm3C/NBRzso/M9WB4AtvKcLPRFPqwkqMu0lQNSjpz9y
jS4WW7vUc6YE43e41UdoxkpIEY7PLSouAWSoUCcdV3vH+BBusNQAk1fPN5+M/q9T
bOSt3V7akNea9VchFUD+eezxeG7FpnT5H+3MZBPeLTNnlqs2a9mfJlMeNFzhzOvt
UdyJCmoreEkoknvC9r4rsb2ERUV47f6kQPqifKTET/0vLmmnFkDThC2hsyqw/e0Z
GgDJhbK5aYPcTl5C7tdR87XI4bs3Oe3dGiQ5Ud3/Gefwz2j/48M4YlHJWJ1WrMdx
nVa5mul1XA5KiKlEY66Ilj4uuLMtAOKTO3C1lSXHMgzxTMleBaj0+neMTIAbAFIy
yMGoCh/a4vVSwHYNCDGamaLSpNrDsvVQVAMcuAclqIdouRk9EySUP2MmxOeZuwh6
ZDZSkbb0kX9LGn23QnEzjfxWam+vSam/NndNF16uSjD9iQmP0jRU0QmHdS+Usw2Q
sjsx0GO2T+7MxDr0Tk+U
=keYx
-----END PGP SIGNATURE-----
=== modified file 'debian/changelog'
=== modified file 'debian/control'
--- debian/control 2012-01-14 21:13:05 +0000
+++ debian/control 2012-03-06 12:00:09 +0000
@@ -1,7 +1,8 @@
Source: sisu-ioc
Section: java
Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintain...@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Java Maintainers <pkg-java-maintain...@lists.alioth.debian.org>
Uploaders: Damien Raude-Morvan <draz...@debian.org>
Build-Depends: cdbs, debhelper (>= 7), default-jdk, maven-debian-helper (>= 1.4)
Build-Depends-Indep: default-jdk-doc,
=== modified file 'debian/libsisu-ioc-java.poms'
--- debian/libsisu-ioc-java.poms 2011-12-10 00:45:03 +0000
+++ debian/libsisu-ioc-java.poms 2012-03-06 12:06:34 +0000
@@ -24,27 +24,27 @@
# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
#
pom.xml --no-parent --has-package-version
-sisu-inject/pom.xml --has-package-version
-sisu-inject/containers/pom.xml --has-package-version
-sisu-inject/containers/guice-bean/pom.xml --has-package-version
-sisu-inject/containers/guice-bean/guice-bean-reflect/pom.xml --has-package-version
-sisu-inject/containers/guice-bean/guice-bean-inject/pom.xml --has-package-version
-sisu-inject/containers/guice-bean/guice-bean-scanners/pom.xml --has-package-version
-sisu-inject/containers/guice-bean/guice-bean-converters/pom.xml --has-package-version
-sisu-inject/containers/guice-bean/guice-bean-locators/pom.xml --has-package-version
-sisu-inject/containers/guice-bean/guice-bean-binders/pom.xml --has-package-version
-sisu-inject/containers/guice-bean/guice-bean-containers/pom.xml --has-package-version
-sisu-inject/containers/guice-bean/sisu-inject-bean/pom.xml --has-package-version
-sisu-inject/containers/guice-plexus/pom.xml --has-package-version
-sisu-inject/containers/guice-plexus/guice-plexus-metadata/pom.xml --has-package-version
-sisu-inject/containers/guice-plexus/guice-plexus-scanners/pom.xml --has-package-version
-sisu-inject/containers/guice-plexus/guice-plexus-converters/pom.xml --has-package-version
-sisu-inject/containers/guice-plexus/guice-plexus-locators/pom.xml --has-package-version
-sisu-inject/containers/guice-plexus/guice-plexus-binders/pom.xml --has-package-version
-sisu-inject/containers/guice-plexus/guice-plexus-lifecycles/pom.xml --has-package-version
-sisu-inject/containers/guice-plexus/guice-plexus-shim/pom.xml --has-package-version
-sisu-inject/containers/guice-plexus/sisu-inject-plexus/pom.xml --has-package-version
-sisu-inject/registries/pom.xml --has-package-version
-sisu-inject/registries/sisu-osgi-registry/pom.xml --has-package-version
-sisu-inject/registries/sisu-eclipse-registry/pom.xml --has-package-version
-sisu-inject/registries/sisu-spi-registry/pom.xml --has-package-version
+sisu-inject/pom.xml --has-package-version --java-lib
+sisu-inject/containers/pom.xml --has-package-version --java-lib
+sisu-inject/containers/guice-bean/pom.xml --has-package-version --java-lib
+sisu-inject/containers/guice-bean/guice-bean-reflect/pom.xml --has-package-version --java-lib
+sisu-inject/containers/guice-bean/guice-bean-inject/pom.xml --has-package-version --java-lib
+sisu-inject/containers/guice-bean/guice-bean-scanners/pom.xml --has-package-version --java-lib
+sisu-inject/containers/guice-bean/guice-bean-converters/pom.xml --has-package-version --java-lib
+sisu-inject/containers/guice-bean/guice-bean-locators/pom.xml --has-package-version --java-lib
+sisu-inject/containers/guice-bean/guice-bean-binders/pom.xml --has-package-version --java-lib
+sisu-inject/containers/guice-bean/guice-bean-containers/pom.xml --has-package-version --java-lib
+sisu-inject/containers/guice-bean/sisu-inject-bean/pom.xml --has-package-version --java-lib
+sisu-inject/containers/guice-plexus/pom.xml --has-package-version --java-lib
+sisu-inject/containers/guice-plexus/guice-plexus-metadata/pom.xml --has-package-version --java-lib
+sisu-inject/containers/guice-plexus/guice-plexus-scanners/pom.xml --has-package-version --java-lib
+sisu-inject/containers/guice-plexus/guice-plexus-converters/pom.xml --has-package-version --java-lib
+sisu-inject/containers/guice-plexus/guice-plexus-locators/pom.xml --has-package-version --java-lib
+sisu-inject/containers/guice-plexus/guice-plexus-binders/pom.xml --has-package-version --java-lib
+sisu-inject/containers/guice-plexus/guice-plexus-lifecycles/pom.xml --has-package-version --java-lib
+sisu-inject/containers/guice-plexus/guice-plexus-shim/pom.xml --has-package-version --java-lib
+sisu-inject/containers/guice-plexus/sisu-inject-plexus/pom.xml --has-package-version --java-lib
+sisu-inject/registries/pom.xml --has-package-version --java-lib
+sisu-inject/registries/sisu-osgi-registry/pom.xml --has-package-version --java-lib
+sisu-inject/registries/sisu-eclipse-registry/pom.xml --has-package-version --java-lib
+sisu-inject/registries/sisu-spi-registry/pom.xml --has-package-version --java-lib
=== modified file 'debian/maven.rules'
--- debian/maven.rules 2011-12-10 00:45:03 +0000
+++ debian/maven.rules 2012-03-06 11:59:23 +0000
@@ -20,7 +20,7 @@
org.codehaus.plexus plexus-classworlds jar s/.*/2.x/
org.codehaus.plexus plexus-utils jar s/.*/2.x/
-org.codehaus.plexus plexus-component-annotations * s/.*/1.5.x/
+org.codehaus.plexus plexus-component-annotations * s/.*/1.5.5/
org.sonatype.sisu sisu-inject-bean jar 2.3.0 * *
org.sonatype.sisu sisu-inject-plexus jar 2.3.0 * *
