Author: ludovicc-guest Date: 2009-07-02 13:25:33 +0000 (Thu, 02 Jul 2009) New Revision: 8780
Added: trunk/libgoogle-collections-java/debian/libgoogle-collections-java.poms trunk/libgoogle-collections-java/debian/pom.xml Modified: trunk/libgoogle-collections-java/debian/control trunk/libgoogle-collections-java/debian/orig-tar.sh trunk/libgoogle-collections-java/debian/rules Log: * New version Modified: trunk/libgoogle-collections-java/debian/control =================================================================== --- trunk/libgoogle-collections-java/debian/control 2009-07-02 13:21:37 UTC (rev 8779) +++ trunk/libgoogle-collections-java/debian/control 2009-07-02 13:25:33 UTC (rev 8780) @@ -1,16 +1,18 @@ Source: libgoogle-collections-java -Section: libs +Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Torsten Werner <[email protected]> +Uploaders: Torsten Werner <[email protected]>, Ludovic Claude <[email protected]> Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3), default-jdk -Standards-Version: 3.8.0 +Build-Depends-Indep: maven-repo-helper, maven-ant-helper +Standards-Version: 3.8.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} 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: @@ -37,3 +39,4 @@ * Forwarding collections * Constrained collections * Implementation helpers like AbstractIterator + Added: trunk/libgoogle-collections-java/debian/libgoogle-collections-java.poms =================================================================== --- trunk/libgoogle-collections-java/debian/libgoogle-collections-java.poms (rev 0) +++ trunk/libgoogle-collections-java/debian/libgoogle-collections-java.poms 2009-07-02 13:25:33 UTC (rev 8780) @@ -0,0 +1 @@ +debian/pom.xml --no-parent Modified: trunk/libgoogle-collections-java/debian/orig-tar.sh =================================================================== --- trunk/libgoogle-collections-java/debian/orig-tar.sh 2009-07-02 13:21:37 UTC (rev 8779) +++ trunk/libgoogle-collections-java/debian/orig-tar.sh 2009-07-02 13:25:33 UTC (rev 8780) @@ -1,12 +1,31 @@ #!/bin/sh -TAR=../libgoogle-collections-java_0~$1.orig.tar.gz -DIR=google-collections-$1 +VERSION=$2 +TAR=../libgoogle-collections-java_0~$VERSION.orig.tar.gz +DIR=libgoogle-collections-java-$VERSION -svn export -r{$1} http://google-collections.googlecode.com/svn/trunk/ $DIR +svn export -r{$VERSION} http://google-collections.googlecode.com/svn/trunk/ $DIR tar -c -z -f $TAR --exclude '*/javadoc/*' $DIR rm -rf $DIR +# New version, uses the zip file downloaded from the project site. +# To use for version 1.x onwards + +#TAG=$(echo "$VERSION" | sed 's,~\(alpha\|beta\),-\1-,' | sed 's/~rc/-rc/') +# +#wget http://google-collections.googlecode.com/files/google-collect-$TAG.zip google-collect-$TAG.zip +#unzip google-collect-$TAG.zip -d tmp +#mkdir -p $DIR +#mv tmp/google-collect-$TAG/javadoc $DIR +#mkdir -p $DIR/src/main/java +#unzip tmp/google-collect-$TAG/src-$TAG.zip -d $DIR/src/main/java +#mkdir -p $DIR/src/main/resources/ +#mv $DIR/src/main/java/META-INF $DIR/src/main/resources/ +#rm -rf *.zip +#rm -rf tmp +#tar -c -z -f $TAR $DIR/ +#rm -rf $DIR + # move to directory 'tarballs' if [ -r .svn/deb-layout ]; then . .svn/deb-layout Property changes on: trunk/libgoogle-collections-java/debian/orig-tar.sh ___________________________________________________________________ Modified: svn:executable - + * Added: trunk/libgoogle-collections-java/debian/pom.xml =================================================================== --- trunk/libgoogle-collections-java/debian/pom.xml (rev 0) +++ trunk/libgoogle-collections-java/debian/pom.xml 2009-07-02 13:25:33 UTC (rev 8780) @@ -0,0 +1,62 @@ +<?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> + <!-- remove the reference to the parent until the google repo is synced with central --> + <!-- <parent> + <groupId>com.google</groupId> + <artifactId>google</artifactId> + <version>1</version> + </parent> --> + <groupId>com.google.collections</groupId> + <artifactId>google-collections</artifactId> + <version>0.8</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> + <inceptionYear>2007</inceptionYear> + <url>http://code.google.com/p/google-collections/</url> + <organization> + <name>Google</name> + <url>http://www.google.com</url> + </organization> + <licenses> + <license> + <name>The Apache Software License, Version 2.0</name> + <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> + <distribution>repo</distribution> + </license> + </licenses> + <scm> + <url>http://code.google.com/p/google-collections/source/browse/</url> + <connection>scm:svn:http://google-collections.googlecode.com/svn/trunk/</connection> + </scm> + <!-- this is temporarily copied from the parent pom. remove this section when that is used --> + <distributionManagement> + <repository> + <id>google-maven-repository</id> + <name>Google Maven Repository</name> + <url>dav:https://google-maven-repository.googlecode.com/svn/repository/</url> + </repository> + <snapshotRepository> + <id>google-maven-snapshot-repository</id> + <name>Google Maven Snapshot Repository</name> + <url>dav:https://google-maven-repository.googlecode.com/svn/snapshot-repository/</url> + <uniqueVersion>true</uniqueVersion> + </snapshotRepository> + </distributionManagement> + <dependencies> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + </build> +</project> Modified: trunk/libgoogle-collections-java/debian/rules =================================================================== --- trunk/libgoogle-collections-java/debian/rules 2009-07-02 13:21:37 UTC (rev 8779) +++ trunk/libgoogle-collections-java/debian/rules 2009-07-02 13:25:33 UTC (rev 8780) @@ -4,14 +4,32 @@ include /usr/share/cdbs/1/class/ant.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -PACKAGE := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ') -VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | sed "s,Version: 0~\(.*\)-.*,\1,g") +PACKAGE := $(DEB_SOURCE_PACKAGE) +VERSION := $(DEB_UPSTREAM_VERSION) +UPSTREAM_VERSION := $(shell echo ${VERSION} | sed 's,~\(alpha\|beta\),-\1-,' | sed 's/~rc/-rc/' | sed 's/0~20080808/0.8/') +SVN_VERSION := $(shell echo ${VERSION} | sed 's,0~\(.*\),\1,g') JAVA_HOME := /usr/lib/jvm/default-java -DEB_ANT_BUILD_TARGET := jar -Dversion=$(VERSION) +DEB_ANT_BUILD_TARGET := jar +DEB_ANT_BUILDFILE := build.xml +DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -DartifactId=$(PACKAGE) -Dversion=$(VERSION) -get-orig-source: - sh debian/orig-tar.sh $(VERSION) +# to use for version 1.x +#makebuilddir/$(PACKAGE)-doc:: +# install -d build/docs/api +# cp -r javadoc/* build/docs/api/ 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 + mh_installpoms -p$(PACKAGE) + mh_installjar -p$(PACKAGE) -l debian/pom.xml build/dist/google-collect-$(VERSION)/google-collect-$(VERSION).jar + +clean:: + -rm -rf debian/tmp + +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) + +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 + Property changes on: trunk/libgoogle-collections-java/debian/rules ___________________________________________________________________ Modified: svn:executable - + * _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
