[pkg-eucalyptus-commits] r272 - / guava guava/debian guava/debian/source

Brian Thomason iamfuzz-guest at alioth.debian.org
Wed Aug 29 05:33:47 UTC 2012


Author: iamfuzz-guest
Date: 2012-08-29 05:33:47 +0000 (Wed, 29 Aug 2012)
New Revision: 272

Added:
   guava/
   guava/debian/
   guava/debian/changelog
   guava/debian/compat
   guava/debian/control
   guava/debian/copyright
   guava/debian/libguava-java-doc.javadoc
   guava/debian/libguava-java.poms
   guava/debian/maven.rules
   guava/debian/orig-tar.excludes
   guava/debian/orig-tar.sh
   guava/debian/pom.xml
   guava/debian/rules
   guava/debian/source/
   guava/debian/source/format
   guava/debian/watch
Log:
Checked in guava packaging for v13.0


Added: guava/debian/changelog
===================================================================
--- guava/debian/changelog	                        (rev 0)
+++ guava/debian/changelog	2012-08-29 05:33:47 UTC (rev 272)
@@ -0,0 +1,34 @@
+guava-libraries (13.0-1) UNRELEASED; urgency=low
+
+  * New upstream release
+    - Now includes gwt bindings
+  * Building against JDK 7 as 6 no longer works (Thanks to Chris Halls)
+    - Still building as 1.5 for compatibility
+
+ -- Brian Thomason <brian.thomason at eucalyptus.com>  Wed, 29 Aug 2012 05:04:17 +0000
+
+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

Added: guava/debian/compat
===================================================================
--- guava/debian/compat	                        (rev 0)
+++ guava/debian/compat	2012-08-29 05:33:47 UTC (rev 272)
@@ -0,0 +1 @@
+7

Added: guava/debian/control
===================================================================
--- guava/debian/control	                        (rev 0)
+++ guava/debian/control	2012-08-29 05:33:47 UTC (rev 272)
@@ -0,0 +1,39 @@
+Source: guava-libraries
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Miguel Landaeta <miguel at miguel.cc>,
+ James Page <james.page at canonical.com>
+Build-Depends: ant-optional, debhelper (>= 7.0.50~), java7-jdk, javahelper
+Build-Depends-Indep: maven-repo-helper, libjsr305-java, libtruth-java (>= 0.7.0)
+Standards-Version: 3.9.2
+Vcs-Git: git://git.debian.org/pkg-java/guava-libraries.git
+Vcs-Browser: http://git.debian.org/?p=pkg-java/guava-libraries.git
+Homepage: http://code.google.com/p/guava-libraries/
+
+Package: libguava-java
+Architecture: all
+Depends: libjsr305-java, ${misc:Depends}
+Description: suite of Google Common Libraries for Java 5.0
+ Guava is a suite of core and expanded libraries that include
+ utility classes, google's collections, io classes, concurrency
+ support and other features.
+ .
+ Guava has only one code dependency: javax.annotation, per the
+ JSR-305 spec.
+
+Package: libguava-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.
+ .
+ Guava has only one code dependency: javax.annotation, per the
+ JSR-305 spec.
+ .
+ This package contains the javadocs of Guava library suite.

Added: guava/debian/copyright
===================================================================
--- guava/debian/copyright	                        (rev 0)
+++ guava/debian/copyright	2012-08-29 05:33:47 UTC (rev 272)
@@ -0,0 +1,30 @@
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=174
+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-2011, 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, Miguel Landaeta <miguel at miguel.cc>
+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
+     /usr/share/common-licenses/Apache-2.0 (on Debian systems)
+ .
+ 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.

Added: guava/debian/libguava-java-doc.javadoc
===================================================================
--- guava/debian/libguava-java-doc.javadoc	                        (rev 0)
+++ guava/debian/libguava-java-doc.javadoc	2012-08-29 05:33:47 UTC (rev 272)
@@ -0,0 +1 @@
+internal  /usr/share/doc/libguava-java/api

Added: guava/debian/libguava-java.poms
===================================================================
--- guava/debian/libguava-java.poms	                        (rev 0)
+++ guava/debian/libguava-java.poms	2012-08-29 05:33:47 UTC (rev 272)
@@ -0,0 +1 @@
+debian/pom.xml --no-parent

Added: guava/debian/maven.rules
===================================================================
--- guava/debian/maven.rules	                        (rev 0)
+++ guava/debian/maven.rules	2012-08-29 05:33:47 UTC (rev 272)
@@ -0,0 +1 @@
+s/com.google.code.findbugs/org.jsr-305/ jsr305 jar s/.*/0.x/ * *

Added: guava/debian/orig-tar.excludes
===================================================================
--- guava/debian/orig-tar.excludes	                        (rev 0)
+++ guava/debian/orig-tar.excludes	2012-08-29 05:33:47 UTC (rev 272)
@@ -0,0 +1,3 @@
+guava-*/*.zip
+guava-*/*.jar
+guava-*/javadoc/*

Added: guava/debian/orig-tar.sh
===================================================================
--- guava/debian/orig-tar.sh	                        (rev 0)
+++ guava/debian/orig-tar.sh	2012-08-29 05:33:47 UTC (rev 272)
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+VERSION=$2
+TAR=../guava-libraries_$VERSION.orig.tar.gz
+DIR=guava-r$VERSION
+
+mkdir -p $DIR/src/main/java
+(cd $DIR/src/main/java
+	jar xf ../../../../$3
+)
+GZIP=--best tar -cz --owner root --group root --mode a+rX \
+  --anchored -X debian/orig-tar.excludes -f $TAR $DIR
+rm -rf $DIR $3


Property changes on: guava/debian/orig-tar.sh
___________________________________________________________________
Added: svn:executable
   + *

Added: guava/debian/pom.xml
===================================================================
--- guava/debian/pom.xml	                        (rev 0)
+++ guava/debian/pom.xml	2012-08-29 05:33:47 UTC (rev 272)
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>com.google.guava</groupId>
+    <artifactId>guava-parent</artifactId>
+    <version>11.0.2</version>
+  </parent>
+  <artifactId>guava</artifactId>
+  <name>Guava: Google Core Libraries for Java</name>
+  <description>
+    Guava is a suite of core and expanded libraries that include
+    utility classes, google's collections, io classes, and much
+    much more.
+
+    This project is a complete packaging of all the Guava libraries
+    into a single jar.  Individual portions of Guava can be used
+    by downloading the appropriate module and its dependencies.
+
+    Guava (complete) has only one code dependency - javax.annotation,
+    per the JSR-305 spec.
+  </description>
+  <dependencies>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+      <version>1.3.9</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>guava-bootstrap</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.5</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.3.2</version>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+          <!-- Prepend guava-bootstrap to avoid an API incompatibility between JDK5 and JDK6 -->
+          <compilerArgument>-Xbootclasspath/p:${project.build.directory}/dependency/guava-bootstrap-${project.version}.jar</compilerArgument>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <version>2.3</version>
+        <executions>
+          <execution>
+            <id>prep-guava-bootstrap</id>
+            <phase>process-sources</phase>
+            <goals><goal>copy-dependencies</goal></goals>
+            <configuration>
+              <includeArtifactIds>guava-bootstrap</includeArtifactIds>
+              <excludeTransitive>true</excludeTransitive>
+              <includeScope>provided</includeScope>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-source-plugin</artifactId>
+        <version>2.1.2</version>
+        <executions>
+          <execution>
+            <id>attach-sources</id>
+            <phase>verify</phase>
+            <goals>
+              <goal>jar-no-fork</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>animal-sniffer-maven-plugin</artifactId>
+        <version>1.7</version>
+        <configuration>
+          <signature>
+            <groupId>org.codehaus.mojo.signature</groupId>
+            <artifactId>java15-sun</artifactId>
+            <version>1.0</version>
+          </signature>
+        </configuration>
+        <executions>
+          <execution>
+            <id>check-java15</id>
+            <phase>test</phase>
+            <goals>
+              <goal>check</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>2.8</version>
+        <configuration>
+          <encoding>UTF-8</encoding>
+          <docencoding>UTF-8</docencoding>
+          <charset>UTF-8</charset>
+          <additionalparam>-XDignore.symbol.file</additionalparam>
+          <excludePackageNames>com.google.common.base.internal</excludePackageNames>
+          <linksource>true</linksource>
+          <links>
+            <link>http://jsr-305.googlecode.com/svn/trunk/javadoc</link>
+          </links>
+        </configuration>
+        <executions>
+          <execution>
+            <id>generate-javadoc</id>
+            <phase>site</phase>
+            <goals><goal>javadoc</goal></goals>
+          </execution>
+          <execution>
+            <id>generate-jdiff</id>
+            <phase>site</phase>
+            <goals><goal>javadoc</goal></goals>
+            <configuration>
+              <doclet>jdiff.JDiff</doclet>
+              <docletPath>${project.basedir}/lib/jdiff.jar</docletPath>
+              <additionalparam>
+                -XDignore.symbol.file -apiname 'Guava ${project.version}'
+              </additionalparam>
+              <useStandardDocletOptions>false</useStandardDocletOptions>
+              <reportOutputDirectory>${project.reporting.outputDirectory}</reportOutputDirectory>
+              <destDir>jdiff</destDir>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+    <finalName>${project.artifactId}-${project.version}</finalName>
+    <sourceDirectory>src</sourceDirectory>
+    <testSourceDirectory>disabled</testSourceDirectory>
+  </build>
+</project>

Added: guava/debian/rules
===================================================================
--- guava/debian/rules	                        (rev 0)
+++ guava/debian/rules	2012-08-29 05:33:47 UTC (rev 272)
@@ -0,0 +1,34 @@
+#!/usr/bin/make -f
+
+PACKAGE   := libguava-java
+VERSION   := $(shell dpkg-parsechangelog | grep ^Version: | sed -r 's/^Version: (.+)-.+$$/\1/')
+export JAVA_HOME := /usr/lib/jvm/java-7-openjdk-*
+export CLASSPATH := /usr/share/java/jsr305.jar:guava.jar:guava-gwt.jar:/usr/share/java/gwt-dev.jar:/usr/share/java/gwt-user.jar:guava-testlib.jar:/usr/share/java/junit4.jar:/usr/share/java/truth.jar
+
+%:
+	dh $@ --with javahelper
+
+override_dh_auto_build:
+	jh_build --javacopts="-source 1.5 -target 1.5" --javadoc-opts="-source 1.5" guava.jar guava/src
+	jh_build --javacopts="-source 1.5 -target 1.5" guava-gwt.jar guava-gwt/src
+	jh_build --javacopts="-source 1.5 -target 1.5" guava-testlib.jar guava-testlib/src
+	jh_build --javacopts="-source 1.5 -target 1.5" guava-gwt-super.jar guava-gwt/src
+
+override_dh_auto_install:
+	mh_installpoms -p$(PACKAGE)
+	mh_installjar -p$(PACKAGE) -l debian/pom.xml guava.jar
+	mh_installjar -p$(PACKAGE) -l guava-gwt/pom.xml guava-gwt.jar
+	mh_installjar -p$(PACKAGE) -l guava-testlib/pom.xml guava-testlib.jar
+	mh_installjar -p$(PACKAGE) -l guava-gwt/pom.xml guava-gwt-super.jar
+
+override_dh_auto_clean:
+	dh_auto_clean
+	mh_clean
+	rm -f *.jar
+
+get-orig-source:
+	-uscan --download-current-version --force-download --rename
+
+get-orig-pom:
+	wget http://repo1.maven.org/maven2/com/google/guava/guava/$(VERSION)/guava-$(VERSION).pom \
+		-O debian/pom.xml -U Debian


Property changes on: guava/debian/rules
___________________________________________________________________
Added: svn:executable
   + *

Added: guava/debian/source/format
===================================================================
--- guava/debian/source/format	                        (rev 0)
+++ guava/debian/source/format	2012-08-29 05:33:47 UTC (rev 272)
@@ -0,0 +1 @@
+3.0 (quilt)

Added: guava/debian/watch
===================================================================
--- guava/debian/watch	                        (rev 0)
+++ guava/debian/watch	2012-08-29 05:33:47 UTC (rev 272)
@@ -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




More information about the pkg-eucalyptus-commits mailing list