This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository trove3.
commit e6ed5ddd32b3bd4b34940f8e4a682eaa2e9c5728 Author: Erich Schubert <[email protected]> Date: Sat Jun 2 15:24:58 2012 +0000 Update to Trove 3. --- debian/changelog | 14 ++++++ debian/control | 18 ++++---- debian/copyright | 13 ++++-- ...va-doc.doc-base => libtrove3-java-doc.doc-base} | 8 ++-- debian/orig-tar.sh | 5 +- debian/patches/01_build_target_5_0.patch | 54 +++++++++++----------- debian/rules | 15 +++--- 7 files changed, 72 insertions(+), 55 deletions(-) diff --git a/debian/changelog b/debian/changelog index e451908..c8d8142 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +trove3 (3.0.2-1) unstable; urgency=low + + * New upstream major version. + + * Rename package to trove3, to allow parallel installation + of API versions 2 and 3 (which is intended by upstream). + * License is LGPL 2.1 now, refresh copyright statements + * Slightly updated orig-tar.sh file for version 3. + * Set -Dversion.number during build. + * Make lintian happier: do not depend on a JDK + * Update policy version, no changes. + + -- Erich Schubert <[email protected]> Thu, 03 May 2012 07:22:41 +0200 + trove (2.1.0-2) unstable; urgency=low [ Thierry Carrez ] diff --git a/debian/control b/debian/control index 7bc1863..c2fe2e3 100644 --- a/debian/control +++ b/debian/control @@ -1,17 +1,17 @@ -Source: trove +Source: trove3 Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Torsten Werner <[email protected]>, Michael Koch <[email protected]> +Uploaders: Erich Schubert <[email protected]>, Torsten Werner <[email protected]>, Michael Koch <[email protected]> Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant -Standards-Version: 3.8.4 +Standards-Version: 3.9.3 Homepage: http://trove4j.sourceforge.net -Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/trove -Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/trove/ +Vcs-Svn: svn+ssh://svn.debian.org/svn/pkg-java/trunk/trove3 +Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/trove3/ -Package: libtrove-java +Package: libtrove3-java Architecture: all -Depends: default-jre-headless | java5-runtime-headless, ${misc:Depends} +Depends: ${misc:Depends} Description: high performance collections for java GNU Trove is a fast, lightweight implementations of the java.util Collections API. These implementations are designed to be pluggable @@ -24,11 +24,11 @@ Description: high performance collections for java which store primitives directly will require less space and yield significant performance gains. -Package: libtrove-java-doc +Package: libtrove3-java-doc Section: doc Architecture: all Depends: ${misc:Depends} -Suggests: libtrove-java +Suggests: libtrove3-java Description: high performance collections for java GNU Trove is a fast, lightweight implementations of the java.util Collections API. These implementations are designed to be pluggable diff --git a/debian/copyright b/debian/copyright index 7ce6548..2cf6e40 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,19 +1,22 @@ This package was debianized by Arnaud Vandyck <[email protected]> on 12-April-2007. +It was updated to Trove 3 by Erich Schubert <[email protected]> on +02-June-2012. The source code was downloaded from http://trove4j.sourceforge.net/ Authors: - Eric Friedman <[email protected]> - Gann Bierner <[email protected]> Rob Eden <[email protected]> + Johan Parent <[email protected]> + Jeff Randall <[email protected]> + Eric D. Friedman <[email protected]> -Copyright: (c) 2001-2006, Eric D. Friedman All Rights Reserved. +Copyright: (c) 2009-2010, Rob Eden All Rights Reserved. License: This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. + version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -25,7 +28,7 @@ License: Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301 USA On Debian systems, you can find the LGPL license in: -/usr/share/common-licenses/LGPL +/usr/share/common-licenses/LGPL-2.1 The PrimeFinder and HashFunctions classes in Trove are subject to the diff --git a/debian/libtrove-java-doc.doc-base b/debian/libtrove3-java-doc.doc-base similarity index 51% rename from debian/libtrove-java-doc.doc-base rename to debian/libtrove3-java-doc.doc-base index 39323c4..6f1776e 100644 --- a/debian/libtrove-java-doc.doc-base +++ b/debian/libtrove3-java-doc.doc-base @@ -1,10 +1,10 @@ -Document: libtrove-java-doc +Document: libtrove3-java-doc Title: Programmer API for trove (high performance collections for java) -Author: Eric Friedman, Gann Bierner, Rob Eden +Author: Rob Eden, Johan Parent, Jeff Randall, Eric Friedman Abstract: This is the programmer API of trove, a library for high performance collections for java Section: Programming Format: HTML -Index: /usr/share/doc/libtrove-java-doc/api/index.html -Files: /usr/share/doc/libtrove-java-doc/api/*.html +Index: /usr/share/doc/libtrove3-java-doc/api/index.html +Files: /usr/share/doc/libtrove3-java-doc/api/*.html diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index 218a6dd..482112c 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -6,8 +6,9 @@ TAR=$3 # clean up the upstream tarball tar -x -z -f $TAR -tar -c -z -f $TAR --exclude '*.jar' --exclude '*/javadocs/*' trove-*/ -rm -rf trove-*/ +mv $2/ trove-$2/ +tar -c -z -f $TAR --exclude '*.jar' --exclude '*/javadocs/*' trove-$2/ +rm -rf trove-$2/ # move to directory 'tarballs' if [ -r .svn/deb-layout ]; then diff --git a/debian/patches/01_build_target_5_0.patch b/debian/patches/01_build_target_5_0.patch index de3b785..9b65996 100644 --- a/debian/patches/01_build_target_5_0.patch +++ b/debian/patches/01_build_target_5_0.patch @@ -1,29 +1,27 @@ -Index: trove-2.1.0/build.xml -=================================================================== ---- trove-2.1.0.orig/build.xml 2009-08-14 22:51:22.000000000 +0200 -+++ trove-2.1.0/build.xml 2010-05-05 07:38:51.000000000 +0200 -@@ -80,7 +80,7 @@ - <target name="compile" depends="generate"> - <javac destdir="${output.dest}" - classpath="${lib}/junit.jar" -- debug="${debug}" target="1.5"> -+ debug="${debug}" source="1.5" target="1.5"> - <src path="${src}"/> - <src path="${output.generated}"/> - </javac> -@@ -207,7 +207,7 @@ - - <echo message="output.dest = ${output.dest}"/> - -- <javac destdir="${output.tests}" debug="${debug}" target="1.5"> -+ <javac destdir="${output.tests}" debug="${debug}" source="1.5" target="1.5"> - <src path="${test_src}"/> - <classpath> - <pathelement location="${lib}/junit.jar"/> -@@ -275,4 +275,4 @@ - - <echo message="----------- ${Name} ${version} [${year}] ------------"/> - </target> +--- trove3-3.0.2.orig/build.xml 2012-05-03 06:57:06.000000000 +0200 ++++ trove3-3.0.2/build.xml 2012-05-03 06:59:01.000000000 +0200 +@@ -109,7 +109,7 @@ + <target name="compile" depends="generate"> + <javac destdir="${output.dest}" + classpath="${lib}/junit.jar" +- debug="${debug}" target="1.5"> ++ debug="${debug}" source="1.5" target="1.5"> + + <src path="${src}"/> + <src path="${output.generated}"/> +@@ -348,7 +348,7 @@ + <!-- =================================================================== --> + + <target name="-build_tests" depends="-init"> +- <javac destdir="${output.tests}" debug="${debug}" target="1.5"> ++ <javac destdir="${output.tests}" debug="${debug}" source="1.5" target="1.5"> + <src path="${test_src}"/> + <exclude name="gnu/trove/benchmark/colt/**"/> + <exclude name="gnu/trove/benchmark/trove2/**"/> +@@ -442,4 +442,4 @@ + <format property="fullVersion" pattern="'build time' yyMMddHHmmss"/> + </tstamp> + </target> -</project> -\ No newline at end of file -+</project> +\ Kein Zeilenumbruch am Dateiende. ++</project> diff --git a/debian/rules b/debian/rules index b422a24..df9ca9b 100755 --- a/debian/rules +++ b/debian/rules @@ -6,20 +6,21 @@ include /usr/share/cdbs/1/class/ant.mk JAVA_HOME := /usr/lib/jvm/default-java DEB_ANT_BUILD_TARGET := jar javadoc +ANT_ARGS := -Dversion.number=$(DEB_UPSTREAM_VERSION) cleanbuilddir:: $(RM) -r output -binary-post-install/libtrove-java:: - dh_install -plibtrove-java \ +binary-post-install/libtrove3-java:: + dh_install -plibtrove3-java \ output/lib/trove-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/ - dh_link -plibtrove-java \ + dh_link -plibtrove3-java \ /usr/share/java/trove-$(DEB_UPSTREAM_VERSION).jar \ - /usr/share/java/trove.jar + /usr/share/java/trove-3.jar -binary-post-install/libtrove-java-doc:: - dh_install -plibtrove-java-doc \ - output/javadocs/* /usr/share/doc/libtrove-java-doc/api +binary-post-install/libtrove3-java-doc:: + dh_install -plibtrove3-java-doc \ + output/javadocs/* /usr/share/doc/libtrove3-java-doc/api get-orig-source: uscan --upstream-version 0 --rename -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/trove3.git _______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
