[pkg-java] r12923 - in trunk/libgoogle-collections-java/debian: . source

Miguel Landaeta nomadium-guest at alioth.debian.org
Fri Aug 20 00:54:21 UTC 2010


Author: nomadium-guest
Date: 2010-08-20 00:54:17 +0000 (Fri, 20 Aug 2010)
New Revision: 12923

Added:
   trunk/libgoogle-collections-java/debian/source/
   trunk/libgoogle-collections-java/debian/source/format
Modified:
   trunk/libgoogle-collections-java/debian/changelog
   trunk/libgoogle-collections-java/debian/compat
   trunk/libgoogle-collections-java/debian/control
   trunk/libgoogle-collections-java/debian/orig-tar.sh
   trunk/libgoogle-collections-java/debian/pom.xml
   trunk/libgoogle-collections-java/debian/rules
Log:
* New upstream release.
* Add myself to Uploaders.
* Add Build-Depends and Depends on libjsr305-java.
* Bump debhelper compatibility level to 7.
* Bump Standards-Version to 3.9.1. No changes were required.
* Switch source package format to 3.0 (quilt).


Modified: trunk/libgoogle-collections-java/debian/changelog
===================================================================
--- trunk/libgoogle-collections-java/debian/changelog	2010-08-19 07:58:03 UTC (rev 12922)
+++ trunk/libgoogle-collections-java/debian/changelog	2010-08-20 00:54:17 UTC (rev 12923)
@@ -1,14 +1,20 @@
-libgoogle-collections-java (1.0~rc3-1) UNRELEASED; urgency=low
+libgoogle-collections-java (1.0-1) UNRELEASED; urgency=low
 
-  TODO: Needs JSR 305 (http://code.google.com/p/jsr-305/)
-
-  * New upstream version.
+  [ Michael Koch ]
   * Build-Depends on debhelper >= 7.
   * Added myself to Uploaders.
   * Updated Standards-Version to 3.8.3.
 
- -- Michael Koch <konqueror at gmx.de>  Sun, 25 Oct 2009 22:00:25 +0100
+  [ Miguel Landaeta ]
+  * New upstream release.
+  * Add myself to Uploaders.
+  * Add Build-Depends and Depends on libjsr305-java.
+  * Bump debhelper compatibility level to 7.
+  * Bump Standards-Version to 3.9.1. No changes were required.
+  * Switch source package format to 3.0 (quilt).
 
+ -- Miguel Landaeta <miguel at miguel.cc>  Thu, 19 Aug 2010 19:53:52 -0430
+
 libgoogle-collections-java (0~20080808-3) unstable; urgency=low
 
   * Upload to unstable.

Modified: trunk/libgoogle-collections-java/debian/compat
===================================================================
--- trunk/libgoogle-collections-java/debian/compat	2010-08-19 07:58:03 UTC (rev 12922)
+++ trunk/libgoogle-collections-java/debian/compat	2010-08-20 00:54:17 UTC (rev 12923)
@@ -1 +1 @@
-5
+7

Modified: trunk/libgoogle-collections-java/debian/control
===================================================================
--- trunk/libgoogle-collections-java/debian/control	2010-08-19 07:58:03 UTC (rev 12922)
+++ trunk/libgoogle-collections-java/debian/control	2010-08-20 00:54:17 UTC (rev 12923)
@@ -2,17 +2,17 @@
 Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Torsten Werner <twerner at debian.org>, Ludovic Claude <ludovic.claude at laposte.net>, Michael Koch <konqueror at gmx.de>
+Uploaders: Torsten Werner <twerner at debian.org>, Ludovic Claude <ludovic.claude at laposte.net>, Michael Koch <konqueror at gmx.de>, Miguel Landaeta <miguel at miguel.cc>
 Build-Depends: ant, debhelper (>= 7), cdbs (>= 0.4.5.3), default-jdk
-Build-Depends-Indep: maven-repo-helper, maven-ant-helper
-Standards-Version: 3.8.3
+Build-Depends-Indep: maven-repo-helper, maven-ant-helper, libjsr305-java
+Standards-Version: 3.9.1
 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/
 Homepage: http://code.google.com/p/google-collections/
 
 Package: libgoogle-collections-java
 Architecture: all
-Depends: ${misc:Depends}
+Depends: libjsr305-java, ${misc:Depends}
 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:

Modified: trunk/libgoogle-collections-java/debian/orig-tar.sh
===================================================================
--- trunk/libgoogle-collections-java/debian/orig-tar.sh	2010-08-19 07:58:03 UTC (rev 12922)
+++ trunk/libgoogle-collections-java/debian/orig-tar.sh	2010-08-20 00:54:17 UTC (rev 12923)
@@ -1,11 +1,15 @@
 #!/bin/sh
 
 VERSION=$2
-TAR=../libgoogle-collections-java_0~$VERSION.orig.tar.gz
+TAR=../libgoogle-collections-java_$VERSION.orig.tar.gz
 DIR=libgoogle-collections-java-$VERSION
 
-svn export -r{$VERSION} http://google-collections.googlecode.com/svn/trunk/ $DIR
-tar -c -z -f $TAR --exclude '*/javadoc/*' $DIR
+# ugly hack because upstream didn't tag 1.0 release
+# and there is not any tarball at project website
+if [ "$VERSION" == "1.0" ]; then export REV="129"; fi
+
+svn export -r$REV http://google-collections.googlecode.com/svn/trunk/ $DIR
+tar -c -z -f $TAR --exclude '*/javadoc/*' --exclude '*/lib/*' $DIR
 rm -rf $DIR
 
 # New version, uses the zip file downloaded from the project site. 

Modified: trunk/libgoogle-collections-java/debian/pom.xml
===================================================================
--- trunk/libgoogle-collections-java/debian/pom.xml	2010-08-19 07:58:03 UTC (rev 12922)
+++ trunk/libgoogle-collections-java/debian/pom.xml	2010-08-20 00:54:17 UTC (rev 12923)
@@ -9,7 +9,7 @@
   </parent>
   <groupId>com.google.collections</groupId>
   <artifactId>google-collections</artifactId>
-  <version>1.0-rc2</version>
+  <version>1.0</version>
   <packaging>jar</packaging>
   <name>Google Collections Library</name>
   <description>Google Collections Library is a suite of new collections and collection-related goodness for Java 5.0</description>

Modified: trunk/libgoogle-collections-java/debian/rules
===================================================================
--- trunk/libgoogle-collections-java/debian/rules	2010-08-19 07:58:03 UTC (rev 12922)
+++ trunk/libgoogle-collections-java/debian/rules	2010-08-20 00:54:17 UTC (rev 12923)
@@ -2,7 +2,6 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 PACKAGE              := $(DEB_SOURCE_PACKAGE)
 VERSION              := $(DEB_UPSTREAM_VERSION)
@@ -12,6 +11,7 @@
 DEB_ANT_BUILD_TARGET := jar
 DEB_ANT_BUILDFILE    := build.xml
 DEB_ANT_ARGS         := -Dpackage=$(PACKAGE) -DartifactId=$(PACKAGE) -Dversion=$(VERSION)
+DEB_JARS             := jsr305
 
 # to use for version 1.x
 #makebuilddir/$(PACKAGE)-doc::
@@ -28,7 +28,7 @@
 get-orig-source: get-orig-pom
 	# to use for version 1.x
 	#-uscan --download-version $(VERSION) --force-download --rename
-	sh debian/orig-tar.sh X $(SVN_VERSION)
+	sh debian/orig-tar.sh X $(VERSION)
 
 get-orig-pom:
 	wget -O debian/pom.xml http://repository.sonatype.org/service/local/repositories/central/content/com/google/collections/google-collections/$(UPSTREAM_VERSION)/google-collections-$(UPSTREAM_VERSION).pom

Added: trunk/libgoogle-collections-java/debian/source/format
===================================================================
--- trunk/libgoogle-collections-java/debian/source/format	                        (rev 0)
+++ trunk/libgoogle-collections-java/debian/source/format	2010-08-20 00:54:17 UTC (rev 12923)
@@ -0,0 +1 @@
+3.0 (quilt)




More information about the pkg-java-commits mailing list