This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository guava-libraries.
commit fa893402bfe52cabd071cbac706c36abb0caf0d2 Author: Emmanuel Bourg <[email protected]> Date: Thu Jul 3 00:17:43 2014 +0200 New upstream release (17.0) Refreshed the patches --- debian/changelog | 7 +++++++ debian/copyright | 3 ++- debian/patches/02-remove-source-in-javadoc.patch | 4 ++-- debian/patches/03-openjdk-inference.patch | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index b19debc..bf039bf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +guava-libraries (17.0-1) unstable; urgency=medium + + * New upstream release + - Refreshed the patches + + -- Emmanuel Bourg <[email protected]> Thu, 03 Jul 2014 00:16:44 +0200 + guava-libraries (15.0-2) unstable; urgency=low * Removed the Breaks on jython, sisu-guice and stapler since the compatibility diff --git a/debian/copyright b/debian/copyright index 24edcc6..7a96536 100644 --- a/debian/copyright +++ b/debian/copyright @@ -6,13 +6,14 @@ Comment: Upstream authors: Kevin Bourrillion, Jared Levy, Mike Bostock, Jesse Wilson. Files: * -Copyright: 2007-2013, Google Inc. +Copyright: 2007-2014, Google Inc. License: Apache-2.0 Files: debian/* Copyright: 2008-2010, Torsten Werner <[email protected]>, 2009, Ludovic Claude <[email protected]>, 2011-2012, Miguel Landaeta <[email protected]> + 2013-2014, Emmanuel Bourg <[email protected]> License: Apache-2.0 License: Apache-2.0 diff --git a/debian/patches/02-remove-source-in-javadoc.patch b/debian/patches/02-remove-source-in-javadoc.patch index 1d140ee..601e0e1 100644 --- a/debian/patches/02-remove-source-in-javadoc.patch +++ b/debian/patches/02-remove-source-in-javadoc.patch @@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/guava/pom.xml +++ b/guava/pom.xml -@@ -110,7 +110,7 @@ +@@ -89,7 +89,7 @@ <charset>UTF-8</charset> <additionalparam>-XDignore.symbol.file</additionalparam> <excludePackageNames>com.google.common.base.internal</excludePackageNames> @@ -11,4 +11,4 @@ Forwarded: not-needed + <linksource>false</linksource> <links> <link>http://jsr-305.googlecode.com/svn/trunk/javadoc</link> - </links> + <link>http://docs.oracle.com/javase/7/docs/api/</link> diff --git a/debian/patches/03-openjdk-inference.patch b/debian/patches/03-openjdk-inference.patch index 00266a3..4f19d8d 100644 --- a/debian/patches/03-openjdk-inference.patch +++ b/debian/patches/03-openjdk-inference.patch @@ -5,7 +5,7 @@ Bug: http://code.google.com/p/guava-libraries/issues/detail?id=635 --- a/guava/src/com/google/common/collect/Maps.java +++ b/guava/src/com/google/common/collect/Maps.java -@@ -315,8 +315,8 @@ +@@ -317,8 +317,8 @@ * @param comparator the comparator to sort the keys with * @return a new, empty {@code TreeMap} */ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/guava-libraries.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
