[pkg-java] r14468 - trunk/modello-maven-plugin/debian
Torsten Werner
twerner at alioth.debian.org
Wed Aug 24 22:26:11 UTC 2011
Author: twerner
Date: 2011-08-24 22:26:11 +0000 (Wed, 24 Aug 2011)
New Revision: 14468
Added:
trunk/modello-maven-plugin/debian/libmodello-maven-plugin-java-doc.doc-base.api
trunk/modello-maven-plugin/debian/libmodello-maven-plugin-java-doc.install
trunk/modello-maven-plugin/debian/maven.cleanIgnoreRules
trunk/modello-maven-plugin/debian/maven.publishedRules
trunk/modello-maven-plugin/debian/maven.rules
Modified:
trunk/modello-maven-plugin/debian/README.source
trunk/modello-maven-plugin/debian/changelog
trunk/modello-maven-plugin/debian/control
trunk/modello-maven-plugin/debian/libmodello-maven-plugin-java.poms
trunk/modello-maven-plugin/debian/maven.ignoreRules
trunk/modello-maven-plugin/debian/maven.properties
trunk/modello-maven-plugin/debian/orig-tar.sh
Log:
* Add a documentation package.
* Enable tests.
Modified: trunk/modello-maven-plugin/debian/README.source
===================================================================
--- trunk/modello-maven-plugin/debian/README.source 2011-08-24 22:12:30 UTC (rev 14467)
+++ trunk/modello-maven-plugin/debian/README.source 2011-08-24 22:26:11 UTC (rev 14468)
@@ -4,6 +4,6 @@
This package was debianized using the mh_make command
from the maven-debian-helper package.
-The build system uses Maven but prevent it from downloading
+The build system uses Maven but prevents it from downloading
anything from the Internet, making the build compliant with
the Debian policy.
Modified: trunk/modello-maven-plugin/debian/changelog
===================================================================
--- trunk/modello-maven-plugin/debian/changelog 2011-08-24 22:12:30 UTC (rev 14467)
+++ trunk/modello-maven-plugin/debian/changelog 2011-08-24 22:26:11 UTC (rev 14468)
@@ -4,8 +4,10 @@
* Switch to source format 3.0.
* Update Standards-Version: 3.9.1.
* Disable maven-plugin-plugin because it causes a build failure.
+ * Add a documentation package.
+ * Enable tests.
- -- Torsten Werner <twerner at debian.org> Thu, 25 Aug 2011 00:11:43 +0200
+ -- Torsten Werner <twerner at debian.org> Thu, 25 Aug 2011 00:25:14 +0200
modello-maven-plugin (1.1-1) unstable; urgency=low
Modified: trunk/modello-maven-plugin/debian/control
===================================================================
--- trunk/modello-maven-plugin/debian/control 2011-08-24 22:12:30 UTC (rev 14467)
+++ trunk/modello-maven-plugin/debian/control 2011-08-24 22:26:11 UTC (rev 14468)
@@ -3,10 +3,11 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Ludovic Claude <ludovic.claude at laposte.net>, Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 7), cdbs, default-jdk
-Build-Depends-Indep: maven-debian-helper,
- libplexus-containers-java, libplexus-build-api-java, libmaven2-core-java,
- libmodello-java (>= 1.1), libplexus-utils-java
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4)
+Build-Depends-Indep: libmaven-plugin-tools-java, libmaven2-core-java, libmodello-java, libplexus-build-api-java,
+ libplexus-containers-java, libplexus-utils-java, junit, default-jdk-doc,
+ libmaven2-core-java-doc, libmodello-java-doc, libplexus-containers-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/modello-maven-plugin
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/modello-maven-plugin/
@@ -16,9 +17,20 @@
Architecture: all
Depends: ${misc:Depends}, ${maven:Depends}
Recommends: ${maven:OptionalDepends}
-Conflicts: libmodello-java (<< 1.1)
+Suggests: libmodello-maven-plugin-java-doc
Description: Modello Maven Plugin enables the use of Modello in Maven builds
Modello is a Data Model toolkit in use by the Maven 2 Project.
.
This package provides a Maven plugin to enable the use of Modello in Maven
builds.
+
+Package: libmodello-maven-plugin-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}, ${maven:DocDepends}
+Recommends: ${maven:DocOptionalDepends}
+Suggests: libmodello-maven-plugin-java
+Description: Documentation for Modello Maven Plugin
+ Modello is a Data Model toolkit in use by the Maven 2 Project.
+ .
+ This package contains the API documentation of libmodello-maven-plugin-java.
Added: trunk/modello-maven-plugin/debian/libmodello-maven-plugin-java-doc.doc-base.api
===================================================================
--- trunk/modello-maven-plugin/debian/libmodello-maven-plugin-java-doc.doc-base.api (rev 0)
+++ trunk/modello-maven-plugin/debian/libmodello-maven-plugin-java-doc.doc-base.api 2011-08-24 22:26:11 UTC (rev 14468)
@@ -0,0 +1,10 @@
+Document: libmodello-maven-plugin-java
+Title: API Javadoc for Modello Maven Plugin
+Author: Codehaus developers
+Abstract: This is the API Javadoc provided for the
+ libmodello-maven-plugin-java library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libmodello-maven-plugin-java/api/index.html
+Files: /usr/share/doc/libmodello-maven-plugin-java/api/*
Added: trunk/modello-maven-plugin/debian/libmodello-maven-plugin-java-doc.install
===================================================================
--- trunk/modello-maven-plugin/debian/libmodello-maven-plugin-java-doc.install (rev 0)
+++ trunk/modello-maven-plugin/debian/libmodello-maven-plugin-java-doc.install 2011-08-24 22:26:11 UTC (rev 14468)
@@ -0,0 +1,2 @@
+target/apidocs/* usr/share/doc/libmodello-maven-plugin-java/api
+
Modified: trunk/modello-maven-plugin/debian/libmodello-maven-plugin-java.poms
===================================================================
--- trunk/modello-maven-plugin/debian/libmodello-maven-plugin-java.poms 2011-08-24 22:12:30 UTC (rev 14467)
+++ trunk/modello-maven-plugin/debian/libmodello-maven-plugin-java.poms 2011-08-24 22:26:11 UTC (rev 14468)
@@ -1 +1,26 @@
-pom.xml
+# 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/modello-maven-plugin/debian/maven.cleanIgnoreRules
===================================================================
--- trunk/modello-maven-plugin/debian/maven.cleanIgnoreRules (rev 0)
+++ trunk/modello-maven-plugin/debian/maven.cleanIgnoreRules 2011-08-24 22:26:11 UTC (rev 14468)
@@ -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/
+
Modified: trunk/modello-maven-plugin/debian/maven.ignoreRules
===================================================================
--- trunk/modello-maven-plugin/debian/maven.ignoreRules 2011-08-24 22:12:30 UTC (rev 14467)
+++ trunk/modello-maven-plugin/debian/maven.ignoreRules 2011-08-24 22:26:11 UTC (rev 14468)
@@ -1 +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-plugin-plugin maven-plugin *
Modified: trunk/modello-maven-plugin/debian/maven.properties
===================================================================
--- trunk/modello-maven-plugin/debian/maven.properties 2011-08-24 22:12:30 UTC (rev 14467)
+++ trunk/modello-maven-plugin/debian/maven.properties 2011-08-24 22:26:11 UTC (rev 14468)
@@ -1 +1,4 @@
-maven.test.skip=true
+# Include here properties to pass to Maven during the build.
+# For example:
+# maven.test.skip=true
+
Added: trunk/modello-maven-plugin/debian/maven.publishedRules
===================================================================
--- trunk/modello-maven-plugin/debian/maven.publishedRules (rev 0)
+++ trunk/modello-maven-plugin/debian/maven.publishedRules 2011-08-24 22:26:11 UTC (rev 14468)
@@ -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/modello-maven-plugin/debian/maven.rules
===================================================================
--- trunk/modello-maven-plugin/debian/maven.rules (rev 0)
+++ trunk/modello-maven-plugin/debian/maven.rules 2011-08-24 22:26:11 UTC (rev 14468)
@@ -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/
+
+junit junit jar s/3\..*/3.x/ * *
Modified: trunk/modello-maven-plugin/debian/orig-tar.sh
===================================================================
--- trunk/modello-maven-plugin/debian/orig-tar.sh 2011-08-24 22:12:30 UTC (rev 14467)
+++ trunk/modello-maven-plugin/debian/orig-tar.sh 2011-08-24 22:26:11 UTC (rev 14468)
@@ -6,12 +6,11 @@
TAG=$(echo "modello-$VERSION" | sed -re's/~(alpha|beta)/-\1-/')
svn export http://svn.codehaus.org/modello/tags/${TAG}/modello-maven-plugin/ $DIR
-tar -c -z -f $TAR $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
More information about the pkg-java-commits
mailing list