This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository plexus-interactivity-api.
commit eeb47305c73cbc9f3bff857d6c00d147e117f68f Author: Torsten Werner <[email protected]> Date: Sun Aug 28 19:41:43 2011 +0000 release --- debian/README.source | 9 +++ debian/TODO | 2 + debian/build.xml | 86 ---------------------- debian/changelog | 6 +- debian/control | 21 +++--- .../libplexus-interactivity-api-java-doc.doc-base | 9 --- ...bplexus-interactivity-api-java-doc.doc-base.api | 10 +++ .../libplexus-interactivity-api-java-doc.install | 2 + debian/libplexus-interactivity-api-java.poms | 27 ++++++- debian/maven.cleanIgnoreRules | 17 +++++ debian/maven.ignoreRules | 16 ++++ debian/maven.properties | 4 + debian/maven.publishedRules | 19 +++++ debian/maven.rules | 19 +++++ ...1-add-dependency-plexus-container-default.patch | 24 ++++++ debian/patches/series | 1 + debian/rules | 27 +------ 17 files changed, 165 insertions(+), 134 deletions(-) diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..b84feb8 --- /dev/null +++ b/debian/README.source @@ -0,0 +1,9 @@ +Information about plexus-interactivity-api +------------------------------ + +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. diff --git a/debian/TODO b/debian/TODO new file mode 100644 index 0000000..98e89f6 --- /dev/null +++ b/debian/TODO @@ -0,0 +1,2 @@ +- the parent project plexus-interactivity including its modules should be + packaged instead of the *-api only diff --git a/debian/build.xml b/debian/build.xml deleted file mode 100644 index b36656c..0000000 --- a/debian/build.xml +++ /dev/null @@ -1,86 +0,0 @@ -<?xml version="1.0"?> - -<!-- - This build.xml file was written for the Debian build of plexus-interactivity-api. - This file copyright (c) Paul Cager <[email protected]> - - This software and documentation is provided "as is," and - the copyright holders and contributing author(s) make no - representations or warranties, express or implied, including - but not limited to, warranties of merchantability or fitness - for any particular purpose or that the use of the software or - documentation will not infringe any third party patents, - copyrights, trademarks or other rights. - - The copyright holders and contributing author(s) will not be - liable for any direct, indirect, special or consequential damages - arising out of any use of the software or documentation, even if - advised of the possibility of such damage. - - Permission is hereby granted to use, copy, modify, and distribute - this source code, or portions hereof, documentation and executables, - for any purpose, without fee, subject to the following restrictions: - - 1. The origin of this source code must not be misrepresented. - 2. Altered versions must be plainly marked as such and must - not be misrepresented as being the original source. - 3. This Copyright notice may not be removed or altered from any - source or altered source distribution. ---> - -<project name="plexus-interactivity-api" default="package" basedir=".."> - -<target name="package" depends="jar,javadoc"/> - -<target name="init"> - <property name="src.dir" value="src"/> - <property name="build.dir" value="build"/> - <property name="jar" value="${build.dir}/${package}-${version}.jar"/> - <property name="javadoc.dir" value="${build.dir}/doc/api"/> -</target> - -<target name="compile" depends="init"> - <mkdir dir="${build.dir}"/> - <javac srcdir="${src.dir}/main" - destdir="${build.dir}" - includes="**/*.java" - source="1.4" target="1.4" - debug="on" - /> -</target> - -<target name="jar" depends="compile"> - <delete file="${jar}"/> - - <jar jarfile="${jar}"> - <fileset dir="${build.dir}" includes="**/*.class,**/*.properties"/> - <fileset dir="${src.dir}/main/resources/" /> - </jar> -</target> - -<target name="javadoc" depends="init"> - <mkdir dir="${javadoc.dir}"/> - <javadoc packagenames="org.codehaus.plexus.*" - sourcepath="${src.dir}/main/java" - destdir="${javadoc.dir}" - author="true" - version="true" - windowtitle="${package} API" - doctitle="${package} - ${version}" - classpath="${java.class.path}" - > - <link packagelistLoc="/usr/share/doc/libplexus-classworlds-java/api" - href="/usr/share/doc/libplexus-classworlds-java/api/" /> - <link packagelistLoc="/usr/share/doc/classpath-doc/api" - href="/usr/share/doc/classpath-doc/api/" /> - <link packagelistLoc="/usr/share/doc/libplexus-utils-java/api" - href="/usr/share/doc/libplexus-utils-java/api/" /> - <link packagelistLoc="/usr/share/doc/libplexus-component-api-java/api" - href="/usr/share/doc/libplexus-component-api-java/api/" /> - </javadoc> -</target> - -<target name="clean" depends="init"> - <delete dir="${build.dir}"/> -</target> -</project> diff --git a/debian/changelog b/debian/changelog index af0c3bf..59666ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,13 @@ plexus-interactivity-api (1.0-alpha-6-6) unstable; urgency=low - UNRELEASED * Team upload. * Switch to source format 3.0. * Switch to debhelper level 7. - * Remove Paul from Uploaders list - no human uploaders left. + * Remove Paul from Uploaders list and add myself to Uploaders list. * Change Depends: classpath-doc to default-jdk-doc. + * Use Maven to build the package. - -- Torsten Werner <[email protected]> Sun, 28 Aug 2011 18:10:49 +0200 + -- Torsten Werner <[email protected]> Sun, 28 Aug 2011 21:31:30 +0200 plexus-interactivity-api (1.0-alpha-6-5) unstable; urgency=low diff --git a/debian/control b/debian/control index 31bb63c..9f39d44 100644 --- a/debian/control +++ b/debian/control @@ -2,22 +2,20 @@ Source: plexus-interactivity-api Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Build-Depends-Indep: maven-repo-helper, ant, - ant-optional, libxalan2-java, - libplexus-component-api-java, - libplexus-component-api-java-doc, - libplexus-utils-java (>=1:1.4.1), - libplexus-utils-java-doc (>=1:1.4.1) -Build-Depends: debhelper (>= 7), cdbs (>= 0.4.5.3), default-jdk +Uploaders: Torsten Werner <[email protected]> +Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4) +Build-Depends-Indep: libplexus-utils-java, default-jdk-doc, + libplexus-utils-java-doc, libmaven-javadoc-plugin-java, + libplexus-containers-java Standards-Version: 3.9.1 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/plexus-interactivity-api Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/plexus-interactivity-api/ -Homepage: http://plexus.codehaus.org/ +Homepage: http://plexus.codehaus.org/plexus-components/plexus-interactivity/ Package: libplexus-interactivity-api-java Architecture: all -Depends: ${misc:Depends}, libplexus-component-api-java -Section: java +Depends: ${misc:Depends}, ${maven:Depends} +Recommends: ${maven:OptionalDepends} Suggests: libplexus-interactivity-api-java-doc Description: interactivity API for the Plexus framework The Plexus project provides a full software stack for creating and executing @@ -42,7 +40,8 @@ Description: interactivity API for the Plexus framework Package: libplexus-interactivity-api-java-doc Architecture: all Section: doc -Depends: ${misc:Depends}, default-jdk-doc, libplexus-component-api-java-doc +Depends: ${misc:Depends}, ${maven:DocDepends} +Recommends: ${maven:DocOptionalDepends} Suggests: libplexus-interactivity-api-java Description: API Documentation for plexus-interactivity-api The Plexus project provides a full software stack for creating and executing diff --git a/debian/libplexus-interactivity-api-java-doc.doc-base b/debian/libplexus-interactivity-api-java-doc.doc-base deleted file mode 100644 index 6689da6..0000000 --- a/debian/libplexus-interactivity-api-java-doc.doc-base +++ /dev/null @@ -1,9 +0,0 @@ -Document: libplexus-interactivity-api-java -Title: API Javadoc for plexus-interactivity-api -Author: plexus-interactivity-api developers -Abstract: This is the API Javadoc provided by the plexus-interactivity-api library. -Section: Programming - -Format: HTML -Index: /usr/share/doc/libplexus-interactivity-api-java/api/index.html -Files: /usr/share/doc/libplexus-interactivity-api-java/api/* diff --git a/debian/libplexus-interactivity-api-java-doc.doc-base.api b/debian/libplexus-interactivity-api-java-doc.doc-base.api new file mode 100644 index 0000000..ddb541d --- /dev/null +++ b/debian/libplexus-interactivity-api-java-doc.doc-base.api @@ -0,0 +1,10 @@ +Document: libplexus-interactivity-api-java +Title: API Javadoc for Plexus Default Interactivity Handler +Author: Plexus Default Interactivity Handler developers +Abstract: This is the API Javadoc provided for the + libplexus-interactivity-api-java library. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libplexus-interactivity-api-java/api/index.html +Files: /usr/share/doc/libplexus-interactivity-api-java/api/* diff --git a/debian/libplexus-interactivity-api-java-doc.install b/debian/libplexus-interactivity-api-java-doc.install new file mode 100644 index 0000000..fe05ad9 --- /dev/null +++ b/debian/libplexus-interactivity-api-java-doc.install @@ -0,0 +1,2 @@ +target/apidocs/* usr/share/doc/libplexus-interactivity-api-java/api + diff --git a/debian/libplexus-interactivity-api-java.poms b/debian/libplexus-interactivity-api-java.poms index 43e746b..31a0ccf 100644 --- a/debian/libplexus-interactivity-api-java.poms +++ b/debian/libplexus-interactivity-api-java.poms @@ -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 diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules new file mode 100644 index 0000000..b47b61d --- /dev/null +++ b/debian/maven.cleanIgnoreRules @@ -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/ + diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules new file mode 100644 index 0000000..0088a40 --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1,16 @@ +# 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/ + diff --git a/debian/maven.properties b/debian/maven.properties new file mode 100644 index 0000000..7c29bd7 --- /dev/null +++ b/debian/maven.properties @@ -0,0 +1,4 @@ +# Include here properties to pass to Maven during the build. +# For example: +# maven.test.skip=true + diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules new file mode 100644 index 0000000..822f087 --- /dev/null +++ b/debian/maven.publishedRules @@ -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/ + diff --git a/debian/maven.rules b/debian/maven.rules new file mode 100644 index 0000000..48b5a7e --- /dev/null +++ b/debian/maven.rules @@ -0,0 +1,19 @@ +# 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/ + +org.codehaus.plexus plexus-interactivity-api jar s/.*/debian/ * * diff --git a/debian/patches/0001-add-dependency-plexus-container-default.patch b/debian/patches/0001-add-dependency-plexus-container-default.patch new file mode 100644 index 0000000..c41b413 --- /dev/null +++ b/debian/patches/0001-add-dependency-plexus-container-default.patch @@ -0,0 +1,24 @@ +From: Torsten Werner <[email protected]> +Date: Sun, 28 Aug 2011 21:37:51 +0200 +Subject: [PATCH] add dependency plexus-container-default + +--- + pom.xml | 5 +++++ + 1 files changed, 5 insertions(+), 0 deletions(-) + +diff --git a/pom.xml b/pom.xml +index 84e659e..1f488e8 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -14,5 +14,10 @@ + <artifactId>plexus-utils</artifactId> + <version>1.4</version> + </dependency> ++ <dependency> ++ <groupId>org.codehaus.plexus</groupId> ++ <artifactId>plexus-container-default</artifactId> ++ <version>1.0-beta-3.0.7</version> ++ </dependency> + </dependencies> + </project> +-- diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..afbeefd --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-add-dependency-plexus-container-default.patch diff --git a/debian/rules b/debian/rules index 5941d4a..b76c54a 100755 --- a/debian/rules +++ b/debian/rules @@ -1,30 +1,9 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk - -PACKAGE := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ') -VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | sed "s,Version: \(.*\)-.*,\1,g") -JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar xalan2 \ - /usr/share/java/plexus-classworlds.jar /usr/share/java/plexus-component-api.jar \ - /usr/share/java/plexus-utils.jar -DEB_ANT_BUILD_TARGET := package javadoc -DEB_ANT_BUILDFILE := debian/build.xml -DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -Dversion=$(VERSION) -#DEB_ANT_INVOKE := ant -verbose -Dpackage=$(PACKAGE) -Dversion=$(VERSION) -f $(BUILD_FILE) -API_DOCS := build/doc/api +include /usr/share/cdbs/1/class/maven.mk +JAVA_HOME := /usr/lib/jvm/default-java get-orig-source: - uscan --download-version $(VERSION) --force-download --rename - -binary-post-install/lib$(PACKAGE)-java:: - mh_installpoms -plib$(PACKAGE)-java - mh_installjar -plib$(PACKAGE)-java -l pom.xml build/$(PACKAGE)-$(VERSION).jar - -clean:: - -rm -rf debian/tmp - -binary-post-install/lib$(PACKAGE)-java-doc:: - dh_install -plib$(PACKAGE)-java-doc $(API_DOCS) usr/share/doc/lib$(PACKAGE)-java + uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-interactivity-api.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
