[pkg-java] r14731 - in trunk/plexus-digest/debian: . patches
Torsten Werner
twerner at alioth.debian.org
Tue Sep 6 20:40:17 UTC 2011
Author: twerner
Date: 2011-09-06 20:40:17 +0000 (Tue, 06 Sep 2011)
New Revision: 14731
Added:
trunk/plexus-digest/debian/README.source
trunk/plexus-digest/debian/libplexus-digest-java-doc.doc-base.api
trunk/plexus-digest/debian/libplexus-digest-java-doc.install
trunk/plexus-digest/debian/maven.cleanIgnoreRules
trunk/plexus-digest/debian/maven.ignoreRules
trunk/plexus-digest/debian/maven.properties
trunk/plexus-digest/debian/maven.publishedRules
trunk/plexus-digest/debian/maven.rules
trunk/plexus-digest/debian/patches/
trunk/plexus-digest/debian/patches/0001-add-test-dependencies.patch
trunk/plexus-digest/debian/patches/series
Removed:
trunk/plexus-digest/debian/build.properties
trunk/plexus-digest/debian/components.xml
Modified:
trunk/plexus-digest/debian/changelog
trunk/plexus-digest/debian/control
trunk/plexus-digest/debian/copyright
trunk/plexus-digest/debian/libplexus-digest-java.poms
trunk/plexus-digest/debian/rules
trunk/plexus-digest/debian/watch
Log:
* Use Maven to build the package.
* Update debian/copyright.
* Add a documentation package.
Added: trunk/plexus-digest/debian/README.source
===================================================================
--- trunk/plexus-digest/debian/README.source (rev 0)
+++ trunk/plexus-digest/debian/README.source 2011-09-06 20:40:17 UTC (rev 14731)
@@ -0,0 +1,9 @@
+Information about plexus-digest
+------------------------------
+
+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/plexus-digest/debian/build.properties
===================================================================
--- trunk/plexus-digest/debian/build.properties 2011-09-06 20:08:32 UTC (rev 14730)
+++ trunk/plexus-digest/debian/build.properties 2011-09-06 20:40:17 UTC (rev 14731)
@@ -1,2 +0,0 @@
-javadoc.dir=build/api
-maven.test.skip=true
Modified: trunk/plexus-digest/debian/changelog
===================================================================
--- trunk/plexus-digest/debian/changelog 2011-09-06 20:08:32 UTC (rev 14730)
+++ trunk/plexus-digest/debian/changelog 2011-09-06 20:40:17 UTC (rev 14731)
@@ -5,8 +5,11 @@
* Update Standards-Version: 3.9.2.
* Switch to source format 3.0.
* Remove ${shlibs:Depends}.
+ * Use Maven to build the package.
+ * Update debian/copyright.
+ * Add a documentation package.
- -- Torsten Werner <twerner at debian.org> Tue, 06 Sep 2011 22:05:40 +0200
+ -- Torsten Werner <twerner at debian.org> Tue, 06 Sep 2011 22:17:41 +0200
plexus-digest (1.1-2) unstable; urgency=low
Deleted: trunk/plexus-digest/debian/components.xml
===================================================================
--- trunk/plexus-digest/debian/components.xml 2011-09-06 20:08:32 UTC (rev 14730)
+++ trunk/plexus-digest/debian/components.xml 2011-09-06 20:40:17 UTC (rev 14731)
@@ -1,45 +0,0 @@
-<component-set>
- <components>
- <component>
- <role>org.codehaus.plexus.digest.Digester</role>
- <role-hint>sha1</role-hint>
- <implementation>org.codehaus.plexus.digest.Sha1Digester</implementation>
- <description>Digester that does SHA1 Message Digesting Only.</description>
- </component>
- <component>
- <role>org.codehaus.plexus.digest.StreamingDigester</role>
- <role-hint>md5</role-hint>
- <implementation>org.codehaus.plexus.digest.StreamingMd5Digester</implementation>
- <description>An MD5 implementation of the streaming digester.</description>
- </component>
- <component>
- <role>org.codehaus.plexus.digest.Digester</role>
- <role-hint>md5</role-hint>
- <implementation>org.codehaus.plexus.digest.Md5Digester</implementation>
- <description>Digester that does MD5 Message Digesting Only.</description>
- </component>
- <component>
- <role>org.codehaus.plexus.digest.ChecksumFile</role>
- <implementation>org.codehaus.plexus.digest.ChecksumFile</implementation>
- <description>ChecksumFile</description>
- <requirements>
- <requirement>
- <role>org.codehaus.plexus.digest.Digester</role>
- <role-hint>sha1</role-hint>
- <field-name>digestSha1</field-name>
- </requirement>
- <requirement>
- <role>org.codehaus.plexus.digest.Digester</role>
- <role-hint>md5</role-hint>
- <field-name>digestMd5</field-name>
- </requirement>
- </requirements>
- </component>
- <component>
- <role>org.codehaus.plexus.digest.StreamingDigester</role>
- <role-hint>sha1</role-hint>
- <implementation>org.codehaus.plexus.digest.StreamingSha1Digester</implementation>
- <description>An SHA-1 implementation of the streaming digester.</description>
- </component>
- </components>
-</component-set>
Modified: trunk/plexus-digest/debian/control
===================================================================
--- trunk/plexus-digest/debian/control 2011-09-06 20:08:32 UTC (rev 14730)
+++ trunk/plexus-digest/debian/control 2011-09-06 20:40:17 UTC (rev 14731)
@@ -3,16 +3,19 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Torsten Werner <twerner at debian.org>
-Build-Depends: cdbs, debhelper (>= 7), default-jdk
-Build-Depends-Indep: maven-ant-helper (>> 4), maven-repo-helper, ant, ant-optional, libplexus-utils-java
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4)
+Build-Depends-Indep: libplexus-maven-plugin-java, libplexus-utils-java, default-jdk-doc, libplexus-utils-java-doc,
+ libmaven-javadoc-plugin-java, libplexus-containers-java
Standards-Version: 3.9.2
-Homepage: http://plexus.codehaus.org
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/plexus-digest
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/plexus-digest
+Homepage: http://plexus.codehaus.org/plexus-components/plexus-digest/
Package: libplexus-digest-java
Architecture: all
-Depends: ${misc:Depends}, libplexus-utils-java
+Depends: ${misc:Depends}, ${maven:Depends}
+Recommends: ${maven:OptionalDepends}
+Suggests: libplexus-digest-java-doc
Description: Digest utilities for the Plexus system
The Plexus project provides a full software stack for creating and
executing software projects. Based on the Plexus container, the applications
@@ -20,3 +23,17 @@
components that can easily be assembled and reused.
.
This package provides digest (checksum) utilities for Plexus.
+
+Package: libplexus-digest-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}, ${maven:DocDepends}
+Recommends: ${maven:DocOptionalDepends}
+Suggests: libplexus-digest-java
+Description: Documentation for Digest utilities for the Plexus system
+ The Plexus project provides a full software stack for creating and
+ executing software projects. Based on the Plexus container, the applications
+ can utilise component-oriented programming to build modular, reusable
+ components that can easily be assembled and reused.
+ .
+ This package contains the API documentation of libplexus-digest-java.
Modified: trunk/plexus-digest/debian/copyright
===================================================================
--- trunk/plexus-digest/debian/copyright 2011-09-06 20:08:32 UTC (rev 14730)
+++ trunk/plexus-digest/debian/copyright 2011-09-06 20:40:17 UTC (rev 14731)
@@ -1,21 +1,16 @@
-This package was debianized by Paul Cager <paul-debian at home.paulcager.org>
-Sun, 13 Apr 2008 17:44:08 +0100.
+Format: http://dep.debian.net/deps/dep5/
+Upstream-Name: Plexus Digest / Hashcode Components
+Source: https://svn.codehaus.org/plexus/plexus-components/tags/plexus-digest-1.1/
-It was downloaded from https://svn.codehaus.org/plexus/plexus-components/tags/plexus-digest-1.1/
+Files: *
+Copyright: 2001-2007, The Codehaus.
+License: Apache-2.0
-Copyright:
- Copyright (c) 2001-2007 The Codehaus.
+Files: debian/*
+Copyright: 2008, Paul Cager <paul-debian at home.paulcager.org>
+ 2011, Torsten Werner <twerner at debian.org>
+License: Apache-2.0
-Authors:
- Edwin Punzalan
- Brett Porter brett at apache.org
- Joakim Erdfelt joakim at erdfelt.com
-
-License:
- All files are licensed under the Apache License (version 2.0)
-
-The full text of this license can be found in
-`/usr/share/common-licenses/Apache-2.0'.
-
-The Debian packaging is (C) 2008, Paul Cager <paul-debian at home.paulcager.org>
-and is licensed under the Apache License version 2.
+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/plexus-digest/debian/libplexus-digest-java-doc.doc-base.api
===================================================================
--- trunk/plexus-digest/debian/libplexus-digest-java-doc.doc-base.api (rev 0)
+++ trunk/plexus-digest/debian/libplexus-digest-java-doc.doc-base.api 2011-09-06 20:40:17 UTC (rev 14731)
@@ -0,0 +1,10 @@
+Document: libplexus-digest-java
+Title: API Javadoc for Plexus Digest / Hashcode Components
+Author: Plexus Digest / Hashcode Components developers
+Abstract: This is the API Javadoc provided for the
+ libplexus-digest-java library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libplexus-digest-java/api/index.html
+Files: /usr/share/doc/libplexus-digest-java/api/*
Added: trunk/plexus-digest/debian/libplexus-digest-java-doc.install
===================================================================
--- trunk/plexus-digest/debian/libplexus-digest-java-doc.install (rev 0)
+++ trunk/plexus-digest/debian/libplexus-digest-java-doc.install 2011-09-06 20:40:17 UTC (rev 14731)
@@ -0,0 +1,2 @@
+target/apidocs/* usr/share/doc/libplexus-digest-java/api
+
Modified: trunk/plexus-digest/debian/libplexus-digest-java.poms
===================================================================
--- trunk/plexus-digest/debian/libplexus-digest-java.poms 2011-09-06 20:08:32 UTC (rev 14730)
+++ trunk/plexus-digest/debian/libplexus-digest-java.poms 2011-09-06 20:40:17 UTC (rev 14731)
@@ -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/plexus-digest/debian/maven.cleanIgnoreRules
===================================================================
--- trunk/plexus-digest/debian/maven.cleanIgnoreRules (rev 0)
+++ trunk/plexus-digest/debian/maven.cleanIgnoreRules 2011-09-06 20:40:17 UTC (rev 14731)
@@ -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/plexus-digest/debian/maven.ignoreRules
===================================================================
--- trunk/plexus-digest/debian/maven.ignoreRules (rev 0)
+++ trunk/plexus-digest/debian/maven.ignoreRules 2011-09-06 20:40:17 UTC (rev 14731)
@@ -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/
+
Added: trunk/plexus-digest/debian/maven.properties
===================================================================
--- trunk/plexus-digest/debian/maven.properties (rev 0)
+++ trunk/plexus-digest/debian/maven.properties 2011-09-06 20:40:17 UTC (rev 14731)
@@ -0,0 +1,4 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+# maven.test.skip=true
+
Added: trunk/plexus-digest/debian/maven.publishedRules
===================================================================
--- trunk/plexus-digest/debian/maven.publishedRules (rev 0)
+++ trunk/plexus-digest/debian/maven.publishedRules 2011-09-06 20:40:17 UTC (rev 14731)
@@ -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/plexus-digest/debian/maven.rules
===================================================================
--- trunk/plexus-digest/debian/maven.rules (rev 0)
+++ trunk/plexus-digest/debian/maven.rules 2011-09-06 20:40:17 UTC (rev 14731)
@@ -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-digest jar s/.*/debian/ * *
Added: trunk/plexus-digest/debian/patches/0001-add-test-dependencies.patch
===================================================================
--- trunk/plexus-digest/debian/patches/0001-add-test-dependencies.patch (rev 0)
+++ trunk/plexus-digest/debian/patches/0001-add-test-dependencies.patch 2011-09-06 20:40:17 UTC (rev 14731)
@@ -0,0 +1,39 @@
+From: Torsten Werner <twerner at debian.org>
+Date: Tue, 6 Sep 2011 22:22:49 +0200
+Subject: add test dependencies
+
+---
+ debian/patches/series | 1 +
+ pom.xml | 12 ++++++++++++
+ 2 files changed, 13 insertions(+), 0 deletions(-)
+
+diff --git a/debian/patches/series b/debian/patches/series
+index e69de29..399e60a 100644
+--- a/debian/patches/series
++++ b/debian/patches/series
+@@ -0,0 +1 @@
++0001-add-junit-dependency.patch
+diff --git a/pom.xml b/pom.xml
+index 14bfb88..36c9cfe 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -16,6 +16,18 @@
+ <artifactId>plexus-utils</artifactId>
+ <version>1.4.1</version>
+ </dependency>
++ <dependency>
++ <groupId>junit</groupId>
++ <artifactId>junit</artifactId>
++ <version>3.8.2</version>
++ <scope>test</scope>
++ </dependency>
++ <dependency>
++ <groupId>org.codehaus.plexus</groupId>
++ <artifactId>plexus-container-default</artifactId>
++ <version>1.0-beta-3.0.7</version>
++ <scope>test</scope>
++ </dependency>
+ </dependencies>
+
+ <build>
+--
Added: trunk/plexus-digest/debian/patches/series
===================================================================
--- trunk/plexus-digest/debian/patches/series (rev 0)
+++ trunk/plexus-digest/debian/patches/series 2011-09-06 20:40:17 UTC (rev 14731)
@@ -0,0 +1 @@
+0001-add-test-dependencies.patch
Modified: trunk/plexus-digest/debian/rules
===================================================================
--- trunk/plexus-digest/debian/rules 2011-09-06 20:08:32 UTC (rev 14730)
+++ trunk/plexus-digest/debian/rules 2011-09-06 20:40:17 UTC (rev 14731)
@@ -1,27 +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 plexus-utils
-DEB_ANT_BUILD_TARGET := package
-DEB_ANT_BUILDFILE := /usr/share/maven-ant-helper/maven-build.xml
-DEB_ANT_ARGS := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
+JAVA_HOME := /usr/lib/jvm/default-java
-makebuilddir/lib$(PACKAGE)-java::
- install -d build/classes/META-INF/plexus/
- install -m644 debian/components.xml build/classes/META-INF/plexus/
-
-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
-
get-orig-source:
- -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
-
+ uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
Modified: trunk/plexus-digest/debian/watch
===================================================================
--- trunk/plexus-digest/debian/watch 2011-09-06 20:08:32 UTC (rev 14730)
+++ trunk/plexus-digest/debian/watch 2011-09-06 20:40:17 UTC (rev 14731)
@@ -1,3 +1,4 @@
version=3
-http://svn.codehaus.org/plexus/plexus-components/tags/ \
- plexus-digest-(.*)/ debian debian/orig-tar.sh
+opts="uversionmangle=s/-(alpha|beta)-/~$1/" \
+ http://svn.codehaus.org/plexus/plexus-components/tags/ \
+ plexus-digest-(\d.*)/ debian debian/orig-tar.sh
More information about the pkg-java-commits
mailing list