Author: twerner Date: 2011-08-18 14:55:01 +0000 (Thu, 18 Aug 2011) New Revision: 14289
Added: trunk/maven-archiver/debian/README.source trunk/maven-archiver/debian/TODO trunk/maven-archiver/debian/libmaven-archiver-java-doc.doc-base.api trunk/maven-archiver/debian/libmaven-archiver-java-doc.install trunk/maven-archiver/debian/maven.cleanIgnoreRules trunk/maven-archiver/debian/maven.ignoreRules trunk/maven-archiver/debian/maven.properties trunk/maven-archiver/debian/maven.publishedRules trunk/maven-archiver/debian/source/ trunk/maven-archiver/debian/source/format Removed: trunk/maven-archiver/debian/build.properties Modified: trunk/maven-archiver/debian/changelog trunk/maven-archiver/debian/compat trunk/maven-archiver/debian/control trunk/maven-archiver/debian/copyright trunk/maven-archiver/debian/libmaven-archiver-java.poms trunk/maven-archiver/debian/maven.rules trunk/maven-archiver/debian/orig-tar.sh trunk/maven-archiver/debian/rules trunk/maven-archiver/debian/watch Log: UNRELEASED * Use Maven to build the package. But keep the tests disabled because they FTBFS. * Switch to source format 3.0. * Switch to debhelper 7. * Update Standards-Version: 3.9.1. * Add documentation package. * Convert debian/copyright to dep5 format. Added: trunk/maven-archiver/debian/README.source =================================================================== --- trunk/maven-archiver/debian/README.source (rev 0) +++ trunk/maven-archiver/debian/README.source 2011-08-18 14:55:01 UTC (rev 14289) @@ -0,0 +1,9 @@ +Information about maven-archiver +------------------------------ + +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. Added: trunk/maven-archiver/debian/TODO =================================================================== --- trunk/maven-archiver/debian/TODO (rev 0) +++ trunk/maven-archiver/debian/TODO 2011-08-18 14:55:01 UTC (rev 14289) @@ -0,0 +1 @@ +fix compile error for test code Deleted: trunk/maven-archiver/debian/build.properties =================================================================== --- trunk/maven-archiver/debian/build.properties 2011-08-18 13:25:07 UTC (rev 14288) +++ trunk/maven-archiver/debian/build.properties 2011-08-18 14:55:01 UTC (rev 14289) @@ -1,3 +0,0 @@ -javadoc.dir=target/api -build.directory=target -maven.test.skip=true Modified: trunk/maven-archiver/debian/changelog =================================================================== --- trunk/maven-archiver/debian/changelog 2011-08-18 13:25:07 UTC (rev 14288) +++ trunk/maven-archiver/debian/changelog 2011-08-18 14:55:01 UTC (rev 14289) @@ -1,3 +1,16 @@ +maven-archiver (2.4-3) unstable; urgency=low + + UNRELEASED + * Use Maven to build the package. But keep the tests disabled because they + FTBFS. + * Switch to source format 3.0. + * Switch to debhelper 7. + * Update Standards-Version: 3.9.1. + * Add documentation package. + * Convert debian/copyright to dep5 format. + + -- Torsten Werner <twer...@debian.org> Thu, 18 Aug 2011 16:52:10 +0200 + maven-archiver (2.4-2) unstable; urgency=low * Upload to unstable. Modified: trunk/maven-archiver/debian/compat =================================================================== --- trunk/maven-archiver/debian/compat 2011-08-18 13:25:07 UTC (rev 14288) +++ trunk/maven-archiver/debian/compat 2011-08-18 14:55:01 UTC (rev 14289) @@ -1 +1 @@ -5 +7 Modified: trunk/maven-archiver/debian/control =================================================================== --- trunk/maven-archiver/debian/control 2011-08-18 13:25:07 UTC (rev 14288) +++ trunk/maven-archiver/debian/control 2011-08-18 14:55:01 UTC (rev 14289) @@ -3,19 +3,20 @@ Priority: optional Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Torsten Werner <twer...@debian.org>, Ludovic Claude <ludovic.cla...@laposte.net> -Build-Depends: default-jdk, debhelper (>= 5), cdbs -Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional, - libmaven2-core-java, libplexus-archiver-java, libplexus-interpolation-java, - libplexus-utils-java, libplexus-containers-java -Standards-Version: 3.8.1 +Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4) +Build-Depends-Indep: libmaven2-core-java, libplexus-archiver-java, libplexus-interpolation-java, + libplexus-utils-java, junit, default-jdk-doc, libmaven2-core-java-doc, + libplexus-utils-java-doc, libmaven-javadoc-plugin-java +Standards-Version: 3.9.1 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-archiver Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-archiver/ Homepage: http://maven.apache.org/shared/maven-archiver/ Package: libmaven-archiver-java Architecture: all -Depends: ${misc:Depends}, libmaven2-core-java, libplexus-archiver-java, - libplexus-interpolation-java, libplexus-utils-java, libplexus-containers-java +Depends: ${misc:Depends}, ${maven:Depends} +Recommends: ${maven:OptionalDepends} +Suggests: libmaven-archiver-java-doc Description: Archiver component for Maven Maven is a software project management and comprehension tool. Based on the concept of a project object model (POM), Maven can manage a project's build, @@ -33,3 +34,29 @@ * Allowing transparent migration to new features . The Maven Archiver is mainly used by Maven plugins to handle packaging. + +Package: libmaven-archiver-java-doc +Architecture: all +Section: doc +Depends: ${misc:Depends}, ${maven:DocDepends} +Recommends: ${maven:DocOptionalDepends} +Suggests: libmaven-archiver-java +Description: Archiver component for Maven - API documentation + Maven is a software project management and comprehension tool. Based on the + concept of a project object model (POM), Maven can manage a project's build, + reporting and documentation from a central piece of information. + . + Maven's primary goal is to allow a developer to comprehend the complete + state of a development effort in the shortest period of time. In order to + attain this goal there are several areas of concern that Maven attempts + to deal with: + . + * Making the build process easy + * Providing a uniform build system + * Providing quality project information + * Providing guidelines for best practices development + * Allowing transparent migration to new features + . + The Maven Archiver is mainly used by Maven plugins to handle packaging. + . + This package contains the API documentation of libmaven-archiver-java. Modified: trunk/maven-archiver/debian/copyright =================================================================== --- trunk/maven-archiver/debian/copyright 2011-08-18 13:25:07 UTC (rev 14288) +++ trunk/maven-archiver/debian/copyright 2011-08-18 14:55:01 UTC (rev 14289) @@ -1,33 +1,15 @@ -This package was debianized by Torsten Werner <twer...@debian.org>. +Format-Specification: http://dep.debian.net/deps/dep5/ +Name: Maven Archiver +Source: http://maven.apache.org/shared/maven-archiver/ -The Debian packaging is Copyright (c) 2008 Torsten Werner and is -licensed under the GNU General Public License version 3. On Debian -systems, the complete text of the GNU General Public License can be -found in '/usr/share/common-licenses/GPL-3'. +Files: * +Copyright: 2007-2011, The Apache Software Foundation. +License: Apache-2.0 -The package was downloaded from -<http://maven.apache.org/shared/maven-archiver>. +Files: debian/* +Copyright: 2008-2011, Torsten Werner <twer...@debian.org> +License: Apache-2.0 -Copyright: 2007-2008 The Apache Software Foundation. - -License: - - Licensed to the Apache Software Foundation (ASF) under one - or more contributor license agreements. See the NOTICE file - distributed with this work for additional information - regarding copyright ownership. The ASF licenses this file - to you 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 in -`/usr/share/common-licenes/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' Added: trunk/maven-archiver/debian/libmaven-archiver-java-doc.doc-base.api =================================================================== --- trunk/maven-archiver/debian/libmaven-archiver-java-doc.doc-base.api (rev 0) +++ trunk/maven-archiver/debian/libmaven-archiver-java-doc.doc-base.api 2011-08-18 14:55:01 UTC (rev 14289) @@ -0,0 +1,10 @@ +Document: libmaven-archiver-java +Title: API Javadoc for Maven Archiver +Author: Maven Archiver developers +Abstract: This is the API Javadoc provided for the + libmaven-archiver-java library. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libmaven-archiver-java/api/index.html +Files: /usr/share/doc/libmaven-archiver-java/api/* Added: trunk/maven-archiver/debian/libmaven-archiver-java-doc.install =================================================================== --- trunk/maven-archiver/debian/libmaven-archiver-java-doc.install (rev 0) +++ trunk/maven-archiver/debian/libmaven-archiver-java-doc.install 2011-08-18 14:55:01 UTC (rev 14289) @@ -0,0 +1,2 @@ +target/apidocs/* usr/share/doc/libmaven-archiver-java/api + Modified: trunk/maven-archiver/debian/libmaven-archiver-java.poms =================================================================== --- trunk/maven-archiver/debian/libmaven-archiver-java.poms 2011-08-18 13:25:07 UTC (rev 14288) +++ trunk/maven-archiver/debian/libmaven-archiver-java.poms 2011-08-18 14:55:01 UTC (rev 14289) @@ -1 +1,26 @@ -pom.xml --no-parent +# 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 --no-parent --has-package-version Added: trunk/maven-archiver/debian/maven.cleanIgnoreRules =================================================================== --- trunk/maven-archiver/debian/maven.cleanIgnoreRules (rev 0) +++ trunk/maven-archiver/debian/maven.cleanIgnoreRules 2011-08-18 14:55:01 UTC (rev 14289) @@ -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/maven-archiver/debian/maven.ignoreRules =================================================================== --- trunk/maven-archiver/debian/maven.ignoreRules (rev 0) +++ trunk/maven-archiver/debian/maven.ignoreRules 2011-08-18 14:55:01 UTC (rev 14289) @@ -0,0 +1,17 @@ +# 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-changes-plugin * * * * Added: trunk/maven-archiver/debian/maven.properties =================================================================== --- trunk/maven-archiver/debian/maven.properties (rev 0) +++ trunk/maven-archiver/debian/maven.properties 2011-08-18 14:55:01 UTC (rev 14289) @@ -0,0 +1,4 @@ +# Include here properties to pass to Maven during the build. +# For example: +maven.test.skip=true + Added: trunk/maven-archiver/debian/maven.publishedRules =================================================================== --- trunk/maven-archiver/debian/maven.publishedRules (rev 0) +++ trunk/maven-archiver/debian/maven.publishedRules 2011-08-18 14:55:01 UTC (rev 14289) @@ -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/ + Modified: trunk/maven-archiver/debian/maven.rules =================================================================== --- trunk/maven-archiver/debian/maven.rules 2011-08-18 13:25:07 UTC (rev 14288) +++ trunk/maven-archiver/debian/maven.rules 2011-08-18 14:55:01 UTC (rev 14289) @@ -1,2 +1,20 @@ -junit junit jar s/3\..*/3.x/ +# 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/ +junit junit jar s/3\..*/3.x/ * * +org.apache.maven maven-archiver jar * * * Modified: trunk/maven-archiver/debian/orig-tar.sh =================================================================== --- trunk/maven-archiver/debian/orig-tar.sh 2011-08-18 13:25:07 UTC (rev 14288) +++ trunk/maven-archiver/debian/orig-tar.sh 2011-08-18 14:55:01 UTC (rev 14289) @@ -1,16 +1,16 @@ #!/bin/sh -e -TAR=../maven-archiver_$2.orig.tar.gz -DIR=maven-archiver-$2 -TAG=maven-archiver-$2 +VERSION=$2 +TAR=../maven-archiver_$VERSION.orig.tar.gz +DIR=maven-archiver-$VERSION +TAG=$(echo "maven-archiver-$VERSION" | sed -re's/~(alpha|beta)/-\1-/') -svn export http://svn.apache.org/repos/asf/maven/shared/tags/$TAG $DIR -tar -c -z -f $TAR $DIR +svn export http://svn.apache.org/repos/asf/maven/shared/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/maven-archiver/debian/rules =================================================================== --- trunk/maven-archiver/debian/rules 2011-08-18 13:25:07 UTC (rev 14288) +++ trunk/maven-archiver/debian/rules 2011-08-18 14:55:01 UTC (rev 14289) @@ -1,25 +1,9 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk +include /usr/share/cdbs/1/class/maven.mk -PACKAGE := $(DEB_SOURCE_PACKAGE) -VERSION := $(DEB_UPSTREAM_VERSION) -JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := ant-nodeps maven-core maven-artifact maven-artifact-manager maven-project \ - maven-model plexus-archiver plexus-interpolation plexus-utils plexus-container-default -DEB_ANT_BUILD_TARGET := package #javadoc -DEB_ANT_BUILDFILE := /usr/share/maven-ant-helper/maven-build.xml -DEB_ANT_ARGS := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dversion=$(VERSION) -API_DOCS := target/api +JAVA_HOME := /usr/lib/jvm/default-java get-orig-source: - -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename - -binary-post-install/lib$(PACKAGE)-java:: - mh_installpoms -plib$(PACKAGE)-java - mh_installjar -plib$(PACKAGE)-java -l pom.xml target/$(PACKAGE)-$(VERSION).jar - -clean:: - -rm -rf debian/tmp - + uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download Added: trunk/maven-archiver/debian/source/format =================================================================== --- trunk/maven-archiver/debian/source/format (rev 0) +++ trunk/maven-archiver/debian/source/format 2011-08-18 14:55:01 UTC (rev 14289) @@ -0,0 +1 @@ +3.0 (quilt) Modified: trunk/maven-archiver/debian/watch =================================================================== --- trunk/maven-archiver/debian/watch 2011-08-18 13:25:07 UTC (rev 14288) +++ trunk/maven-archiver/debian/watch 2011-08-18 14:55:01 UTC (rev 14289) @@ -1,3 +1,4 @@ version=3 -http://svn.apache.org/repos/asf/maven/shared/tags/ \ - maven-archiver-(.*)/ debian debian/orig-tar.sh +opts="uversionmangle=s/-(alpha|beta)-/~$1/" \ + http://svn.apache.org/repos/asf/maven/shared/tags/ \ + maven-archiver-(\d.*)/ debian debian/orig-tar.sh _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits