Sudip Mukherjee pushed to branch master at Debian Java Maintainers / guava-libraries
Commits: d3dd8537 by Sudip Mukherjee at 2020-09-27T19:41:43+01:00 Remove unneeded import from manifest Signed-off-by: Sudip Mukherjee <[email protected]> - - - - - 8a693819 by Sudip Mukherjee at 2020-09-27T19:41:43+01:00 Update compat level to 13 Signed-off-by: Sudip Mukherjee <[email protected]> - - - - - 1c00fc2f by Sudip Mukherjee at 2020-09-27T19:59:18+01:00 Add changelog for 29.0-6 release Signed-off-by: Sudip Mukherjee <[email protected]> - - - - - 4 changed files: - debian/changelog - debian/control - + debian/patches/25-remove-import-manifest.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,12 @@ +guava-libraries (29.0-6) unstable; urgency=medium + + * Team upload. + * Remove unnecessary import in manifest. + * Update compat level to 13. + * Remove whitespace from d/changelog. + + -- Sudip Mukherjee <[email protected]> Sun, 27 Sep 2020 19:58:33 +0100 + guava-libraries (29.0-5) unstable; urgency=medium * Improved the compatibility with Java 8 when built with later versions @@ -169,7 +178,7 @@ guava-libraries (15.0-1) unstable; urgency=low guava-libraries (14.0.1-1) unstable; urgency=low * New upstream release - - new dependency on libatinject-jsr330-api-java + - new dependency on libatinject-jsr330-api-java -- Emmanuel Bourg <[email protected]> Wed, 29 May 2013 09:53:01 +0200 @@ -207,7 +216,7 @@ guava-libraries (11.0.2-2) experimental; urgency=low [ Miguel Landaeta ] * Use correct jsr305 maven coordinates. - * Bump Standards-Version to 3.9.3. No changes were required. + * Bump Standards-Version to 3.9.3. No changes were required. * Update copyright file. [ tony mancill ] @@ -228,9 +237,9 @@ guava-libraries (09-2) unstable; urgency=low [ James Page ] * Fix FTBFS with OpenJDK7 (LP: #888939) (Closes: #651408): - - d/rules: Specify source/target as 1.5 for javac and javadoc to + - d/rules: Specify source/target as 1.5 for javac and javadoc to ensure backwards compatibility and work around Java 7 encoding - errors. + errors. -- Damien Raude-Morvan <[email protected]> Fri, 09 Dec 2011 20:05:25 +0100 ===================================== debian/control ===================================== @@ -6,7 +6,7 @@ Uploaders: Emmanuel Bourg <[email protected]>, James Page <[email protected]> Build-Depends: - debhelper-compat (= 12), + debhelper-compat (= 13), default-jdk, junit4, libanimal-sniffer-java, ===================================== debian/patches/25-remove-import-manifest.patch ===================================== @@ -0,0 +1,21 @@ +Description: Remove com.google.common.util.concurrent.internal + + com.google.common.util.concurrent.internal is copied from futures/failureaccess + to src before building and so it is not available to be Imported as a separate + package. Remove it from the manifest. + +Author: Sudip Mukherjee <[email protected]> +Forwarded: not-needed + +--- + +--- guava-libraries-29.0.orig/guava/pom.xml ++++ guava-libraries-29.0/guava/pom.xml +@@ -79,7 +79,6 @@ + com.google.common.* + </Export-Package> + <Import-Package> +- com.google.common.util.concurrent.internal, + javax.annotation;resolution:=optional, + javax.crypto.*;resolution:=optional, + sun.misc.*;resolution:=optional ===================================== debian/patches/series ===================================== @@ -16,3 +16,4 @@ 22-preserve-futures-methods.patch 23-java8-compatibility.patch 24-module-dependency.patch +25-remove-import-manifest.patch View it on GitLab: https://salsa.debian.org/java-team/guava-libraries/-/compare/736318d0b9756c64d634e01e1d82db0e93500f3d...1c00fc2f071b1292a3d2f9d552f9d301f03537ae -- View it on GitLab: https://salsa.debian.org/java-team/guava-libraries/-/compare/736318d0b9756c64d634e01e1d82db0e93500f3d...1c00fc2f071b1292a3d2f9d552f9d301f03537ae 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
