[pkg-java] r7462 - trunk/libgoogle-collections-java/debian

twerner at alioth.debian.org twerner at alioth.debian.org
Sat Nov 29 18:32:58 UTC 2008


Author: twerner
Date: 2008-11-29 18:32:57 +0000 (Sat, 29 Nov 2008)
New Revision: 7462

Added:
   trunk/libgoogle-collections-java/debian/ant.properties
Modified:
   trunk/libgoogle-collections-java/debian/
   trunk/libgoogle-collections-java/debian/changelog
   trunk/libgoogle-collections-java/debian/control
   trunk/libgoogle-collections-java/debian/copyright
   trunk/libgoogle-collections-java/debian/orig-tar.sh
   trunk/libgoogle-collections-java/debian/rules
Log:
package builds now



Property changes on: trunk/libgoogle-collections-java/debian
___________________________________________________________________
Name: mergeWithUpstream
   + 1

Added: trunk/libgoogle-collections-java/debian/ant.properties
===================================================================
--- trunk/libgoogle-collections-java/debian/ant.properties	                        (rev 0)
+++ trunk/libgoogle-collections-java/debian/ant.properties	2008-11-29 18:32:57 UTC (rev 7462)
@@ -0,0 +1,2 @@
+ant.build.javac.source=1.5
+ant.build.javac.target=1.5

Modified: trunk/libgoogle-collections-java/debian/changelog
===================================================================
--- trunk/libgoogle-collections-java/debian/changelog	2008-11-29 18:07:51 UTC (rev 7461)
+++ trunk/libgoogle-collections-java/debian/changelog	2008-11-29 18:32:57 UTC (rev 7462)
@@ -1,5 +1,6 @@
 libgoogle-collections-java (0~20080808-1) unstable; urgency=low
 
+  UNRELEASED
   * Initial release. (Closes: #xxxxxx)
 
  -- Torsten Werner <twerner at debian.org>  Sat, 29 Nov 2008 19:03:14 +0100

Modified: trunk/libgoogle-collections-java/debian/control
===================================================================
--- trunk/libgoogle-collections-java/debian/control	2008-11-29 18:07:51 UTC (rev 7461)
+++ trunk/libgoogle-collections-java/debian/control	2008-11-29 18:32:57 UTC (rev 7462)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>
-Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3)
+Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3), default-jdk
 Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libgoogle-collections-java
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libgoogle-collections-java/
@@ -11,18 +11,29 @@
 
 Package: libgoogle-collections-java
 Architecture: all
-Description: FIXME a Data Model toolkit in use by the Maven 2 Project
- Once a DataModel is defined, the toolkit can be used to generate any of the
- following at compile time.
+Description: suite of collections and related goodies for Java 5.0
+ This library is a natural extension of the Java Collections Framework. The
+ major new types are:
+  * BiMap. A Map that guarantees unique values, and supports an inverse view.
+  * Multiset. A Collection that may contain duplicate values like a List, yet
+    has order-independent equality like a Set. Often used to represent a
+    histogram.
+  * Multimap. Similar to Map, but may contain duplicate keys. Has subtypes
+    SetMultimap and ListMultimap providing more specific behavior. 
  .
-    * Java Pojos of the DataModel.
-    * Java Pojos to XML Writer. (provided via xpp3, stax, jdom or dom4j)
-    * XML to Java Pojos Reader. (provided via xpp3, stax or dom4j)
-    * XDOC documentation of the DataModel.
-    * XML Schema to validate the DataModel.
-    * Java Model to Prevayler Store (actually this plugin is in the
-      sandbox).
-    * Java Model to JPOX Store.
-    * Java Model to JPOX Mapping.
+ There are also more than a dozen collection implementations, mostly of the
+ interfaces above, but not all. ReferenceMap, for example, is a ConcurrentMap
+ implementation which easily handles any combination of strong, soft or weak
+ keys with strong, soft or weak values. Static utility classes include:
+  * Comparators. Natural order, compound, null-friendly, ad-hoc, ...
+  * Iterators and Iterables. Element-based equality, cycle, concat, partition,
+    filter with predicate, transform with function ...
+  * Lists, Sets and Maps. A plethora of convenient factory methods and much
+    more.
+  * PrimitiveArrays: "boxing"/"unboxing" of primitive arrays 
  .
- Modello is used to build the maven system.
+ And there's more:
+  * Immutable collections
+  * Forwarding collections
+  * Constrained collections
+  * Implementation helpers like AbstractIterator

Modified: trunk/libgoogle-collections-java/debian/copyright
===================================================================
--- trunk/libgoogle-collections-java/debian/copyright	2008-11-29 18:07:51 UTC (rev 7461)
+++ trunk/libgoogle-collections-java/debian/copyright	2008-11-29 18:32:57 UTC (rev 7462)
@@ -1,97 +1,26 @@
 This package was debianized by Torsten Werner<twerner at debian.org>
 Sat Nov 29 17:33:45 CET 2008
 
-plex-containers was downloaded from http://code.google.com/p/google-collections/
+google-collections was downloaded from
+http://code.google.com/p/google-collections/
 
-FIXME
+Upstream Authors: Kevin Bourrillion, Jared Levy, Mike Bostock, Jesse Wilson 
 
-Upstream Authors:  
-	Andrew Williams
-	Avalon Development Team
-	Ben Walding
-	Berin Loritsch
-	Bert van Brakel
-	Brett Porter
-	Dan Diephouse
-	Jason van Zyl
-	John Casey
-	Kenney Westerhof
-	Leo Sutic
-	Mark H. Wilkinson
-	Michal Maczka
-	Peter Donald
-	Ran Tene
-	Trygve Laugstl
+Copyright: 2007-2008 Google Inc.
 
+License:
 
-There is one source file without a license header. This has been brought to
-upstream's attention who have confirmed that they will add the license
-information (see IRC log extract below):
+   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
 
- [Sat Apr 21 2007] [13:06:51] <paulcager> Source file for class
-  org.codehaus.plexus.component.configurator.converters.ComponentValueSetter
-  doesn't have any License information at
- [Sat Apr 21 2007] [13:07:45] <paulcager> the top. I'm packaging it for Debian,
-  and I wondered if anyone could add the appropriate license block?
- [Sat Apr 21 2007] [13:22:22] <cobalt-60> kenney, your name is there,
-  and it looks it all your fault :)
- [Sat Apr 21 2007] [15:19:52] <trygvis> paulcager: I'll take care of it ..
-  was supposed to do it, but got busy
+       http://www.apache.org/licenses/LICENSE-2.0
 
-COPYRIGHT NOTICES:
-	Copyright 2002 (C) The Werken Company. All Rights Reserved.
+   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.
 
-	Redistribution and use of this software and associated documentation
-	("Software"), with or without modification, are permitted provided
-	that the following conditions are met:
-
-	1. Redistributions of source code must retain copyright
-	statements and notices.  Redistributions must also contain a
-	copy of this document.
-
-	2. Redistributions in binary form must reproduce the
-	above copyright notice, this list of conditions and the
-	following disclaimer in the documentation and/or other
-	materials provided with the distribution.
-
-	3. The name "classworlds" must not be used to endorse or promote
-	products derived from this Software without prior written
-	permission of The Werken Company.  For written permission,
-	please contact bob at werken.com.
-
-	4. Products derived from this Software may not be called "classworlds"
-	nor may "classworlds" appear in their names without prior written
-	permission of The Werken Company. "classworlds" is a registered
-	trademark of The Werken Company.
-
-	5. Due credit should be given to The Werken Company.
-	(http://classworlds.werken.com/).
-
-	THIS SOFTWARE IS PROVIDED BY THE WERKEN COMPANY AND CONTRIBUTORS
-	``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT
-	NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-	FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
-	THE WERKEN COMPANY OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
-	INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-	(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-	SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-	HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-	STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
-	OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-	* Copyright 2001-2006 Codehaus Foundation.
-	*
-	* 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.
-
+The full text of the license can be found at
+'/usr/share/common-licenses/Apache-2.0'.

Modified: trunk/libgoogle-collections-java/debian/orig-tar.sh
===================================================================
--- trunk/libgoogle-collections-java/debian/orig-tar.sh	2008-11-29 18:07:51 UTC (rev 7461)
+++ trunk/libgoogle-collections-java/debian/orig-tar.sh	2008-11-29 18:32:57 UTC (rev 7462)
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-TAR=../libgoogle-collections-java_$1.orig.tar.gz
+TAR=../libgoogle-collections-java_0~$1.orig.tar.gz
 DIR=google-collections-$1
 
 svn export -r{$1} http://google-collections.googlecode.com/svn/trunk/ $DIR

Modified: trunk/libgoogle-collections-java/debian/rules
===================================================================
--- trunk/libgoogle-collections-java/debian/rules	2008-11-29 18:07:51 UTC (rev 7461)
+++ trunk/libgoogle-collections-java/debian/rules	2008-11-29 18:32:57 UTC (rev 7462)
@@ -7,14 +7,11 @@
 PACKAGE              := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ')
 VERSION              := $(shell dpkg-parsechangelog | egrep '^Version:' | sed "s,Version: 0~\(.*\)-.*,\1,g")
 JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_JARS             := 
-DEB_ANT_BUILD_TARGET := jar
-API_DOCS             := build/api
+DEB_ANT_BUILD_TARGET := jar -Dversion=$(VERSION)
 
 get-orig-source:
 	sh debian/orig-tar.sh $(VERSION)
 
-binary-post-install/lib$(PACKAGE)-java::
-	dh_install -plib$(PACKAGE)-java modello-$$MODULE/build/$(PACKAGE)-$$MODULE-$(VERSION).jar usr/share/java; \
-	dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-$$MODULE-$(VERSION).jar usr/share/java/$(PACKAGE)-$$MODULE.jar; \
-
+binary-post-install/$(PACKAGE)::
+	dh_install -p$(PACKAGE) build/dist/google-collect-$(VERSION)/google-collect-$(VERSION).jar usr/share/java
+	dh_link -p$(PACKAGE) /usr/share/java/google-collect-$(VERSION).jar /usr/share/java/google-collect.jar




More information about the pkg-java-commits mailing list