Markus Koschany pushed to branch master at Debian Java Maintainers / mina2
Commits: a58d7ce0 by Markus Koschany at 2018-08-28T13:29:17Z Add xbean-plugin-version.patch and fix FTBFS due to wrong version of maven-xbean-plugin. Closes: #907001 - - - - - 546fb884 by Markus Koschany at 2018-08-28T13:30:42Z Switch to compat level 11. - - - - - 9e2000c6 by Markus Koschany at 2018-08-28T13:30:58Z Declare compliance with Debian Policy 4.2.1. - - - - - 1f1270c6 by Markus Koschany at 2018-08-28T13:31:09Z Use https for Format field. - - - - - ec66524e by Markus Koschany at 2018-08-28T13:31:37Z Update changelog - - - - - 70146c58 by Markus Koschany at 2018-08-28T13:32:32Z Remove Damien Raude-Morvan from Uploaders. - - - - - 0b12d103 by Markus Koschany at 2018-08-28T13:46:21Z Install NOTICE.txt to make Lintian happy. - - - - - 7 changed files: - debian/changelog - debian/compat - debian/control - debian/copyright - debian/libmina2-java-doc.install - debian/patches/series - + debian/patches/xbean-plugin-version.patch Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,14 @@ +mina2 (2.0.16-3) unstable; urgency=medium + + * Team upload. + * Add xbean-plugin-version.patch and fix FTBFS due to wrong version + of maven-xbean-plugin. (Closes: #907001) + * Switch to compat level 11. + * Declare compliance with Debian Policy 4.2.1. + * Remove Damien Raude-Morvan from Uploaders. (Closes: #889413) + + -- Markus Koschany <[email protected]> Tue, 28 Aug 2018 15:31:19 +0200 + mina2 (2.0.16-2) unstable; urgency=medium * Team upload. ===================================== debian/compat ===================================== @@ -1 +1 @@ -10 +11 ===================================== debian/control ===================================== @@ -3,10 +3,9 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: - Damien Raude-Morvan <[email protected]>, Emmanuel Bourg <[email protected]> Build-Depends: - debhelper (>= 10), + debhelper (>= 11), default-jdk, junit4, libbuild-helper-maven-plugin-java, @@ -23,7 +22,7 @@ Build-Depends: libtomcat8-java, libxbean-java, maven-debian-helper (>= 2.0.1~) -Standards-Version: 4.1.0 +Standards-Version: 4.2.1 Vcs-Git: https://anonscm.debian.org/git/pkg-java/mina2.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/mina2.git Homepage: http://mina.apache.org ===================================== debian/copyright ===================================== @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Apache Mina Upstream-Contact: Apache Software Foundation, http://mina.apache.org/ Source: http://www.apache.org/dist/mina/ ===================================== debian/libmina2-java-doc.install ===================================== @@ -1 +1,2 @@ src/target/site/apidocs/* usr/share/doc/libmina2-java/api +NOTICE.txt usr/share/doc/libmina2-java/ ===================================== debian/patches/series ===================================== @@ -1,2 +1,3 @@ 03-easymock-compatibility.patch 05-spring-dependency.patch +xbean-plugin-version.patch ===================================== debian/patches/xbean-plugin-version.patch ===================================== @@ -0,0 +1,28 @@ +From: Markus Koschany <[email protected]> +Date: Tue, 28 Aug 2018 15:26:23 +0200 +Subject: xbean-plugin version + +This patch should not be necessary. A new rule to override the version of +xbean-plugin has no effect in maven.rules. This is Debian bug #907477. +Ideally libxbean-java should provide a debian version of xbean-plugin. This +package will break again whenever someone packages a new upstream version of +libxbean-java. + +Bug-Debian: https://bugs.debian.org/907001 +--- + src/pom.xml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/pom.xml b/src/pom.xml +index 274b33a..e0aa732 100644 +--- a/src/pom.xml ++++ b/src/pom.xml +@@ -133,7 +133,7 @@ + <version.taglist.plugin>2.4</version.taglist.plugin> + <version.tools.maven.plugin>1.4</version.tools.maven.plugin> + <version.versions.plugin>2.1</version.versions.plugin> +- <version.xbean.plugin>4.1</version.xbean.plugin> ++ <version.xbean.plugin>4.5</version.xbean.plugin> + + <!-- Jars --> + <version.easymock>2.5.2</version.easymock> View it on GitLab: https://salsa.debian.org/java-team/mina2/compare/b8cfdbc2a6f9de967287226e0eb2774044a57535...0b12d10330c7f1603d9e136e12a6b130ce4ca228 -- View it on GitLab: https://salsa.debian.org/java-team/mina2/compare/b8cfdbc2a6f9de967287226e0eb2774044a57535...0b12d10330c7f1603d9e136e12a6b130ce4ca228 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
