[pkg-java] r14843 - in tags/maven-site-plugin: . 2.1-2/debian

Torsten Werner twerner at alioth.debian.org
Sun Sep 11 20:47:34 UTC 2011


Author: twerner
Date: 2011-09-11 20:47:33 +0000 (Sun, 11 Sep 2011)
New Revision: 14843

Added:
   tags/maven-site-plugin/2.1-2/
   tags/maven-site-plugin/2.1-2/debian/README.source
   tags/maven-site-plugin/2.1-2/debian/TODO
   tags/maven-site-plugin/2.1-2/debian/changelog
   tags/maven-site-plugin/2.1-2/debian/control
   tags/maven-site-plugin/2.1-2/debian/copyright
   tags/maven-site-plugin/2.1-2/debian/libmaven-site-plugin-java-doc.doc-base.api
   tags/maven-site-plugin/2.1-2/debian/libmaven-site-plugin-java-doc.install
   tags/maven-site-plugin/2.1-2/debian/libmaven-site-plugin-java.poms
   tags/maven-site-plugin/2.1-2/debian/maven.cleanIgnoreRules
   tags/maven-site-plugin/2.1-2/debian/maven.ignoreRules
   tags/maven-site-plugin/2.1-2/debian/maven.properties
   tags/maven-site-plugin/2.1-2/debian/maven.publishedRules
   tags/maven-site-plugin/2.1-2/debian/maven.rules
   tags/maven-site-plugin/2.1-2/debian/rules
   tags/maven-site-plugin/2.1-2/debian/watch
Removed:
   tags/maven-site-plugin/2.1-2/debian/build.properties
   tags/maven-site-plugin/2.1-2/debian/changelog
   tags/maven-site-plugin/2.1-2/debian/control
   tags/maven-site-plugin/2.1-2/debian/copyright
   tags/maven-site-plugin/2.1-2/debian/libmaven-site-plugin-java.poms
   tags/maven-site-plugin/2.1-2/debian/maven-settings.xml
   tags/maven-site-plugin/2.1-2/debian/maven.rules
   tags/maven-site-plugin/2.1-2/debian/rules
   tags/maven-site-plugin/2.1-2/debian/watch
Log:
[svn-buildpackage] Tagging maven-site-plugin 2.1-2

Copied: tags/maven-site-plugin/2.1-2/debian/README.source (from rev 14840, trunk/maven-site-plugin/debian/README.source)
===================================================================
--- tags/maven-site-plugin/2.1-2/debian/README.source	                        (rev 0)
+++ tags/maven-site-plugin/2.1-2/debian/README.source	2011-09-11 20:47:33 UTC (rev 14843)
@@ -0,0 +1,9 @@
+Information about maven-site-plugin
+------------------------------
+
+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.

Copied: tags/maven-site-plugin/2.1-2/debian/TODO (from rev 14841, trunk/maven-site-plugin/debian/TODO)
===================================================================
--- tags/maven-site-plugin/2.1-2/debian/TODO	                        (rev 0)
+++ tags/maven-site-plugin/2.1-2/debian/TODO	2011-09-11 20:47:33 UTC (rev 14843)
@@ -0,0 +1 @@
+- fix test failures

Deleted: tags/maven-site-plugin/2.1-2/debian/build.properties
===================================================================
--- trunk/maven-site-plugin/debian/build.properties	2011-09-11 19:55:23 UTC (rev 14837)
+++ tags/maven-site-plugin/2.1-2/debian/build.properties	2011-09-11 20:47:33 UTC (rev 14843)
@@ -1,4 +0,0 @@
-javadoc.dir=target/api
-build.directory=target
-maven.test.skip=true
-maven.generate.target=plugin:descriptor

Deleted: tags/maven-site-plugin/2.1-2/debian/changelog
===================================================================
--- trunk/maven-site-plugin/debian/changelog	2011-09-11 19:55:23 UTC (rev 14837)
+++ tags/maven-site-plugin/2.1-2/debian/changelog	2011-09-11 20:47:33 UTC (rev 14843)
@@ -1,55 +0,0 @@
-maven-site-plugin (2.1-1) unstable; urgency=low
-
-  [ Michael Koch ]
-  * Added myself to Uploaders.
-
-  [ Gabriele Giacone ]
-  * New upstream release.
-  * Moved libjetty-java from Suggests to Depends as it's a maven compile
-    dependency
-  * Removed doxia1.1 patch
-  * Updated Standards-Version to 3.8.4.
-  * Source format 3.0 (quilt)
-
- -- Gabriele Giacone <1o5g4r8o at gmail.com>  Fri, 26 Feb 2010 02:08:09 +0100
-
-maven-site-plugin (2.0-2) unstable; urgency=low
-
-  * Upload to unstable.
-
- -- Torsten Werner <twerner at debian.org>  Fri, 14 Aug 2009 15:19:07 +0200
-
-maven-site-plugin (2.0-1) experimental; urgency=low
-
-  * New upstream version, add myself to Uploaders
-  * Bump up debhelper to 6
-  * Migrate the build from cdbs-maven to cdbs-ant as Maven uses
-    this plugin for its build, reorganize Build-Depends to use
-    only what's needed now.
-  * Add a Build-Depends-Indep dependency on maven-repo-helper
-  * Use mh_installpom and mh_installjar to install the POM and the jar to the
-    Maven repository
-  * Remove the patch for the POM as it's no longer needed
-  * Remove Depends on Java runtimes as it is a library
-  * Change the dependency from libtomcat6-java to libjetty-java
-    (going back to the original code in maven-site-plugin),
-    made this dependency optional (Suggests:) as it's not needed
-    most of the time.
-  * Add a patch to support Doxia 1.1
-
- -- Ludovic Claude <ludovic.claude at laposte.net>  Tue, 14 Jul 2009 15:26:39 +0100
-
-maven-site-plugin (2.0~beta7-2) unstable; urgency=low
-
-  * Switch to libtomcat6-java. (Closes: #533147)
-  * Change Section: java.
-  * Update Standards-Version: 3.8.2.
-  * Switch to GPL-3 in debian/copyright.
-
- -- Torsten Werner <twerner at debian.org>  Tue, 07 Jul 2009 23:23:54 +0200
-
-maven-site-plugin (2.0~beta7-1) unstable; urgency=low
-
-  * Initial release. (Closes: #508848)
-
- -- Torsten Werner <twerner at debian.org>  Tue, 06 Jan 2009 22:19:18 +0100

Copied: tags/maven-site-plugin/2.1-2/debian/changelog (from rev 14840, trunk/maven-site-plugin/debian/changelog)
===================================================================
--- tags/maven-site-plugin/2.1-2/debian/changelog	                        (rev 0)
+++ tags/maven-site-plugin/2.1-2/debian/changelog	2011-09-11 20:47:33 UTC (rev 14843)
@@ -0,0 +1,66 @@
+maven-site-plugin (2.1-2) unstable; urgency=low
+
+  * Remove Build-Depends: quilt.
+  * Switch to default-jdk.
+  * Update Standards-Version: 3.9.2.
+  * Use Maven to build the package. Ignore test failures.
+  * Change license of debian/* to Apache-2.0.
+  * Add a documentation package.
+
+ -- Torsten Werner <twerner at debian.org>  Sun, 11 Sep 2011 22:26:05 +0200
+
+maven-site-plugin (2.1-1) unstable; urgency=low
+
+  [ Michael Koch ]
+  * Added myself to Uploaders.
+
+  [ Gabriele Giacone ]
+  * New upstream release.
+  * Moved libjetty-java from Suggests to Depends as it's a maven compile
+    dependency
+  * Removed doxia1.1 patch
+  * Updated Standards-Version to 3.8.4.
+  * Source format 3.0 (quilt)
+
+ -- Gabriele Giacone <1o5g4r8o at gmail.com>  Fri, 26 Feb 2010 02:08:09 +0100
+
+maven-site-plugin (2.0-2) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Torsten Werner <twerner at debian.org>  Fri, 14 Aug 2009 15:19:07 +0200
+
+maven-site-plugin (2.0-1) experimental; urgency=low
+
+  * New upstream version, add myself to Uploaders
+  * Bump up debhelper to 6
+  * Migrate the build from cdbs-maven to cdbs-ant as Maven uses
+    this plugin for its build, reorganize Build-Depends to use
+    only what's needed now.
+  * Add a Build-Depends-Indep dependency on maven-repo-helper
+  * Use mh_installpom and mh_installjar to install the POM and the jar to the
+    Maven repository
+  * Remove the patch for the POM as it's no longer needed
+  * Remove Depends on Java runtimes as it is a library
+  * Change the dependency from libtomcat6-java to libjetty-java
+    (going back to the original code in maven-site-plugin),
+    made this dependency optional (Suggests:) as it's not needed
+    most of the time.
+  * Add a patch to support Doxia 1.1
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Tue, 14 Jul 2009 15:26:39 +0100
+
+maven-site-plugin (2.0~beta7-2) unstable; urgency=low
+
+  * Switch to libtomcat6-java. (Closes: #533147)
+  * Change Section: java.
+  * Update Standards-Version: 3.8.2.
+  * Switch to GPL-3 in debian/copyright.
+
+ -- Torsten Werner <twerner at debian.org>  Tue, 07 Jul 2009 23:23:54 +0200
+
+maven-site-plugin (2.0~beta7-1) unstable; urgency=low
+
+  * Initial release. (Closes: #508848)
+
+ -- Torsten Werner <twerner at debian.org>  Tue, 06 Jan 2009 22:19:18 +0100

Deleted: tags/maven-site-plugin/2.1-2/debian/control
===================================================================
--- trunk/maven-site-plugin/debian/control	2011-09-11 19:55:23 UTC (rev 14837)
+++ tags/maven-site-plugin/2.1-2/debian/control	2011-09-11 20:47:33 UTC (rev 14843)
@@ -1,37 +0,0 @@
-Source: maven-site-plugin
-Section: java
-Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Torsten Werner <twerner at debian.org>, Ludovic Claude <ludovic.claude at laposte.net>,
- Michael Koch <konqueror at gmx.de>
-Build-Depends: debhelper (>= 7), cdbs, openjdk-6-jdk, quilt,
- maven-ant-helper (>> 4), ant-optional
-Build-Depends-Indep: maven-repo-helper, junit, libmaven-plugin-tools-java,
- libplexus-velocity-java, velocity, libmaven-doxia-tools-java, libjetty-java
-Standards-Version: 3.8.4
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-site-plugin
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-site-plugin/
-Homepage: http://maven.apache.org/plugins/maven-site-plugin/
-
-Package: libmaven-site-plugin-java
-Architecture: all
-Depends: ${misc:Depends}, libmaven-doxia-tools-java, libjetty-java
-Description: Maven Site Plugin for generating a site
- 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 2 Site Plugin is used to generate a site for the project. The
- generated site also includes the project's reports that were configured in the
- <reporting>  section of the POM.

Copied: tags/maven-site-plugin/2.1-2/debian/control (from rev 14842, trunk/maven-site-plugin/debian/control)
===================================================================
--- tags/maven-site-plugin/2.1-2/debian/control	                        (rev 0)
+++ tags/maven-site-plugin/2.1-2/debian/control	2011-09-11 20:47:33 UTC (rev 14843)
@@ -0,0 +1,66 @@
+Source: maven-site-plugin
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Torsten Werner <twerner at debian.org>, Ludovic Claude <ludovic.claude at laposte.net>,
+ Michael Koch <konqueror at gmx.de>
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4)
+Build-Depends-Indep: libmaven-plugin-tools-java, libdoxia-java, libdoxia-sitetools-java, libjetty-java,  
+ libmaven-doxia-tools-java, libmaven2-core-java, libplexus-archiver-java,  
+ libplexus-container-default-java, libplexus-i18n-java, libplexus-utils-java,  
+ libwagon-java, libmaven-plugin-testing-java, default-jdk-doc, libdoxia-java-doc,  
+ libjetty-java-doc, libmaven2-core-java-doc, libplexus-container-default-java-doc,  
+ libplexus-utils-java-doc, libwagon-java-doc, libmaven-javadoc-plugin-java 
+Standards-Version: 3.9.2
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-site-plugin
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-site-plugin/
+Homepage: http://maven.apache.org/plugins/maven-site-plugin/
+
+Package: libmaven-site-plugin-java
+Architecture: all
+Depends: ${misc:Depends}, ${maven:Depends}
+Recommends: ${maven:OptionalDepends}
+Suggests: libmaven-site-plugin-java-doc
+Description: Maven Site Plugin for generating a site
+ 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 2 Site Plugin is used to generate a site for the project. The
+ generated site also includes the project's reports that were configured in the
+ <reporting>  section of the POM.
+
+Package: libmaven-site-plugin-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}, ${maven:DocDepends}
+Recommends: ${maven:DocOptionalDepends}
+Suggests: libmaven-site-plugin-java
+Description: Documentation for Maven Site Plugin
+ 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
+ .
+ This package contains the API documentation of libmaven-site-plugin-java.

Deleted: tags/maven-site-plugin/2.1-2/debian/copyright
===================================================================
--- trunk/maven-site-plugin/debian/copyright	2011-09-11 19:55:23 UTC (rev 14837)
+++ tags/maven-site-plugin/2.1-2/debian/copyright	2011-09-11 20:47:33 UTC (rev 14843)
@@ -1,22 +0,0 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
-Name: Maven Site Plugin
-Maintainer: Apache Maven team
-Source: http://maven.apache.org/
-
-Files: *
-Copyright: 2001-2009, The Apache Software Foundation.
-License: Apache-2.0
-
-Files: debian/*
-Copyright: 2008, Torsten Werner <twerner at debian.org>.
-License: GPL-3
-
-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'.
-
-License: GPL-3
-  On Debian GNU/Linux system you can find the complete text of the
-  GNU General Public License version 3 license in 
-  '/usr/share/common-licenses/GPL-3'.
-

Copied: tags/maven-site-plugin/2.1-2/debian/copyright (from rev 14840, trunk/maven-site-plugin/debian/copyright)
===================================================================
--- tags/maven-site-plugin/2.1-2/debian/copyright	                        (rev 0)
+++ tags/maven-site-plugin/2.1-2/debian/copyright	2011-09-11 20:47:33 UTC (rev 14843)
@@ -0,0 +1,16 @@
+Format-Specification: http://dep.debian.net/deps/dep5/
+Name: Maven Site Plugin
+Maintainer: Apache Maven team
+Source: http://maven.apache.org/
+
+Files: *
+Copyright: 2001-2009, The Apache Software Foundation.
+License: Apache-2.0
+
+Files: debian/*
+Copyright: 2008-2011, Torsten Werner <twerner at debian.org>.
+License: 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'.

Copied: tags/maven-site-plugin/2.1-2/debian/libmaven-site-plugin-java-doc.doc-base.api (from rev 14840, trunk/maven-site-plugin/debian/libmaven-site-plugin-java-doc.doc-base.api)
===================================================================
--- tags/maven-site-plugin/2.1-2/debian/libmaven-site-plugin-java-doc.doc-base.api	                        (rev 0)
+++ tags/maven-site-plugin/2.1-2/debian/libmaven-site-plugin-java-doc.doc-base.api	2011-09-11 20:47:33 UTC (rev 14843)
@@ -0,0 +1,10 @@
+Document: libmaven-site-plugin-java
+Title: API Javadoc for Maven Site Plugin
+Author: Maven Site Plugin developers
+Abstract: This is the API Javadoc provided for the
+ libmaven-site-plugin-java library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libmaven-site-plugin-java/api/index.html
+Files: /usr/share/doc/libmaven-site-plugin-java/api/*

Copied: tags/maven-site-plugin/2.1-2/debian/libmaven-site-plugin-java-doc.install (from rev 14840, trunk/maven-site-plugin/debian/libmaven-site-plugin-java-doc.install)
===================================================================
--- tags/maven-site-plugin/2.1-2/debian/libmaven-site-plugin-java-doc.install	                        (rev 0)
+++ tags/maven-site-plugin/2.1-2/debian/libmaven-site-plugin-java-doc.install	2011-09-11 20:47:33 UTC (rev 14843)
@@ -0,0 +1,2 @@
+target/apidocs/* usr/share/doc/libmaven-site-plugin-java/api
+

Deleted: tags/maven-site-plugin/2.1-2/debian/libmaven-site-plugin-java.poms
===================================================================
--- trunk/maven-site-plugin/debian/libmaven-site-plugin-java.poms	2011-09-11 19:55:23 UTC (rev 14837)
+++ tags/maven-site-plugin/2.1-2/debian/libmaven-site-plugin-java.poms	2011-09-11 20:47:33 UTC (rev 14843)
@@ -1 +0,0 @@
-pom.xml --no-parent

Copied: tags/maven-site-plugin/2.1-2/debian/libmaven-site-plugin-java.poms (from rev 14840, trunk/maven-site-plugin/debian/libmaven-site-plugin-java.poms)
===================================================================
--- tags/maven-site-plugin/2.1-2/debian/libmaven-site-plugin-java.poms	                        (rev 0)
+++ tags/maven-site-plugin/2.1-2/debian/libmaven-site-plugin-java.poms	2011-09-11 20:47:33 UTC (rev 14843)
@@ -0,0 +1,26 @@
+# 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

Deleted: tags/maven-site-plugin/2.1-2/debian/maven-settings.xml
===================================================================
--- trunk/maven-site-plugin/debian/maven-settings.xml	2011-09-11 19:55:23 UTC (rev 14837)
+++ tags/maven-site-plugin/2.1-2/debian/maven-settings.xml	2011-09-11 20:47:33 UTC (rev 14843)
@@ -1,9 +0,0 @@
-<!--
-  This is a minimal settings.xml that switches maven to offline mode
-  and uses the Debian repo as the local repo.
--->
-
-<settings>
-  <localRepository>/usr/share/maven-repo</localRepository>
-  <offline>true</offline>
-</settings>

Copied: tags/maven-site-plugin/2.1-2/debian/maven.cleanIgnoreRules (from rev 14840, trunk/maven-site-plugin/debian/maven.cleanIgnoreRules)
===================================================================
--- tags/maven-site-plugin/2.1-2/debian/maven.cleanIgnoreRules	                        (rev 0)
+++ tags/maven-site-plugin/2.1-2/debian/maven.cleanIgnoreRules	2011-09-11 20:47:33 UTC (rev 14843)
@@ -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/
+

Copied: tags/maven-site-plugin/2.1-2/debian/maven.ignoreRules (from rev 14840, trunk/maven-site-plugin/debian/maven.ignoreRules)
===================================================================
--- tags/maven-site-plugin/2.1-2/debian/maven.ignoreRules	                        (rev 0)
+++ tags/maven-site-plugin/2.1-2/debian/maven.ignoreRules	2011-09-11 20:47:33 UTC (rev 14843)
@@ -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-project-info-reports-plugin * * * *

Copied: tags/maven-site-plugin/2.1-2/debian/maven.properties (from rev 14840, trunk/maven-site-plugin/debian/maven.properties)
===================================================================
--- tags/maven-site-plugin/2.1-2/debian/maven.properties	                        (rev 0)
+++ tags/maven-site-plugin/2.1-2/debian/maven.properties	2011-09-11 20:47:33 UTC (rev 14843)
@@ -0,0 +1,5 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+# maven.test.skip=true
+
+maven.test.failure.ignore=true

Copied: tags/maven-site-plugin/2.1-2/debian/maven.publishedRules (from rev 14840, trunk/maven-site-plugin/debian/maven.publishedRules)
===================================================================
--- tags/maven-site-plugin/2.1-2/debian/maven.publishedRules	                        (rev 0)
+++ tags/maven-site-plugin/2.1-2/debian/maven.publishedRules	2011-09-11 20:47:33 UTC (rev 14843)
@@ -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/
+

Deleted: tags/maven-site-plugin/2.1-2/debian/maven.rules
===================================================================
--- trunk/maven-site-plugin/debian/maven.rules	2011-09-11 19:55:23 UTC (rev 14837)
+++ tags/maven-site-plugin/2.1-2/debian/maven.rules	2011-09-11 20:47:33 UTC (rev 14843)
@@ -1,4 +0,0 @@
-# keep the version for all Maven plugins as versionless plugins don't work
-* * maven-plugin *
-junit junit jar s/3\..*/3.x/
-org.mortbay.jetty * * s/6\..*/6.x/

Copied: tags/maven-site-plugin/2.1-2/debian/maven.rules (from rev 14840, trunk/maven-site-plugin/debian/maven.rules)
===================================================================
--- tags/maven-site-plugin/2.1-2/debian/maven.rules	                        (rev 0)
+++ tags/maven-site-plugin/2.1-2/debian/maven.rules	2011-09-11 20:47:33 UTC (rev 14843)
@@ -0,0 +1,34 @@
+# 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.apache.maven.doxia doxia-decoration-model jar s/.*/debian/ * *
+org.apache.maven.doxia doxia-logging-api jar s/.*/debian/ * *
+org.apache.maven.doxia doxia-module-apt jar s/.*/debian/ * *
+org.apache.maven.doxia doxia-module-fml jar s/.*/debian/ * *
+org.apache.maven.doxia doxia-module-xdoc jar s/.*/debian/ * *
+org.apache.maven.doxia doxia-module-xhtml jar s/.*/debian/ * *
+org.apache.maven.doxia doxia-sink-api jar s/.*/debian/ * *
+org.apache.maven.doxia doxia-site-renderer jar s/.*/debian/ * *
+org.apache.maven.shared maven-doxia-tools jar s/.*/debian/ * *
+org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ * *
+org.mortbay.jetty * * s/6\..*/6.x/ * *
+s/velocity/org.apache.velocity/ * * s/.*/debian/ * *
+s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-harness * s/.*/debian/ * *
+s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-tools * s/.*/debian/ * *
+s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing * s/.*/debian/ * *
+s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-test-tools * s/.*/debian/ * *

Deleted: tags/maven-site-plugin/2.1-2/debian/rules
===================================================================
--- trunk/maven-site-plugin/debian/rules	2011-09-11 19:55:23 UTC (rev 14837)
+++ tags/maven-site-plugin/2.1-2/debian/rules	2011-09-11 20:47:33 UTC (rev 14843)
@@ -1,30 +0,0 @@
-#!/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/rules/patchsys-quilt.mk
-
-PACKAGE              := $(DEB_SOURCE_PACKAGE)
-VERSION              := $(DEB_UPSTREAM_VERSION)
-JAVA_HOME            := /usr/lib/jvm/java-6-openjdk
-DEB_JARS             := ant-nodeps maven-core maven-model maven-plugin-api \
-  maven-project maven-artifact maven-artifact-manager maven-settings \
-  maven-reporting-api maven-doxia-tools doxia-core doxia-logging-api \
-  doxia-sink-api doxia-module-xhtml doxia-decoration-model doxia-module-xdoc \
-  doxia-site-renderer wagon-provider-api plexus-archiver \
-  plexus-container-default-alpha plexus-i18n plexus-utils jetty jetty-util \
-  jetty-util5 commons-lang servlet-api-2.5 classworlds
-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
-
-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

Copied: tags/maven-site-plugin/2.1-2/debian/rules (from rev 14840, trunk/maven-site-plugin/debian/rules)
===================================================================
--- tags/maven-site-plugin/2.1-2/debian/rules	                        (rev 0)
+++ tags/maven-site-plugin/2.1-2/debian/rules	2011-09-11 20:47:33 UTC (rev 14843)
@@ -0,0 +1,9 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/maven.mk
+
+JAVA_HOME := /usr/lib/jvm/default-java
+
+get-orig-source:
+	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename

Deleted: tags/maven-site-plugin/2.1-2/debian/watch
===================================================================
--- trunk/maven-site-plugin/debian/watch	2011-09-11 19:55:23 UTC (rev 14837)
+++ tags/maven-site-plugin/2.1-2/debian/watch	2011-09-11 20:47:33 UTC (rev 14843)
@@ -1,4 +0,0 @@
-version=3
-opts=uversionmangle=s{-beta-}{~beta} \
-  http://svn.apache.org/repos/asf/maven/plugins/tags/ \
-  maven-site-plugin-(.*)/ debian debian/orig-tar.sh

Copied: tags/maven-site-plugin/2.1-2/debian/watch (from rev 14840, trunk/maven-site-plugin/debian/watch)
===================================================================
--- tags/maven-site-plugin/2.1-2/debian/watch	                        (rev 0)
+++ tags/maven-site-plugin/2.1-2/debian/watch	2011-09-11 20:47:33 UTC (rev 14843)
@@ -0,0 +1,4 @@
+version=3
+opts="uversionmangle=s/-(alpha|beta)-/~$1/" \
+  http://svn.apache.org/repos/asf/maven/plugins/tags/ \
+  maven-site-plugin-(\d.*)/ debian debian/orig-tar.sh




More information about the pkg-java-commits mailing list