Author: twerner Date: 2010-12-31 00:17:19 +0000 (Fri, 31 Dec 2010) New Revision: 13191
Added: trunk/libjoda-time-java/debian/README.source trunk/libjoda-time-java/debian/libjoda-time-java-doc.doc-base.api trunk/libjoda-time-java/debian/libjoda-time-java-doc.install trunk/libjoda-time-java/debian/libjoda-time-java.poms trunk/libjoda-time-java/debian/maven.cleanIgnoreRules trunk/libjoda-time-java/debian/maven.ignoreRules trunk/libjoda-time-java/debian/maven.properties trunk/libjoda-time-java/debian/maven.publishedRules trunk/libjoda-time-java/debian/maven.rules Removed: trunk/libjoda-time-java/debian/ant.properties trunk/libjoda-time-java/debian/install Modified: trunk/libjoda-time-java/debian/changelog trunk/libjoda-time-java/debian/compat trunk/libjoda-time-java/debian/control trunk/libjoda-time-java/debian/copyright trunk/libjoda-time-java/debian/orig-tar.sh trunk/libjoda-time-java/debian/rules trunk/libjoda-time-java/debian/watch Log: * New upstream version * Mavenize the build process with the help of mh_make. * Build and run unit tests but ignore test failures and errors. * Create orig tarball from upstream's SVN tag. * Build a new Javadoc package. * Convert copyright file to dep5 format. * Update Standards-Version: 3.9.1. Added: trunk/libjoda-time-java/debian/README.source =================================================================== --- trunk/libjoda-time-java/debian/README.source (rev 0) +++ trunk/libjoda-time-java/debian/README.source 2010-12-31 00:17:19 UTC (rev 13191) @@ -0,0 +1,9 @@ +Information about libjoda-time-java +------------------------------ + +This package was debianized using the mh_make command +from the maven-debian-helper package. + +The build system uses Maven but prevents it from downloading +anything from the Internet, making the build compliant with +the Debian policy. Deleted: trunk/libjoda-time-java/debian/ant.properties =================================================================== --- trunk/libjoda-time-java/debian/ant.properties 2010-12-22 19:40:10 UTC (rev 13190) +++ trunk/libjoda-time-java/debian/ant.properties 2010-12-31 00:17:19 UTC (rev 13191) @@ -1 +0,0 @@ -junit.jar=/usr/share/java/junit.jar Modified: trunk/libjoda-time-java/debian/changelog =================================================================== --- trunk/libjoda-time-java/debian/changelog 2010-12-22 19:40:10 UTC (rev 13190) +++ trunk/libjoda-time-java/debian/changelog 2010-12-31 00:17:19 UTC (rev 13191) @@ -1,3 +1,15 @@ +libjoda-time-java (1.6.2-1) experimental; urgency=low + + * New upstream version + * Mavenize the build process with the help of mh_make. + * Build and run unit tests but ignore test failures and errors. + * Create orig tarball from upstream's SVN tag. + * Build a new Javadoc package. + * Convert copyright file to dep5 format. + * Update Standards-Version: 3.9.1. + + -- Torsten Werner <[email protected]> Fri, 31 Dec 2010 00:50:53 +0100 + libjoda-time-java (1.6-3) unstable; urgency=low * Merge changes from Ubuntu version 1.6-2ubuntu1. Modified: trunk/libjoda-time-java/debian/compat =================================================================== --- trunk/libjoda-time-java/debian/compat 2010-12-22 19:40:10 UTC (rev 13190) +++ trunk/libjoda-time-java/debian/compat 2010-12-31 00:17:19 UTC (rev 13191) @@ -1 +1 @@ -5 +7 Modified: trunk/libjoda-time-java/debian/control =================================================================== --- trunk/libjoda-time-java/debian/control 2010-12-22 19:40:10 UTC (rev 13190) +++ trunk/libjoda-time-java/debian/control 2010-12-31 00:17:19 UTC (rev 13191) @@ -3,16 +3,18 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Torsten Werner <[email protected]>, Varun Hiremath <[email protected]> -Build-Depends: cdbs, debhelper (>= 5) -Build-Depends-Indep: default-jdk, ant, junit -Standards-Version: 3.8.4 -Homepage: http://joda-time.sourceforge.net +Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4) +Build-Depends-Indep: libmaven-antrun-plugin-java, libmaven-javadoc-plugin-java, junit, default-jdk-doc +Standards-Version: 3.9.1 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjoda-time-java -Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjoda-time-java/ +Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjoda-time-java +Homepage: http://joda-time.sourceforge.net Package: libjoda-time-java Architecture: all -Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless +Depends: ${misc:Depends}, ${maven:Depends} +Recommends: ${maven:OptionalDepends} +Suggests: libjoda-time-java-doc Description: Java date and time API Joda-Time provides a quality replacement for the Java date and time classes. The design allows for multiple calendar systems, while still @@ -21,3 +23,18 @@ and Islamic systems are also included, and we welcome further additions. Supporting classes include time zone, duration, format and parsing. + +Package: libjoda-time-java-doc +Architecture: all +Section: doc +Depends: ${misc:Depends}, ${maven:DocDepends} +Recommends: ${maven:DocOptionalDepends} +Suggests: libjoda-time-java +Description: Java date and time API (developer documentation) + Joda-Time provides a quality replacement for the Java date and time + classes. The design allows for multiple calendar systems, while still + providing a simple API. The 'default' calendar is the ISO8601 standard + which is used by XML. The Gregorian, Julian, Buddhist, Coptic, Ethiopic + and Islamic systems are also included, and we welcome further + additions. Supporting classes include time zone, duration, format and + parsing. Modified: trunk/libjoda-time-java/debian/copyright =================================================================== --- trunk/libjoda-time-java/debian/copyright 2010-12-22 19:40:10 UTC (rev 13190) +++ trunk/libjoda-time-java/debian/copyright 2010-12-31 00:17:19 UTC (rev 13191) @@ -1,23 +1,33 @@ -This package was debianized by Torsten Werner <[email protected]> on -Fri, 23 Nov 2007 23:17:55 +0100. +Format-Specification: http://dep.debian.net/deps/dep5/ +Name: Joda time +Maintainer: Stephen Colebourne <> as Lead developer + Brian S O'Neill <> as Senior Developer + Guy Allard as + Fredrik Borgh as + Jeroen van Erp as + Gwyn Evans as + Sean Geoghegan as + Ashish Katyal as + Antonio Leitao as + Kostas Maistrelis as + Al Major as + Blair Martin as + Julen Parra as + Mike Schrag as + Kandarp Shah as + Francois Staes as + Maxim Zhao as + Ryan Propper as +Source: http://joda-time.sourceforge.net -It was downloaded from http://joda-time.sourceforge.net +Files: * +Copyright: 2002-2010, Joda.org +License: Apache-2.0 -Copyright: (C) 2002-2007, Joda.org +Files: debian/* +Copyright: 2010, Torsten Werner <Torsten Werner <[email protected]>> +License: Apache-2.0 -License: - - 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 licenses can be found in -`/usr/share/common-licenses/Apache-2.0'. +License: Apache-2.0 + On Debian GNU/Linux system you can find the complete text of the + Apache-2.0 license in '/usr/share/common-licenses/Apache-2.0' Deleted: trunk/libjoda-time-java/debian/install =================================================================== --- trunk/libjoda-time-java/debian/install 2010-12-22 19:40:10 UTC (rev 13190) +++ trunk/libjoda-time-java/debian/install 2010-12-31 00:17:19 UTC (rev 13191) @@ -1 +0,0 @@ -build/*.jar /usr/share/java/ Added: trunk/libjoda-time-java/debian/libjoda-time-java-doc.doc-base.api =================================================================== --- trunk/libjoda-time-java/debian/libjoda-time-java-doc.doc-base.api (rev 0) +++ trunk/libjoda-time-java/debian/libjoda-time-java-doc.doc-base.api 2010-12-31 00:17:19 UTC (rev 13191) @@ -0,0 +1,10 @@ +Document: libjoda-time-java +Title: API Javadoc for Joda time +Author: Joda.org developers +Abstract: This is the API Javadoc provided for the + libjoda-time-java library. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libjoda-time-java/api/index.html +Files: /usr/share/doc/libjoda-time-java/api/* Added: trunk/libjoda-time-java/debian/libjoda-time-java-doc.install =================================================================== --- trunk/libjoda-time-java/debian/libjoda-time-java-doc.install (rev 0) +++ trunk/libjoda-time-java/debian/libjoda-time-java-doc.install 2010-12-31 00:17:19 UTC (rev 13191) @@ -0,0 +1,2 @@ +target/apidocs/* usr/share/doc/libjoda-time-java/api + Added: trunk/libjoda-time-java/debian/libjoda-time-java.poms =================================================================== --- trunk/libjoda-time-java/debian/libjoda-time-java.poms (rev 0) +++ trunk/libjoda-time-java/debian/libjoda-time-java.poms 2010-12-31 00:17:19 UTC (rev 13191) @@ -0,0 +1,26 @@ +# List of POM files for the package +# Format of this file is: +# <path to pom file> [option]* +# where option can be: +# --ignore: ignore this POM or +# --no-parent: remove the <parent> tag from the POM +# --package=<package>: an alternative package to use when installing this POM +# and its artifact +# --has-package-version: to indicate that the original version of the POM is the same as the upstream part +# of the version for the package. +# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM +# during a clean operation with mh_cleanpom or mh_installpom +# --artifact=<path>: path to the build artifact associated with this POM, +# it will be installed when using the command mh_install +# --java-lib: install the jar into /usr/share/java to comply with Debian +# packaging guidelines +# --usj-name=<name>: name to use when installing the library in /usr/share/java +# --usj-version=<version>: version to use when installing the library in /usr/share/java +# --no-usj-versionless: don't install the versionless link in /usr/share/java +# --dest-jar=<path>: the destination for the real jar +# it will be installed with mh_install. +# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default. +# --ignore-pom: don't install the POM with mh_install or mh_installpoms. To use with POM files that are created +# temporarily for certain artifacts such as Javadoc jars. +# +pom.xml --has-package-version Added: trunk/libjoda-time-java/debian/maven.cleanIgnoreRules =================================================================== --- trunk/libjoda-time-java/debian/maven.cleanIgnoreRules (rev 0) +++ trunk/libjoda-time-java/debian/maven.cleanIgnoreRules 2010-12-31 00:17:19 UTC (rev 13191) @@ -0,0 +1,17 @@ +# Maven clean ignore rules - ignore some Maven dependencies and plugins +# during the clean phase of a Maven build +# Format of this file is: +# [group] [artifact] [type] [version] [classifier] [scope] +# where each element can be either +# - the exact string, for example org.apache for the group, or 3.1 +# for the version. In this case, the element is simply matched +# and left as it is +# - * (the star character, alone). In this case, anything will +# match and be left as it is. For example, using * on the +# position of the artifact field will match any artifact id +# All elements much match before a rule can be applied +# Example rule: match jar with groupid= junit, artifactid= junit +# and version starting with 3., this dependency is then removed +# from the POM before mvn clean is called +# junit junit jar s/3\\..*/3.x/ + Added: trunk/libjoda-time-java/debian/maven.ignoreRules =================================================================== --- trunk/libjoda-time-java/debian/maven.ignoreRules (rev 0) +++ trunk/libjoda-time-java/debian/maven.ignoreRules 2010-12-31 00:17:19 UTC (rev 13191) @@ -0,0 +1,23 @@ +# Maven ignore rules - ignore some Maven dependencies and plugins +# Format of this file is: +# [group] [artifact] [type] [version] [classifier] [scope] +# where each element can be either +# - the exact string, for example org.apache for the group, or 3.1 +# for the version. In this case, the element is simply matched +# and left as it is +# - * (the star character, alone). In this case, anything will +# match and be left as it is. For example, using * on the +# position of the artifact field will match any artifact id +# All elements much match before a rule can be applied +# Example rule: match jar with groupid= junit, artifactid= junit +# and version starting with 3., this dependency is then removed +# from the POM +# junit junit jar s/3\\..*/3.x/ + +org.apache.maven.plugins maven-assembly-plugin * * * * +org.apache.maven.plugins maven-checkstyle-plugin * * * * +org.apache.maven.plugins maven-jxr-plugin * * * * +org.apache.maven.plugins maven-project-info-reports-plugin * * * * +org.apache.maven.plugins maven-repository-plugin * * * * +org.apache.maven.plugins maven-source-plugin * * * * +org.apache.maven.plugins maven-toolchains-plugin * * * * Added: trunk/libjoda-time-java/debian/maven.properties =================================================================== --- trunk/libjoda-time-java/debian/maven.properties (rev 0) +++ trunk/libjoda-time-java/debian/maven.properties 2010-12-31 00:17:19 UTC (rev 13191) @@ -0,0 +1,6 @@ +# Include here properties to pass to Maven during the build. +# For example: +# maven.test.skip=true + +maven.test.error.ignore=true +maven.test.failure.ignore=true Added: trunk/libjoda-time-java/debian/maven.publishedRules =================================================================== --- trunk/libjoda-time-java/debian/maven.publishedRules (rev 0) +++ trunk/libjoda-time-java/debian/maven.publishedRules 2010-12-31 00:17:19 UTC (rev 13191) @@ -0,0 +1,19 @@ +# Maven published rules - additional rules to publish, to help +# the packaging work of Debian maintainers using mh_make +# Format of this file is: +# [group] [artifact] [type] [version] [classifier] [scope] +# where each element can be either +# - the exact string, for example org.apache for the group, or 3.1 +# for the version. In this case, the element is simply matched +# and left as it is +# - * (the star character, alone). In this case, anything will +# match and be left as it is. For example, using * on the +# position of the artifact field will match any artifact id +# - a regular expression of the form s/match/replace/ +# in this case, elements that match are transformed using +# the regex rule. +# All elements much match before a rule can be applied +# Example rule: match jar with groupid= junit, artifactid= junit +# and version starting with 3., replacing the version with 3.x +# junit junit jar s/3\\..*/3.x/ + Added: trunk/libjoda-time-java/debian/maven.rules =================================================================== --- trunk/libjoda-time-java/debian/maven.rules (rev 0) +++ trunk/libjoda-time-java/debian/maven.rules 2010-12-31 00:17:19 UTC (rev 13191) @@ -0,0 +1,20 @@ +# Maven rules - transform Maven dependencies and plugins +# Format of this file is: +# [group] [artifact] [type] [version] [classifier] [scope] +# where each element can be either +# - the exact string, for example org.apache for the group, or 3.1 +# for the version. In this case, the element is simply matched +# and left as it is +# - * (the star character, alone). In this case, anything will +# match and be left as it is. For example, using * on the +# position of the artifact field will match any artifact id +# - a regular expression of the form s/match/replace/ +# in this case, elements that match are transformed using +# the regex rule. +# All elements much match before a rule can be applied +# Example rule: match jar with groupid= junit, artifactid= junit +# and version starting with 3., replacing the version with 3.x +# junit junit jar s/3\\..*/3.x/ + +joda-time joda-time jar s/.*/debian/ * * +junit junit jar s/3\..*/3.x/ * * Modified: trunk/libjoda-time-java/debian/orig-tar.sh =================================================================== --- trunk/libjoda-time-java/debian/orig-tar.sh 2010-12-22 19:40:10 UTC (rev 13190) +++ trunk/libjoda-time-java/debian/orig-tar.sh 2010-12-31 00:17:19 UTC (rev 13191) @@ -1,17 +1,16 @@ #!/bin/sh -e -# called by uscan with '--upstream-version' <version> <file> -TAR=$3 -DIR=joda-time-$2-src +VERSION=$2 +TAR=../libjoda-time-java_$VERSION.orig.tar.gz +DIR=libjoda-time-java-$VERSION +TAG=$(echo "v${VERSION}00" | sed -e's,\.,_,g') -# clean up the upstream tarball -tar -x -z -f $TAR -tar -c -z -f $TAR --exclude '*.jar' $DIR -rm -rf $DIR +svn export http://joda-time.svn.sourceforge.net/svnroot/joda-time/tags/${TAG} $DIR +GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.class' $DIR +rm -rf $DIR ../$TAG # move to directory 'tarballs' if [ -r .svn/deb-layout ]; then . .svn/deb-layout - mv $TAR $origDir - echo "moved $TAR to $origDir" + mv $TAR $origDir && echo "moved $TAR to $origDir" fi Modified: trunk/libjoda-time-java/debian/rules =================================================================== --- trunk/libjoda-time-java/debian/rules 2010-12-22 19:40:10 UTC (rev 13190) +++ trunk/libjoda-time-java/debian/rules 2010-12-31 00:17:19 UTC (rev 13191) @@ -1,20 +1,9 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/class/ant.mk include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/maven.mk -JAVA_HOME := /usr/lib/jvm/default-java -DEB_ANT_BUILD_TARGET := jar -DEB_JARS := junit +JAVA_HOME := /usr/lib/jvm/default-java -# update timezone data -makebuilddir/libjoda-time-java:: - if [ -d debian/tzdata ]; then \ - cp debian/tzdata/* src/java/org/joda/time/tz/src/; \ - fi - -install/libjoda-time-java:: - dh_link /usr/share/java/joda-time-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/joda-time.jar - get-orig-source: - -uscan --upstream-version 0 --rename + uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename Modified: trunk/libjoda-time-java/debian/watch =================================================================== --- trunk/libjoda-time-java/debian/watch 2010-12-22 19:40:10 UTC (rev 13190) +++ trunk/libjoda-time-java/debian/watch 2010-12-31 00:17:19 UTC (rev 13191) @@ -1,2 +1,4 @@ version=3 -http://sf.net/joda-time/ joda-time-(\d.*)-src\.tar\.gz debian debian/orig-tar.sh +opts="uversionmangle=s/(\d)_(\d)_(\d)\d\d/$1.$2.$3/" \ + http://joda-time.svn.sourceforge.net/svnroot/joda-time/tags/ \ + v(.*)/ debian debian/orig-tar.sh _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
