[guava-libraries-18] 01/01: 18.0-1
Hilko Bengen
bengen at moszumanska.debian.org
Fri Feb 6 00:15:21 UTC 2015
This is an automated email from the git hooks/post-receive script.
bengen pushed a commit to branch master
in repository guava-libraries-18.
commit 3c6ef8d5cbf29bd213560dba7c05afe5cbf65de5
Author: Hilko Bengen <bengen at debian.org>
Date: Tue Oct 28 20:20:05 2014 +0100
18.0-1
---
debian/changelog | 120 +++++++++++++++++++++++
debian/compat | 1 +
debian/control | 40 ++++++++
debian/copyright | 34 +++++++
debian/libguava18-java-doc.doc-base.api | 9 ++
debian/libguava18-java-doc.install | 2 +
debian/libguava18-java.links | 1 +
debian/libguava18-java.poms | 32 ++++++
debian/maven.ignoreRules | 13 +++
debian/maven.publishedRules | 4 +
debian/maven.rules | 4 +
debian/orig-tar.sh | 17 ++++
debian/patches/01-maven2-compatibility.patch | 14 +++
debian/patches/02-remove-source-in-javadoc.patch | 14 +++
debian/patches/03-openjdk-inference.patch | 18 ++++
debian/patches/04-source-encoding.patch | 15 +++
debian/patches/series | 4 +
debian/rules | 17 ++++
debian/source/format | 1 +
debian/watch | 3 +
20 files changed, 363 insertions(+)
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..497ff2e
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,120 @@
+guava-libraries-18 (18.0-1) unstable; urgency=medium
+
+ * New upstream release (Closes: #767097)
+ * Renamed package due to API/ABI incompatibilities with version 17
+ * Added myself to Uploaders
+ * Removed API-changing patch
+ * Bumped Standards-Version
+ * Updated copyright file
+ * Do not ship versionless guava.jar
+
+ -- Hilko Bengen <bengen at debian.org> Tue, 28 Oct 2014 20:20:05 +0100
+
+guava-libraries (17.0-1) unstable; urgency=medium
+
+ * New upstream release
+ - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org> 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
+ is temporarily assured by 05-preserve-mapmaker-makecomputingmap.patch
+ (Closes: #724713)
+
+ -- Emmanuel Bourg <ebourg at apache.org> Wed, 16 Oct 2013 23:00:24 +0200
+
+guava-libraries (15.0-1) unstable; urgency=low
+
+ * New upstream release
+ * Use the real upstream source downloaded from
+ http://guava-libraries.googlecode.com/archive/v<VERSION>.zip
+ instead of the sources jar from Maven central
+ * Changed the build to use maven-debian-helper
+ * Removed debian/pom.xml and debian/guava.bnd
+ * Build depend on debhelper 9
+ * debian/rules: Removed the get-orig-pom target
+ * debian/control: Use canonical URLs for the Vcs-* fields
+ * Use XZ compression for the upstream tarball
+ * Added a Maven publish rule to take over the artifact
+ of Google Collections (Closes: #712453)
+ * Added a patch to keep MapMaker.makeComputingMap() public since
+ this method is still used by reverse dependencies
+
+ -- Emmanuel Bourg <ebourg at apache.org> Thu, 12 Sep 2013 13:02:43 +0200
+
+guava-libraries (14.0.1-1) unstable; urgency=low
+
+ * New upstream release
+ - new dependency on libatinject-jsr330-api-java
+
+ -- Emmanuel Bourg <ebourg at apache.org> Wed, 29 May 2013 09:53:01 +0200
+
+guava-libraries (13.0.1-3) unstable; urgency=low
+
+ * Team upload.
+ * Upload to unstable.
+
+ -- tony mancill <tmancill at debian.org> Wed, 15 May 2013 14:46:32 -0700
+
+guava-libraries (13.0.1-2) experimental; urgency=low
+
+ * Team upload.
+ * Install using correct pom.xml for this upstream version.
+ - fixes old version number in filenames of the created artifacts.
+ (Closes: #697636)
+ * Removed obsolete DMUA flag.
+
+ -- Jakub Adam <jakub.adam at ktknet.cz> Mon, 31 Dec 2012 21:43:06 +0100
+
+guava-libraries (13.0.1-1) experimental; urgency=low
+
+ [ tony mancill ]
+ * Team upload.
+ * Bump Standards-Version to 3.9.4. No changes were required.
+ * Correct Vcs-Git field in d/control.
+
+ [ Jakub Adam ]
+ * New upstream release (Closes: #690885).
+ * Generate OSGi metadata for jar manifest.
+
+ -- Jakub Adam <jakub.adam at ktknet.cz> Fri, 26 Oct 2012 21:49:59 +0200
+
+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.
+ * Update copyright file.
+
+ [ tony mancill ]
+ * Set DMUA flag.
+
+ -- Miguel Landaeta <miguel at miguel.cc> Wed, 08 Aug 2012 19:59:08 -0430
+
+guava-libraries (11.0.2-1) unstable; urgency=low
+
+ * Team upload.
+ * New upstream release.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Wed, 22 Feb 2012 23:04:40 +0100
+
+guava-libraries (09-2) unstable; urgency=low
+
+ * Team upload.
+
+ [ James Page ]
+ * Fix FTBFS with OpenJDK7 (LP: #888939) (Closes: #651408):
+ - d/rules: Specify source/target as 1.5 for javac and javadoc to
+ ensure backwards compatibility and work around Java 7 encoding
+ errors.
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Fri, 09 Dec 2011 20:05:25 +0100
+
+guava-libraries (09-1) unstable; urgency=low
+
+ [ Miguel Landaeta ]
+ * Initial release. (Closes: #555684).
+
+ -- James Page <james.page at canonical.com> Thu, 02 Jun 2011 21:35:47 +0100
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..5263335
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,40 @@
+Source: guava-libraries-18
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Miguel Landaeta <miguel at miguel.cc>,
+ Emmanuel Bourg <ebourg at apache.org>,
+ James Page <james.page at canonical.com>,
+ Hilko Bengen <bengen at debian.org>
+Build-Depends: cdbs, debhelper (>= 9~), default-jdk, maven-debian-helper
+Build-Depends-Indep: libatinject-jsr330-api-java,
+ libjsr305-java,
+ libmaven-bundle-plugin-java,
+ libmaven-dependency-plugin-java,
+ libmaven-javadoc-plugin-java
+Standards-Version: 3.9.6
+Vcs-Git: git://anonscm.debian.org/pkg-java/guava-libraries-18.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/guava-libraries-18.git
+Homepage: http://code.google.com/p/guava-libraries/
+
+Package: libguava18-java
+Architecture: all
+Depends: libatinject-jsr330-api-java, libjsr305-java, ${misc:Depends}
+Breaks: closure-compiler (<= 20130227+dfsg1-2)
+Description: Google Core Libraries for Java
+ Guava is a suite of core and expanded libraries that include
+ utility classes, Google's collections, io classes, concurrency
+ support and other features.
+
+Package: libguava18-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Recommends: libguava-java
+Suggests: default-jdk-doc
+Description: documentation for libguava-java
+ Guava is a suite of core and expanded libraries that include
+ utility classes, Google's collections, io classes, concurrency
+ support and other features.
+ .
+ This package contains the javadocs of Guava library suite.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..9339fb3
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,34 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: guava-libraries
+Upstream-Contact: Kevin Bourillion <kevinb at google.com>
+Source: http://code.google.com/p/guava-libraries/downloads/list
+Comment: Upstream authors:
+ Kevin Bourrillion, Jared Levy, Mike Bostock, Jesse Wilson.
+
+Files: *
+Copyright: 2007-2014, Google Inc.
+License: Apache-2.0
+
+Files: debian/*
+Copyright: 2008-2010, Torsten Werner <twerner at debian.org>,
+ 2009, Ludovic Claude <ludovic.claude at laposte.net>,
+ 2011-2012, Miguel Landaeta <miguel at miguel.cc>
+ 2013-2014, Emmanuel Bourg <ebourg at apache.org>
+ 2014, Hilko Bengen <bengen at debian.org>
+License: Apache-2.0
+
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+ http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian systems, the complete text of the Apache version 2.0 license
+ can be found in "/usr/share/common-licenses/Apache-2.0".
diff --git a/debian/libguava18-java-doc.doc-base.api b/debian/libguava18-java-doc.doc-base.api
new file mode 100644
index 0000000..1b2578c
--- /dev/null
+++ b/debian/libguava18-java-doc.doc-base.api
@@ -0,0 +1,9 @@
+Document: libguava-java
+Title: API Javadoc for Guava
+Author: Google Inc.
+Abstract: This is the API Javadoc provided for the libguava-java library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libguava-java/api/index.html
+Files: /usr/share/doc/libguava-java/api/*
diff --git a/debian/libguava18-java-doc.install b/debian/libguava18-java-doc.install
new file mode 100644
index 0000000..f41d00e
--- /dev/null
+++ b/debian/libguava18-java-doc.install
@@ -0,0 +1,2 @@
+
+guava/target/apidocs/* usr/share/doc/libguava-java/api
diff --git a/debian/libguava18-java.links b/debian/libguava18-java.links
new file mode 100644
index 0000000..71593e8
--- /dev/null
+++ b/debian/libguava18-java.links
@@ -0,0 +1 @@
+usr/share/java/guava-18.0.jar usr/share/java/guava-18.x.jar
diff --git a/debian/libguava18-java.poms b/debian/libguava18-java.poms
new file mode 100644
index 0000000..e59816c
--- /dev/null
+++ b/debian/libguava18-java.poms
@@ -0,0 +1,32 @@
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [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 <parent> tag from the POM
+# --package=<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=<elem1,elem2>: a list of XML elements to keep in the POM
+# during a clean operation with mh_cleanpom or mh_installpom
+# --artifact=<path>: 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>: name to use when installing the library in /usr/share/java
+# --usj-version=<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=<path>: the destination for the real jar.
+# It will be installed with mh_install. [mh_install]
+# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+# Empty by default. [mh_install]
+#
+pom.xml --no-parent --has-package-version
+guava/pom.xml --has-package-version --java-lib --no-usj-versionless
+guava-gwt/pom.xml --ignore
+guava-testlib/pom.xml --ignore
+guava-tests/pom.xml --ignore
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..2da7699
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1,13 @@
+
+org.sonatype.oss oss-parent * * * *
+com.google.guava guava-gwt jar * * *
+com.google.guava guava-testlib jar * * *
+com.google.guava guava-tests jar * * *
+com.google.caliper caliper * * * *
+junit junit * * * *
+org.apache.maven.plugins maven-gpg-plugin * * * *
+org.apache.maven.plugins maven-source-plugin * * * *
+org.easymock easymock * * * *
+org.mockito mockito-core * * * *
+org.truth0 truth * * * *
+org.codehaus.mojo animal-sniffer-maven-plugin * * * *
diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules
new file mode 100644
index 0000000..7dd91ea
--- /dev/null
+++ b/debian/maven.publishedRules
@@ -0,0 +1,4 @@
+
+com.google.guava guava s/jar/bundle/ s/.*/debian/ * *
+s/com.google.collections/com.google.guava/ s/google-collections/guava/ s/jar/bundle/ s/.*/debian/ * *
+s/com.google.code.google-collections/com.google.guava/ s/google-collect/guava/ s/jar/bundle/ s/.*/debian/ * *
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..55e5815
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,4 @@
+
+com.google.guava guava-parent pom s/.*/18.x/ * *
+com.google.guava guava bundle s/.*/18.x/ * *
+s/com.google.code.findbugs/org.jsr-305/ jsr305 * s/.*/0.x/ * *
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
new file mode 100755
index 0000000..75f6246
--- /dev/null
+++ b/debian/orig-tar.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+VERSION=$2
+TAR=../guava-libraries-18_$VERSION.orig.tar.xz
+
+# delete the source jar downloaded by uscan
+rm $3
+
+# download and extract the real tarball
+wget http://guava-libraries.googlecode.com/archive/v$VERSION.zip -O guava-libraries-$VERSION.zip
+unzip guava-libraries-$VERSION.zip
+rm guava-libraries-$VERSION.zip
+
+# rebuild the tarball
+XZ_OPT='--best -v' tar -cJ --exclude '*.jar' -f $TAR guava-libraries-*
+
+rm -rf guava-libraries-*
diff --git a/debian/patches/01-maven2-compatibility.patch b/debian/patches/01-maven2-compatibility.patch
new file mode 100644
index 0000000..d7680da
--- /dev/null
+++ b/debian/patches/01-maven2-compatibility.patch
@@ -0,0 +1,14 @@
+Description: Makes the project buildable with Maven 2
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/pom.xml
++++ b/pom.xml
+@@ -34,7 +34,7 @@
+ </license>
+ </licenses>
+ <prerequisites>
+- <maven>3.0.3</maven>
++ <maven>2.2.1</maven>
+ </prerequisites>
+ <scm>
+ <connection>scm:git:https://code.google.com/p/guava-libraries/</connection>
diff --git a/debian/patches/02-remove-source-in-javadoc.patch b/debian/patches/02-remove-source-in-javadoc.patch
new file mode 100644
index 0000000..601e0e1
--- /dev/null
+++ b/debian/patches/02-remove-source-in-javadoc.patch
@@ -0,0 +1,14 @@
+Description: Removes the browsable source files generated with the Javadoc
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/guava/pom.xml
++++ b/guava/pom.xml
+@@ -89,7 +89,7 @@
+ <charset>UTF-8</charset>
+ <additionalparam>-XDignore.symbol.file</additionalparam>
+ <excludePackageNames>com.google.common.base.internal</excludePackageNames>
+- <linksource>true</linksource>
++ <linksource>false</linksource>
+ <links>
+ <link>http://jsr-305.googlecode.com/svn/trunk/javadoc</link>
+ <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
new file mode 100644
index 0000000..4f19d8d
--- /dev/null
+++ b/debian/patches/03-openjdk-inference.patch
@@ -0,0 +1,18 @@
+Description: Disables workaround for compilation failures on sun-jdk
+ which openjdk does not appear to have issues with.
+Author: James Page <james.page at canonical.com>
+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
+@@ -317,8 +317,8 @@
+ * @param comparator the comparator to sort the keys with
+ * @return a new, empty {@code TreeMap}
+ */
+- public static <C, K extends C, V> TreeMap<K, V> newTreeMap(
+- @Nullable Comparator<C> comparator) {
++ public static <K, V> TreeMap<K, V> newTreeMap(
++ @Nullable Comparator<? super K> comparator) {
+ // Ideally, the extra type parameter "C" shouldn't be necessary. It is a
+ // work-around of a compiler type inference quirk that prevents the
+ // following code from being compiled:
diff --git a/debian/patches/04-source-encoding.patch b/debian/patches/04-source-encoding.patch
new file mode 100644
index 0000000..0334b25
--- /dev/null
+++ b/debian/patches/04-source-encoding.patch
@@ -0,0 +1,15 @@
+Description: Specifies the source encoding for the compiler to avoid unmappable
+ character errors. For some reason the project.build.sourceEncoding property
+ is ignored.
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: no
+--- a/pom.xml
++++ b/pom.xml
+@@ -103,6 +103,7 @@
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
++ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..1f03c8f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+01-maven2-compatibility.patch
+02-remove-source-in-javadoc.patch
+03-openjdk-inference.patch
+04-source-encoding.patch
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..2724aa7
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,17 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/maven.mk
+
+pkg=$(firstword $(DEB_ALL_PACKAGES))
+
+JAVA_HOME := /usr/lib/jvm/default-java
+
+get-orig-source:
+ -uscan --download-current-version --force-download --rename
+
+install/$(pkg)::
+ # --no-usj-versionless does not do what the comment in the
+ # --generated .poms file claims.
+ mv debian/$(pkg)/usr/share/java/guava.jar \
+ debian/$(pkg)/usr/share/java/guava-$(DEB_UPSTREAM_VERSION).jar
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..5c06ade
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=3
+opts=uversionmangle=s/r// \
+ http://repo1.maven.org/maven2/com/google/guava/guava/([\d][\d\.]+)/guava-([\d\.]+)-sources.jar debian debian/orig-tar.sh
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/guava-libraries-18.git
More information about the pkg-java-commits
mailing list