[modello-maven-plugin] 12/12: * Add a documentation package. * Enable tests.

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Thu Jul 9 10:54:37 UTC 2015


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch modello-1.1
in repository modello-maven-plugin.

commit 865fea82c8cc0cdcc70ad096b31578a3c64a8c24
Author: Torsten Werner <twerner at debian.org>
Date:   Wed Aug 24 22:26:11 2011 +0000

    * Add a documentation package.
    * Enable tests.
---
 debian/README.source                               |  2 +-
 debian/changelog                                   |  4 +++-
 debian/control                                     | 22 ++++++++++++++----
 .../libmodello-maven-plugin-java-doc.doc-base.api  | 10 ++++++++
 debian/libmodello-maven-plugin-java-doc.install    |  2 ++
 debian/libmodello-maven-plugin-java.poms           | 27 +++++++++++++++++++++-
 debian/maven.cleanIgnoreRules                      | 17 ++++++++++++++
 debian/maven.ignoreRules                           | 16 +++++++++++++
 debian/maven.properties                            |  5 +++-
 debian/maven.publishedRules                        | 19 +++++++++++++++
 debian/maven.rules                                 | 19 +++++++++++++++
 debian/orig-tar.sh                                 |  5 ++--
 12 files changed, 136 insertions(+), 12 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index 491c50b..679d8ed 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -4,6 +4,6 @@ Information about modello-maven-plugin
 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.
diff --git a/debian/changelog b/debian/changelog
index 43782b6..d9c727b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ modello-maven-plugin (1.1-2) unstable; urgency=low
   * 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
 
diff --git a/debian/control b/debian/control
index 1254fdf..f2d65b4 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,11 @@ Section: java
 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 @@ Package: libmodello-maven-plugin-java
 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.
diff --git a/debian/libmodello-maven-plugin-java-doc.doc-base.api b/debian/libmodello-maven-plugin-java-doc.doc-base.api
new file mode 100644
index 0000000..64cf6ac
--- /dev/null
+++ b/debian/libmodello-maven-plugin-java-doc.doc-base.api
@@ -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/*
diff --git a/debian/libmodello-maven-plugin-java-doc.install b/debian/libmodello-maven-plugin-java-doc.install
new file mode 100644
index 0000000..fdd34d5
--- /dev/null
+++ b/debian/libmodello-maven-plugin-java-doc.install
@@ -0,0 +1,2 @@
+target/apidocs/* usr/share/doc/libmodello-maven-plugin-java/api
+
diff --git a/debian/libmodello-maven-plugin-java.poms b/debian/libmodello-maven-plugin-java.poms
index d4f7111..9ec5af5 100644
--- a/debian/libmodello-maven-plugin-java.poms
+++ b/debian/libmodello-maven-plugin-java.poms
@@ -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
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
index e877106..920b095 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -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 *
diff --git a/debian/maven.properties b/debian/maven.properties
index d2f1b82..7c29bd7 100644
--- a/debian/maven.properties
+++ b/debian/maven.properties
@@ -1 +1,4 @@
-maven.test.skip=true
+# 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..be4177c
--- /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/
+
+junit junit jar s/3\..*/3.x/ * *
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 5754f86..22f79b6 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -6,12 +6,11 @@ DIR=modello-maven-plugin-$VERSION
 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

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/modello-maven-plugin.git



More information about the pkg-java-commits mailing list