[pkg-java] r14792 - in branches/doxia: . maven/debian

Torsten Werner twerner at alioth.debian.org
Fri Sep 9 15:50:03 UTC 2011


Author: twerner
Date: 2011-09-09 15:50:02 +0000 (Fri, 09 Sep 2011)
New Revision: 14792

Added:
   branches/doxia/maven/
   branches/doxia/maven/debian/README.source
   branches/doxia/maven/debian/changelog
   branches/doxia/maven/debian/control
   branches/doxia/maven/debian/libdoxia-java-doc.doc-base.api
   branches/doxia/maven/debian/libdoxia-java-doc.install
   branches/doxia/maven/debian/maven.cleanIgnoreRules
   branches/doxia/maven/debian/maven.properties
   branches/doxia/maven/debian/maven.publishedRules
   branches/doxia/maven/debian/orig-tar.sh
Removed:
   branches/doxia/maven/debian/build.properties
   branches/doxia/maven/debian/build.xml
   branches/doxia/maven/debian/changelog
   branches/doxia/maven/debian/control
   branches/doxia/maven/debian/doxia-book-components.xml
   branches/doxia/maven/debian/doxia-core-components.xml
   branches/doxia/maven/debian/doxia-module-apt-components.xml
   branches/doxia/maven/debian/doxia-module-confluence-components.xml
   branches/doxia/maven/debian/doxia-module-docbook-simple-components.xml
   branches/doxia/maven/debian/doxia-module-fml-components.xml
   branches/doxia/maven/debian/doxia-module-fo-components.xml
   branches/doxia/maven/debian/doxia-module-itext-components.xml
   branches/doxia/maven/debian/doxia-module-latex-components.xml
   branches/doxia/maven/debian/doxia-module-rtf-components.xml
   branches/doxia/maven/debian/doxia-module-twiki-components.xml
   branches/doxia/maven/debian/doxia-module-xdoc-components.xml
   branches/doxia/maven/debian/doxia-module-xhtml-components.xml
   branches/doxia/maven/debian/libdoxia-java-doc.doc-base
   branches/doxia/maven/debian/orig-tar.sh
Modified:
   branches/doxia/maven/debian/libdoxia-java.poms
   branches/doxia/maven/debian/maven.ignoreRules
   branches/doxia/maven/debian/maven.rules
   branches/doxia/maven/debian/rules
   branches/doxia/maven/debian/watch
Log:
switch to Maven (but does not build yet)


Added: branches/doxia/maven/debian/README.source
===================================================================
--- branches/doxia/maven/debian/README.source	                        (rev 0)
+++ branches/doxia/maven/debian/README.source	2011-09-09 15:50:02 UTC (rev 14792)
@@ -0,0 +1,9 @@
+Information about doxia
+------------------------------
+
+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: branches/doxia/maven/debian/build.properties
===================================================================
--- trunk/doxia/debian/build.properties	2011-09-09 14:21:04 UTC (rev 14786)
+++ branches/doxia/maven/debian/build.properties	2011-09-09 15:50:02 UTC (rev 14792)
@@ -1,27 +0,0 @@
-javadoc.dir=build/api
-maven.test.skip=true
-classpath.compile = \
-                    ${basedir}/doxia-logging-api/build/doxia-logging-api-${version}.jar:\
-                    ${basedir}/doxia-sink-api/build/doxia-sink-api-${version}.jar:\
-                    ${basedir}/doxia-core/build/doxia-core-${version}.jar:\
-                    ${basedir}/doxia-modules/doxia-module-apt/build/doxia-module-apt-${version}.jar:\
-                    ${basedir}/doxia-modules/doxia-module-docbook-simple/build/doxia-module-docbook-simple-${version}.jar:\
-                    ${basedir}/doxia-modules/doxia-module-itext/build/doxia-module-itext-${version}.jar:\
-                    ${basedir}/doxia-modules/doxia-module-latex/build/doxia-module-latex-${version}.jar:\
-                    ${basedir}/doxia-modules/doxia-module-xdoc/build/doxia-module-xdoc-${version}.jar:\
-                    ${basedir}/doxia-modules/doxia-module-xhtml/build/doxia-module-xhtml-${version}.jar:\
-                    /usr/share/java/plexus-container-default.jar:\
-                    /usr/share/java/plexus-i18n.jar:\
-                    /usr/share/java/plexus-utils.jar:\
-                    /usr/share/java/plexus-velocity.jar:\
-                    /usr/share/java/velocity.jar:\
-                    /usr/share/java/modello-core.jar:\
-                    /usr/share/java/modello-plugin-xml.jar:\
-                    /usr/share/java/modello-plugin-xpp3.jar:\
-                    /usr/share/java/modello-plugin-xsd.jar:\
-                    /usr/share/java/maven-ant-helper.jar:\
-                    /usr/share/java/commons-configuration.jar:\
-                    /usr/share/java/commons-lang.jar:\
-                    /usr/share/java/commons-httpclient.jar:\
-                    /usr/share/java/fop.jar:\
-                    /usr/share/java/itext1.jar

Deleted: branches/doxia/maven/debian/build.xml
===================================================================
--- trunk/doxia/debian/build.xml	2011-09-09 14:21:04 UTC (rev 14786)
+++ branches/doxia/maven/debian/build.xml	2011-09-09 15:50:02 UTC (rev 14792)
@@ -1,100 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="pkg-java" default="package" basedir="..">
-
-    <property file="debian/build.properties"/>
-    <property name="maven.build" value="/usr/share/maven-ant-helper/maven-build.xml"/>
-    <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/>
-
-    <macrodef name="cleanmodule">
-	    <attribute name="dir"/>
-	    <sequential>
-		  <ant target="clean" antfile="${maven.build}" dir="@{dir}">
-            <property name="debian.dir" location="debian" />
-            <property name="project.dir" value="@{dir}" />
-          </ant> 
-	    </sequential>
-    </macrodef>
-
-    <macrodef name="packagemodule">
-	    <attribute name="dir"/>
-	    <sequential>
-		<ant target="package" antfile="${maven.build}" dir="@{dir}">
-          <property name="debian.dir" location="debian" />
-          <property name="project.dir" value="@{dir}" />
-		</ant>
-	    </sequential>
-    </macrodef>
-
-    <target name="clean">
-        <delete dir="build"/>
-        <cleanmodule dir="doxia-logging-api"/>
-        <cleanmodule dir="doxia-logging-api"/>
-        <cleanmodule dir="doxia-sink-api"/>
-        <cleanmodule dir="doxia-core"/>
-        <cleanmodule dir="doxia-book"/>
-        <cleanmodule dir="doxia-modules/doxia-module-apt"/>
-        <cleanmodule dir="doxia-modules/doxia-module-confluence"/>
-        <cleanmodule dir="doxia-modules/doxia-module-docbook-simple"/>
-        <cleanmodule dir="doxia-modules/doxia-module-fml"/>
-        <cleanmodule dir="doxia-modules/doxia-module-fo"/>
-        <cleanmodule dir="doxia-modules/doxia-module-itext"/>
-        <cleanmodule dir="doxia-modules/doxia-module-latex"/>
-        <cleanmodule dir="doxia-modules/doxia-module-rtf"/>
-        <cleanmodule dir="doxia-modules/doxia-module-twiki"/>
-        <cleanmodule dir="doxia-modules/doxia-module-xdoc"/>
-        <cleanmodule dir="doxia-modules/doxia-module-xhtml"/>
-    </target>
-
-    <target name="generate-sources">
-        <taskdef name="modello" classname="ModelloTask" classpath="/usr/share/java/maven-ant-helper.jar:/usr/share/java/modello-core.jar:/usr/share/java/modello-plugin-xml.jar:/usr/share/java/modello-plugin-xpp3.jar"/>
-        <modello model="doxia-core/src/main/mdo/document.mdo" plugin="java" output="doxia-core/build/generated-sources" version="1.0.0"/>
-        <modello model="doxia-core/src/main/mdo/document.mdo" plugin="xpp3-reader" output="doxia-core/build/generated-sources" version="1.0.0"/>
-        <modello model="doxia-core/src/main/mdo/document.mdo" plugin="xpp3-writer" output="doxia-core/build/generated-sources" version="1.0.0"/>
-        <modello model="doxia-core/src/main/mdo/document.mdo" plugin="xsd" output="doxia-core/build/generated-sources" version="1.0.0"/>
-        <modello model="doxia-book/src/main/modello/book.mdo" plugin="java" output="doxia-book/build/generated-sources" version="1.0.0"/>
-        <modello model="doxia-book/src/main/modello/book.mdo" plugin="xpp3-reader" output="doxia-book/build/generated-sources" version="1.0.0"/>
-        <modello model="doxia-book/src/main/modello/book.mdo" plugin="xsd" output="doxia-book/build/generated-sources" version="1.0.0"/>
-        <modello model="doxia-modules/doxia-module-fml/src/main/mdo/fml.mdo" plugin="java" output="doxia-modules/doxia-module-fml/build/generated-sources" version="1.0.0"/>
-    </target>
-
-    <target name="package" depends="generate-sources">
-        <packagemodule dir=""/>
-        <packagemodule dir="doxia-logging-api"/>
-        <packagemodule dir="doxia-sink-api"/>
-        <packagemodule dir="doxia-core"/>
-        <packagemodule dir="doxia-modules/doxia-module-apt"/>
-        <packagemodule dir="doxia-modules/doxia-module-confluence"/>
-        <packagemodule dir="doxia-modules/doxia-module-docbook-simple"/>
-        <packagemodule dir="doxia-modules/doxia-module-fml"/>
-        <packagemodule dir="doxia-modules/doxia-module-fo"/>
-        <packagemodule dir="doxia-modules/doxia-module-itext"/>
-        <packagemodule dir="doxia-modules/doxia-module-latex"/>
-        <packagemodule dir="doxia-modules/doxia-module-rtf"/>
-        <packagemodule dir="doxia-modules/doxia-module-twiki"/>
-        <packagemodule dir="doxia-modules/doxia-module-xdoc"/>
-        <packagemodule dir="doxia-modules/doxia-module-xhtml"/>
-        <packagemodule dir="doxia-book"/>
-    </target>
-
-    <target name="javadoc">
-        <javadoc destdir="${javadoc.dir}">
-            <packageset dir="doxia-core/src/main/java/"/>
-            <packageset dir="doxia-book/src/main/java/"/>
-            <packageset dir="doxia-logging-api/src/main/java/"/>
-            <packageset dir="doxia-sink-api/src/main/java/"/>
-            <packageset dir="doxia-modules/doxia-module-apt/src/main/java/"/>
-            <packageset dir="doxia-modules/doxia-module-confluence/src/main/java/"/>
-            <packageset dir="doxia-modules/doxia-module-docbook-simple/src/main/java/"/>
-            <packageset dir="doxia-modules/doxia-module-fml/src/main/java/"/>
-            <packageset dir="doxia-modules/doxia-module-fo/src/main/java/"/>
-            <packageset dir="doxia-modules/doxia-module-itext/src/main/java/"/>
-            <packageset dir="doxia-modules/doxia-module-latex/src/main/java/"/>
-            <packageset dir="doxia-modules/doxia-module-rtf/src/main/java/"/>
-            <packageset dir="doxia-modules/doxia-module-twiki/src/main/java/"/>
-            <packageset dir="doxia-modules/doxia-module-xdoc/src/main/java/"/>
-            <packageset dir="doxia-modules/doxia-module-xhtml/src/main/java/"/>
-        </javadoc>
-    </target>
-
-</project>

Deleted: branches/doxia/maven/debian/changelog
===================================================================
--- trunk/doxia/debian/changelog	2011-09-09 14:21:04 UTC (rev 14786)
+++ branches/doxia/maven/debian/changelog	2011-09-09 15:50:02 UTC (rev 14792)
@@ -1,114 +0,0 @@
-doxia (1.1.2-2) UNRELEASED; urgency=low
-
-  * Team upload.
-
-  [Gabriele Giacone]
-  * Replaced classpath-doc/openjdk-6-doc with default-jdk-doc (Closes: #567272)
-
-  [tony mancill]
-  * Correct minor typos in long description (Closes: #612365)
-
- -- tony mancill <tmancill at debian.org>  Mon, 07 Feb 2011 20:51:50 -0800
-
-doxia (1.1.2-1) unstable; urgency=low
-
-  * New upstream release.
-  * Standards-Version to 3.8.4.
-  * Source format 3.0 (quilt)
-    - removed quilt as build dependency
-    - removed README.source
-
- -- Gabriele Giacone <1o5g4r8o at gmail.com>  Fri, 26 Feb 2010 00:58:38 +0100
-
-doxia (1.1.1-1) unstable; urgency=low
-
-  * New upstream release.
-  * Build-Depends/Recommends libcommons-httpclient-java (>= 3.1-6).
-  * Build-Depends on debhelper (>= 7).
-  * Updated to Standards-Version 3.8.3.
-
- -- Michael Koch <konqueror at gmx.de>  Thu, 01 Oct 2009 08:03:40 +0200
-
-doxia (1.1-3) unstable; urgency=low
-
-  * Upload to unstable.
-
- -- Torsten Werner <twerner at debian.org>  Sun, 09 Aug 2009 10:47:26 +0200
-
-doxia (1.1-2) experimental; urgency=low
-
-  [ Ludovic Claude ]
-  * Remove test dependencies from Maven POM descriptors
-
-  [ Torsten Werner ]
-  * Remove extra Build-Depends-Indep: ant.
-
- -- Torsten Werner <twerner at debian.org>  Mon, 03 Aug 2009 21:33:12 +0200
-
-doxia (1.1-1) experimental; urgency=low
-
-  [ Ludovic Claude ]
-  * New upstream version (Closes: #520760)
-  * Add myself to uploaders
-  * Add the Maven POMs to the package,
-  * 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 itext.diff, use a dependency on libitext1-java 
-    instead to keep using version 1.x of iText.
-  * Add a dependency on fop and libcommons-configuration-java to build the new 
-    doxia-module-fo
-  * Remove the dependency on libplexus-container-default-java, it's replaced
-    by a transitive dependency on libplexus-containers-java (from 
-    libplexus-i18n-java)
-  * Remove the dependency on classpath-doc on the java-doc package,
-    it's not needed
-  * Remove full text of the Apache 2.0 license from debian/copyright
-
-  [ Torsten Werner ]
-  * Add missing Build-Depends: libcommons-lang-java.
-  * Upload to experimental.
-
- -- Torsten Werner <twerner at debian.org>  Mon, 13 Jul 2009 19:55:39 +0200
-
-doxia (1.0-alpha-11-4) unstable; urgency=low
-
-  * Change debian/rules to really use default-jdk. (Closes: #535919)
-
- -- Torsten Werner <twerner at debian.org>  Mon, 06 Jul 2009 22:12:34 +0200
-
-doxia (1.0-alpha-11-3) unstable; urgency=low
-
-  * Add missing Depends: ${misc:Depends}.
-  * Change Section: java.
-  * Update Standards-Version: 3.8.2 (no changes).
-  * Switch to default-jdk. (Closes: #526278)
-
- -- Torsten Werner <twerner at debian.org>  Wed, 01 Jul 2009 22:34:46 +0200
-
-doxia (1.0-alpha-11-2) experimental; urgency=low
-
-  * Improve patch itext.diff.
-
- -- Torsten Werner <twerner at debian.org>  Fri, 28 Nov 2008 16:49:47 +0100
-
-doxia (1.0-alpha-11-1) experimental; urgency=low
-
-  [ Michael Koch ]
-  * Added watch file.
-  * Added Homepage, Vcs-Svn and Vcs-Browser fields.
-  * Added myself to Uploaders.
-
-  [ Torsten Werner ]
-  * new upstream version
-  * Added myself to Uploaders.
-  * Updated Standards-Version to 3.8.0.
-  * Add patch itext.diff.
-
- -- Torsten Werner <twerner at debian.org>  Thu, 27 Nov 2008 20:37:58 +0100
-
-doxia (1.0-alpha-7-1) unstable; urgency=low
-
-  * Initial release. (Closes: #413554)
-
- -- Paul Cager <paul-debian at home.paulcager.org>  Thu, 12 Jul 2007 10:11:17 +0100

Copied: branches/doxia/maven/debian/changelog (from rev 14790, trunk/doxia/debian/changelog)
===================================================================
--- branches/doxia/maven/debian/changelog	                        (rev 0)
+++ branches/doxia/maven/debian/changelog	2011-09-09 15:50:02 UTC (rev 14792)
@@ -0,0 +1,121 @@
+doxia (1.1.4-1) UNRELEASED; urgency=low
+
+  [Gabriele Giacone]
+  * Replaced classpath-doc/openjdk-6-doc with default-jdk-doc (Closes: #567272)
+
+  [tony mancill]
+  * Correct minor typos in long description (Closes: #612365)
+
+  [ Torsten Werner ]
+  * Newer but not newest upstream release.
+    - Add Build-Depends: libhttpcore-java and switch to httpclient 4.
+    - Do not remove maven-plugin from orig tarball.
+  * Remove Trygve and Paul from Uploaders list.
+  * Update Standards-Version: 3.9.2.
+  * Improve short descriptions.
+  * Use Maven to build the package.
+
+ -- Torsten Werner <twerner at debian.org>  Fri, 09 Sep 2011 17:33:03 +0200
+
+doxia (1.1.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * Standards-Version to 3.8.4.
+  * Source format 3.0 (quilt)
+    - removed quilt as build dependency
+    - removed README.source
+
+ -- Gabriele Giacone <1o5g4r8o at gmail.com>  Fri, 26 Feb 2010 00:58:38 +0100
+
+doxia (1.1.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Build-Depends/Recommends libcommons-httpclient-java (>= 3.1-6).
+  * Build-Depends on debhelper (>= 7).
+  * Updated to Standards-Version 3.8.3.
+
+ -- Michael Koch <konqueror at gmx.de>  Thu, 01 Oct 2009 08:03:40 +0200
+
+doxia (1.1-3) unstable; urgency=low
+
+  * Upload to unstable.
+
+ -- Torsten Werner <twerner at debian.org>  Sun, 09 Aug 2009 10:47:26 +0200
+
+doxia (1.1-2) experimental; urgency=low
+
+  [ Ludovic Claude ]
+  * Remove test dependencies from Maven POM descriptors
+
+  [ Torsten Werner ]
+  * Remove extra Build-Depends-Indep: ant.
+
+ -- Torsten Werner <twerner at debian.org>  Mon, 03 Aug 2009 21:33:12 +0200
+
+doxia (1.1-1) experimental; urgency=low
+
+  [ Ludovic Claude ]
+  * New upstream version (Closes: #520760)
+  * Add myself to uploaders
+  * Add the Maven POMs to the package,
+  * 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 itext.diff, use a dependency on libitext1-java 
+    instead to keep using version 1.x of iText.
+  * Add a dependency on fop and libcommons-configuration-java to build the new 
+    doxia-module-fo
+  * Remove the dependency on libplexus-container-default-java, it's replaced
+    by a transitive dependency on libplexus-containers-java (from 
+    libplexus-i18n-java)
+  * Remove the dependency on classpath-doc on the java-doc package,
+    it's not needed
+  * Remove full text of the Apache 2.0 license from debian/copyright
+
+  [ Torsten Werner ]
+  * Add missing Build-Depends: libcommons-lang-java.
+  * Upload to experimental.
+
+ -- Torsten Werner <twerner at debian.org>  Mon, 13 Jul 2009 19:55:39 +0200
+
+doxia (1.0-alpha-11-4) unstable; urgency=low
+
+  * Change debian/rules to really use default-jdk. (Closes: #535919)
+
+ -- Torsten Werner <twerner at debian.org>  Mon, 06 Jul 2009 22:12:34 +0200
+
+doxia (1.0-alpha-11-3) unstable; urgency=low
+
+  * Add missing Depends: ${misc:Depends}.
+  * Change Section: java.
+  * Update Standards-Version: 3.8.2 (no changes).
+  * Switch to default-jdk. (Closes: #526278)
+
+ -- Torsten Werner <twerner at debian.org>  Wed, 01 Jul 2009 22:34:46 +0200
+
+doxia (1.0-alpha-11-2) experimental; urgency=low
+
+  * Improve patch itext.diff.
+
+ -- Torsten Werner <twerner at debian.org>  Fri, 28 Nov 2008 16:49:47 +0100
+
+doxia (1.0-alpha-11-1) experimental; urgency=low
+
+  [ Michael Koch ]
+  * Added watch file.
+  * Added Homepage, Vcs-Svn and Vcs-Browser fields.
+  * Added myself to Uploaders.
+
+  [ Torsten Werner ]
+  * new upstream version
+  * Added myself to Uploaders.
+  * Updated Standards-Version to 3.8.0.
+  * Add patch itext.diff.
+
+ -- Torsten Werner <twerner at debian.org>  Thu, 27 Nov 2008 20:37:58 +0100
+
+doxia (1.0-alpha-7-1) unstable; urgency=low
+
+  * Initial release. (Closes: #413554)
+
+ -- Paul Cager <paul-debian at home.paulcager.org>  Thu, 12 Jul 2007 10:11:17 +0100

Deleted: branches/doxia/maven/debian/control
===================================================================
--- trunk/doxia/debian/control	2011-09-09 14:21:04 UTC (rev 14786)
+++ branches/doxia/maven/debian/control	2011-09-09 15:50:02 UTC (rev 14792)
@@ -1,55 +0,0 @@
-Source: doxia
-Section: java
-Priority: optional
-Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Trygve Laugstol <trygvis at inamo.no>,
- Paul Cager <paul-debian at home.paulcager.org>, Michael Koch <konqueror at gmx.de>,
- Torsten Werner <twerner at debian.org>
-Build-Depends-Indep: maven-repo-helper (>= 0.7), maven-ant-helper (>> 4),
- ant-optional, libmodello-java, default-jdk-doc, libplexus-containers-java,
- libplexus-utils-java, libplexus-i18n-java, libxerces2-java,
- libcommons-configuration-java, fop, liblog4j1.2-java, libjaxp1.3-java,
- libitext1-java, libcommons-httpclient-java
-Build-Depends: ant, debhelper (>= 7), cdbs (>= 0.4.5.3), default-jdk
-Standards-Version: 3.8.4
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/doxia
-Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/doxia
-Homepage: http://maven.apache.org/doxia/
-
-Package: libdoxia-java
-Architecture: all
-Depends: ${misc:Depends}, libplexus-containers-java, libplexus-utils-java,
- libplexus-i18n-java, libxerces2-java
-Recommends: libcommons-configuration-java, fop, liblog4j1.2-java,
- libjaxp1.3-java, libitext1-java, libcommons-httpclient-java
-Suggests: libdoxia-java-doc
-Description: a powerful content generation framework
- Doxia is a content generation framework which aims to provide its users 
- with powerful techniques for generating static and dynamic content.
- .
- Doxia can be used to generate static sites in addition to being 
- incorporated into dynamic content generation systems like blogs, wikis 
- and content management systems.  
- .
- Doxia is used extensively by Maven and it powers the entire 
- documentation system of Maven. It gives Maven the ability to take any 
- document that Doxia supports and output it any format.
-
-Package: libdoxia-java-doc
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}, default-jdk-doc
-Suggests: libdoxia-java
-Description: a powerful content generation framework (javadoc)
- Doxia is a content generation framework which aims to provide its users 
- with powerful techniques for generating static and dynamic content.
- .
- Doxia can be used to generate static sites in addition to being 
- incorporated into dynamic content generation systems like blogs, wikis 
- and content management systems.  
- .
- Doxia is used extensively by Maven and it powers the entire 
- documentation system of Maven. It gives Maven the ability to take any 
- document that Doxia supports and output it any format.
- .
- This package provides the API documentation for Doxia.

Copied: branches/doxia/maven/debian/control (from rev 14789, trunk/doxia/debian/control)
===================================================================
--- branches/doxia/maven/debian/control	                        (rev 0)
+++ branches/doxia/maven/debian/control	2011-09-09 15:50:02 UTC (rev 14792)
@@ -0,0 +1,55 @@
+Source: doxia
+Section: java
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Michael Koch <konqueror at gmx.de>, Torsten Werner <twerner at debian.org>
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4)
+Build-Depends-Indep: libclirr-maven-plugin-java, libmaven-plugin-tools-java, libmaven-shade-plugin-java,  
+ libmodello-maven-plugin-java, libplexus-maven-plugin-java, fop, libcommons-configuration-java,  
+ libcommons-lang-java, libdoxia-sitetools-java, libhttpclient-java, libitext1-java,  
+ liblog4j1.2-java, libmaven-doxia-tools-java, libmaven2-core-java, libplexus-containers-java,  
+ libplexus-i18n-java, libplexus-utils-java, libxerces2-java, junit, libxerces2-java,  
+ default-jdk-doc, libcommons-configuration-java-doc, liblog4j1.2-java-doc,  
+ libmaven2-core-java-doc, libplexus-containers-java-doc, libplexus-utils-java-doc,  
+ libmaven-javadoc-plugin-java 
+Standards-Version: 3.9.2
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/doxia
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/doxia
+Homepage: http://maven.apache.org/doxia/
+
+Package: libdoxia-java
+Architecture: all
+Depends: ${misc:Depends}, ${maven:Depends}
+Recommends: ${maven:OptionalDepends}
+Suggests: libdoxia-java-doc
+Description: powerful content generation framework
+ Doxia is a content generation framework which aims to provide its users 
+ with powerful techniques for generating static and dynamic content.
+ .
+ Doxia can be used to generate static sites in addition to being 
+ incorporated into dynamic content generation systems like blogs, wikis 
+ and content management systems.  
+ .
+ Doxia is used extensively by Maven and it powers the entire 
+ documentation system of Maven. It gives Maven the ability to take any 
+ document that Doxia supports and output it any format.
+
+Package: libdoxia-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}, ${maven:DocDepends}
+Recommends: ${maven:DocOptionalDepends}
+Suggests: libdoxia-java
+Description: Documentation for libdoxia-java
+ Doxia is a content generation framework which aims to provide its users 
+ with powerful techniques for generating static and dynamic content.
+ .
+ Doxia can be used to generate static sites in addition to being 
+ incorporated into dynamic content generation systems like blogs, wikis 
+ and content management systems.  
+ .
+ Doxia is used extensively by Maven and it powers the entire 
+ documentation system of Maven. It gives Maven the ability to take any 
+ document that Doxia supports and output it any format.
+ .
+ This package provides the API documentation for Doxia.

Deleted: branches/doxia/maven/debian/doxia-book-components.xml
===================================================================
--- trunk/doxia/debian/doxia-book-components.xml	2011-09-09 14:21:04 UTC (rev 14786)
+++ branches/doxia/maven/debian/doxia-book-components.xml	2011-09-09 15:50:02 UTC (rev 14792)
@@ -1,130 +0,0 @@
-<component-set>
-  <components>
-    <component>
-      <role>org.apache.maven.doxia.book.services.renderer.BookRenderer</role>
-      <role-hint>rtf</role-hint>
-      <implementation>org.apache.maven.doxia.book.services.renderer.RtfBookRenderer</implementation>
-      <description>RTF book renderer with the <code>iText</code> framework.</description>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.doxia.Doxia</role>
-          <field-name>doxia</field-name>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.apache.maven.doxia.book.services.renderer.BookRenderer</role>
-      <role-hint>pdf</role-hint>
-      <implementation>org.apache.maven.doxia.book.services.renderer.PdfBookRenderer</implementation>
-      <description>PDF book renderer with the <code>iText</code> framework.</description>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.doxia.Doxia</role>
-          <field-name>doxia</field-name>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.apache.maven.doxia.book.services.renderer.BookRenderer</role>
-      <role-hint>xhtml</role-hint>
-      <implementation>org.apache.maven.doxia.book.services.renderer.XHtmlBookRenderer</implementation>
-      <description><p>XHtmlBookRenderer class.</description>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.doxia.Doxia</role>
-          <field-name>doxia</field-name>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.apache.maven.doxia.book.services.renderer.BookRenderer</role>
-      <role-hint>doc-book</role-hint>
-      <implementation>org.apache.maven.doxia.book.services.renderer.DocbookBookRenderer</implementation>
-      <description>An implementation of <code>BookRenderer</code> for docbook</description>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.doxia.Doxia</role>
-          <field-name>doxia</field-name>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.apache.maven.doxia.book.services.renderer.BookRenderer</role>
-      <role-hint>xdoc</role-hint>
-      <implementation>org.apache.maven.doxia.book.services.renderer.XdocBookRenderer</implementation>
-      <description>An implementation of <code>BookRenderer</code> for Xdoc</description>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.doxia.Doxia</role>
-          <field-name>doxia</field-name>
-        </requirement>
-        <requirement>
-          <role>org.codehaus.plexus.i18n.I18N</role>
-          <field-name>i18n</field-name>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.apache.maven.doxia.book.services.renderer.BookRenderer</role>
-      <role-hint>latex</role-hint>
-      <implementation>org.apache.maven.doxia.book.services.renderer.LatexBookRenderer</implementation>
-      <description><p>LatexBookRenderer class.</description>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.doxia.Doxia</role>
-          <field-name>doxia</field-name>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.apache.maven.doxia.book.services.validation.BookValidator</role>
-      <implementation>org.apache.maven.doxia.book.services.validation.DefaultBookValidator</implementation>
-      <description>Default implementation of BookValidator.</description>
-    </component>
-    <component>
-      <role>org.apache.maven.doxia.book.services.io.BookIo</role>
-      <implementation>org.apache.maven.doxia.book.services.io.DefaultBookIo</implementation>
-      <description><p>DefaultBookIo class.</description>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.doxia.module.site.manager.SiteModuleManager</role>
-          <field-name>siteModuleManager</field-name>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.apache.maven.doxia.book.services.indexer.BookIndexer</role>
-      <implementation>org.apache.maven.doxia.book.services.indexer.DefaultBookIndexer</implementation>
-      <description>Default implementation of BookIndexer.</description>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.doxia.Doxia</role>
-          <field-name>doxia</field-name>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.apache.maven.doxia.book.BookDoxia</role>
-      <implementation>org.apache.maven.doxia.book.DefaultBookDoxia</implementation>
-      <description>Default implementation of BookDoxia.</description>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.doxia.book.services.io.BookIo</role>
-          <field-name>bookIo</field-name>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.doxia.book.services.validation.BookValidator</role>
-          <field-name>bookValidator</field-name>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.doxia.book.services.indexer.BookIndexer</role>
-          <field-name>bookIndexer</field-name>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.doxia.book.services.renderer.BookRenderer</role>
-          <field-name>bookRenderers</field-name>
-        </requirement>
-      </requirements>
-    </component>
-  </components>
-</component-set>

Deleted: branches/doxia/maven/debian/doxia-core-components.xml
===================================================================
--- trunk/doxia/debian/doxia-core-components.xml	2011-09-09 14:21:04 UTC (rev 14786)
+++ branches/doxia/maven/debian/doxia-core-components.xml	2011-09-09 15:50:02 UTC (rev 14792)
@@ -1,73 +0,0 @@
-<component-set>
-  <components>
-    <component>
-      <role>org.apache.maven.doxia.parser.manager.ParserManager</role>
-      <implementation>org.apache.maven.doxia.parser.manager.DefaultParserManager</implementation>
-      <description>Simple implementation of the <code>ParserManager</code> interface.</description>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.doxia.parser.Parser</role>
-          <field-name>parsers</field-name>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.apache.maven.doxia.module.site.manager.SiteModuleManager</role>
-      <implementation>org.apache.maven.doxia.module.site.manager.DefaultSiteModuleManager</implementation>
-      <description>Simple implementation of the SiteModuleManager interface.</description>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.doxia.module.site.SiteModule</role>
-          <field-name>siteModules</field-name>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.apache.maven.doxia.macro.Macro</role>
-      <role-hint>echo</role-hint>
-      <implementation>org.apache.maven.doxia.macro.EchoMacro</implementation>
-      <description>A simple macro that prints out the key and value of some supplied parameters.</description>
-    </component>
-    <component>
-      <role>org.apache.maven.doxia.macro.Macro</role>
-      <role-hint>snippet</role-hint>
-      <implementation>org.apache.maven.doxia.macro.snippet.SnippetMacro</implementation>
-      <description>A macro that prints out the content of a file or a URL.</description>
-    </component>
-    <component>
-      <role>org.apache.maven.doxia.macro.Macro</role>
-      <role-hint>swf</role-hint>
-      <implementation>org.apache.maven.doxia.macro.SwfMacro</implementation>
-      <description>Macro for embedding Flash (SWF) within Maven documentation.</description>
-    </component>
-    <component>
-      <role>org.apache.maven.doxia.macro.manager.MacroManager</role>
-      <implementation>org.apache.maven.doxia.macro.manager.DefaultMacroManager</implementation>
-      <description>Default implementation of <code>MacroManager</code></description>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.doxia.macro.Macro</role>
-          <field-name>macros</field-name>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.apache.maven.doxia.macro.Macro</role>
-      <role-hint>toc</role-hint>
-      <implementation>org.apache.maven.doxia.macro.toc.TocMacro</implementation>
-      <description>Macro to display a <code>Table Of Content</code> in a given <code>Sink</code>.</description>
-    </component>
-    <component>
-      <role>org.apache.maven.doxia.Doxia</role>
-      <implementation>org.apache.maven.doxia.DefaultDoxia</implementation>
-      <description>Simple implementation of the Doxia interface:
-uses a ParserManager to lookup a parser.</description>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.doxia.parser.manager.ParserManager</role>
-          <field-name>parserManager</field-name>
-        </requirement>
-      </requirements>
-    </component>
-  </components>
-</component-set>

Deleted: branches/doxia/maven/debian/doxia-module-apt-components.xml
===================================================================
--- trunk/doxia/debian/doxia-module-apt-components.xml	2011-09-09 14:21:04 UTC (rev 14786)
+++ branches/doxia/maven/debian/doxia-module-apt-components.xml	2011-09-09 15:50:02 UTC (rev 14792)
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component-set>
-  <components>
-    <component>
-      <role>org.apache.maven.doxia.parser.Parser</role>
-      <role-hint>apt</role-hint>
-      <implementation>org.apache.maven.doxia.module.apt.AptParser</implementation>
-      <description>The APT parser.</description>
-    <requirements>
-        <requirement>
-          <role>org.apache.maven.doxia.macro.manager.MacroManager</role>
-          <field-name>macroManager</field-name>
-        </requirement>
-      </requirements></component>
-    <component>
-      <role>org.apache.maven.doxia.module.site.SiteModule</role>
-      <role-hint>apt</role-hint>
-      <implementation>org.apache.maven.doxia.module.apt.AptSiteModule</implementation>
-      <description><p>AptSiteModule class.</description>
-    </component>
-    <component>
-      <role>org.apache.maven.doxia.sink.SinkFactory</role>
-      <role-hint>apt</role-hint>
-      <implementation>org.apache.maven.doxia.module.apt.AptSinkFactory</implementation>
-      <description>APT implementation of the Sink factory.</description>
-    </component>
-  </components>
-</component-set>

Deleted: branches/doxia/maven/debian/doxia-module-confluence-components.xml
===================================================================
--- trunk/doxia/debian/doxia-module-confluence-components.xml	2011-09-09 14:21:04 UTC (rev 14786)
+++ branches/doxia/maven/debian/doxia-module-confluence-components.xml	2011-09-09 15:50:02 UTC (rev 14792)
@@ -1,22 +0,0 @@
-<component-set>
-  <components>
-    <component>
-      <role>org.apache.maven.doxia.parser.Parser</role>
-      <role-hint>confluence</role-hint>
-      <implementation>org.apache.maven.doxia.module.confluence.ConfluenceParser</implementation>
-      <description>Parse the <a href="http://www.</description>
-    </component>
-    <component>
-      <role>org.apache.maven.doxia.module.site.SiteModule</role>
-      <role-hint>confluence</role-hint>
-      <implementation>org.apache.maven.doxia.module.confluence.ConfluenceSiteModule</implementation>
-      <description><p>ConfluenceSiteModule class.</description>
-    </component>
-    <component>
-      <role>org.apache.maven.doxia.sink.SinkFactory</role>
-      <role-hint>confluence</role-hint>
-      <implementation>org.apache.maven.doxia.module.confluence.ConfluenceSinkFactory</implementation>
-      <description>Confluence implementation of the Sink factory.</description>
-    </component>
-  </components>
-</component-set>

Deleted: branches/doxia/maven/debian/doxia-module-docbook-simple-components.xml
===================================================================
--- trunk/doxia/debian/doxia-module-docbook-simple-components.xml	2011-09-09 14:21:04 UTC (rev 14786)
+++ branches/doxia/maven/debian/doxia-module-docbook-simple-components.xml	2011-09-09 15:50:02 UTC (rev 14792)
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component-set>
-  <components>
-    <component>
-      <role>org.apache.maven.doxia.module.site.SiteModule</role>
-      <role-hint>docbook</role-hint>
-      <implementation>org.apache.maven.doxia.module.docbook.DocBookSiteModule</implementation>
-      <description><p>DocBookSiteModule class.</description>
-    </component>
-    <component>
-      <role>org.apache.maven.doxia.parser.Parser</role>
-      <role-hint>docbook</role-hint>
-      <implementation>org.apache.maven.doxia.module.docbook.DocBookParser</implementation>
-      <description>Parse a <a href="http://www.</description>
-    </component>
-    <component>
-      <role>org.apache.maven.doxia.sink.SinkFactory</role>
-      <role-hint>docbook</role-hint>
-      <implementation>org.apache.maven.doxia.module.docbook.DocbookSinkFactory</implementation>
-      <description>Docbook implementation of the Sink factory.</description>
-    </component>
-  <component>
-      <role>org.apache.maven.doxia.parser.Parser</role>
-      <role-hint>doc-book</role-hint>
-      <implementation>org.apache.maven.doxia.module.docbook.DocBookParser</implementation>
-      <description>Parse a <code>Docbook</code> document and emit events into the specified doxia
-        Sink.</description>
-    </component><component>
-      <role>org.apache.maven.doxia.sink.SinkFactory</role>
-      <role-hint>doc-book</role-hint>
-      <implementation>org.apache.maven.doxia.module.docbook.DocbookSinkFactory</implementation>
-      <description>Docbook implementation of the Sink factory.</description>
-    </component><component>
-      <role>org.apache.maven.doxia.module.site.SiteModule</role>
-      <role-hint>doc-book</role-hint>
-      <implementation>org.apache.maven.doxia.module.docbook.DocBookSiteModule</implementation>
-      <description />
-    </component></components>
-</component-set>

Deleted: branches/doxia/maven/debian/doxia-module-fml-components.xml
===================================================================
--- trunk/doxia/debian/doxia-module-fml-components.xml	2011-09-09 14:21:04 UTC (rev 14786)
+++ branches/doxia/maven/debian/doxia-module-fml-components.xml	2011-09-09 15:50:02 UTC (rev 14792)
@@ -1,16 +0,0 @@
-<component-set>
-  <components>
-    <component>
-      <role>org.apache.maven.doxia.module.site.SiteModule</role>
-      <role-hint>fml</role-hint>
-      <implementation>org.apache.maven.doxia.module.fml.FmlSiteModule</implementation>
-      <description><p>FmlSiteModule class.</description>
-    </component>
-    <component>
-      <role>org.apache.maven.doxia.parser.Parser</role>
-      <role-hint>fml</role-hint>
-      <implementation>org.apache.maven.doxia.module.fml.FmlParser</implementation>
-      <description>Parse a fml model and emit events into the specified doxia Sink.</description>
-    </component>
-  </components>
-</component-set>

Deleted: branches/doxia/maven/debian/doxia-module-fo-components.xml
===================================================================
--- trunk/doxia/debian/doxia-module-fo-components.xml	2011-09-09 14:21:04 UTC (rev 14786)
+++ branches/doxia/maven/debian/doxia-module-fo-components.xml	2011-09-09 15:50:02 UTC (rev 14792)
@@ -1,10 +0,0 @@
-<component-set>
-  <components>
-    <component>
-      <role>org.apache.maven.doxia.sink.SinkFactory</role>
-      <role-hint>fo</role-hint>
-      <implementation>org.apache.maven.doxia.module.fo.FoSinkFactory</implementation>
-      <description>FO implementation of the Sink factory.</description>
-    </component>
-  </components>
-</component-set>

Deleted: branches/doxia/maven/debian/doxia-module-itext-components.xml
===================================================================
--- trunk/doxia/debian/doxia-module-itext-components.xml	2011-09-09 14:21:04 UTC (rev 14786)
+++ branches/doxia/maven/debian/doxia-module-itext-components.xml	2011-09-09 15:50:02 UTC (rev 14792)
@@ -1,10 +0,0 @@
-<component-set>
-  <components>
-    <component>
-      <role>org.apache.maven.doxia.sink.SinkFactory</role>
-      <role-hint>itext</role-hint>
-      <implementation>org.apache.maven.doxia.module.itext.ITextSinkFactory</implementation>
-      <description>IText implementation of the Sink factory.</description>
-    </component>
-  </components>
-</component-set>

Deleted: branches/doxia/maven/debian/doxia-module-latex-components.xml
===================================================================
--- trunk/doxia/debian/doxia-module-latex-components.xml	2011-09-09 14:21:04 UTC (rev 14786)
+++ branches/doxia/maven/debian/doxia-module-latex-components.xml	2011-09-09 15:50:02 UTC (rev 14792)
@@ -1,10 +0,0 @@
-<component-set>
-  <components>
-    <component>
-      <role>org.apache.maven.doxia.sink.SinkFactory</role>
-      <role-hint>latex</role-hint>
-      <implementation>org.apache.maven.doxia.module.latex.LatexSinkFactory</implementation>
-      <description>Latex implementation of the Sink factory.</description>
-    </component>
-  </components>
-</component-set>

Deleted: branches/doxia/maven/debian/doxia-module-rtf-components.xml
===================================================================
--- trunk/doxia/debian/doxia-module-rtf-components.xml	2011-09-09 14:21:04 UTC (rev 14786)
+++ branches/doxia/maven/debian/doxia-module-rtf-components.xml	2011-09-09 15:50:02 UTC (rev 14792)
@@ -1,10 +0,0 @@
-<component-set>
-  <components>
-    <component>
-      <role>org.apache.maven.doxia.sink.SinkFactory</role>
-      <role-hint>rtf</role-hint>
-      <implementation>org.apache.maven.doxia.module.rtf.RtfSinkFactory</implementation>
-      <description>Rtf implementation of the Sink factory.</description>
-    </component>
-  </components>
-</component-set>

Deleted: branches/doxia/maven/debian/doxia-module-twiki-components.xml
===================================================================
--- trunk/doxia/debian/doxia-module-twiki-components.xml	2011-09-09 14:21:04 UTC (rev 14786)
+++ branches/doxia/maven/debian/doxia-module-twiki-components.xml	2011-09-09 15:50:02 UTC (rev 14792)
@@ -1,22 +0,0 @@
-<component-set>
-  <components>
-    <component>
-      <role>org.apache.maven.doxia.module.site.SiteModule</role>
-      <role-hint>twiki</role-hint>
-      <implementation>org.apache.maven.doxia.module.twiki.TWikiSiteModule</implementation>
-      <description>{@link org.</description>
-    </component>
-    <component>
-      <role>org.apache.maven.doxia.parser.Parser</role>
-      <role-hint>twiki</role-hint>
-      <implementation>org.apache.maven.doxia.module.twiki.TWikiParser</implementation>
-      <description>Parse the <a href="http://twiki.</description>
-    </component>
-    <component>
-      <role>org.apache.maven.doxia.sink.SinkFactory</role>
-      <role-hint>twiki</role-hint>
-      <implementation>org.apache.maven.doxia.module.twiki.TWikiSinkFactory</implementation>
-      <description>TWiki implementation of the Sink factory.</description>
-    </component>
-  </components>
-</component-set>

Deleted: branches/doxia/maven/debian/doxia-module-xdoc-components.xml
===================================================================
--- trunk/doxia/debian/doxia-module-xdoc-components.xml	2011-09-09 14:21:04 UTC (rev 14786)
+++ branches/doxia/maven/debian/doxia-module-xdoc-components.xml	2011-09-09 15:50:02 UTC (rev 14792)
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component-set>
-  <components>
-    <component>
-      <role>org.apache.maven.doxia.module.site.SiteModule</role>
-      <role-hint>xdoc</role-hint>
-      <implementation>org.apache.maven.doxia.module.xdoc.XdocSiteModule</implementation>
-      <description><p>XdocSiteModule class.</description>
-    </component>
-    <component>
-      <role>org.apache.maven.doxia.sink.SinkFactory</role>
-      <role-hint>xdoc</role-hint>
-      <implementation>org.apache.maven.doxia.module.xdoc.XdocSinkFactory</implementation>
-      <description>Xdoc implementation of the Sink factory.</description>
-    </component>
-    <component>
-      <role>org.apache.maven.doxia.parser.Parser</role>
-      <role-hint>xdoc</role-hint>
-      <implementation>org.apache.maven.doxia.module.xdoc.XdocParser</implementation>
-      <description>Parse an xdoc model and emit events into the specified doxia Sink.</description>
-    <requirements>
-        <requirement>
-          <role>org.apache.maven.doxia.macro.manager.MacroManager</role>
-          <field-name>macroManager</field-name>
-        </requirement>
-      </requirements></component>
-  </components>
-</component-set>

Deleted: branches/doxia/maven/debian/doxia-module-xhtml-components.xml
===================================================================
--- trunk/doxia/debian/doxia-module-xhtml-components.xml	2011-09-09 14:21:04 UTC (rev 14786)
+++ branches/doxia/maven/debian/doxia-module-xhtml-components.xml	2011-09-09 15:50:02 UTC (rev 14792)
@@ -1,22 +0,0 @@
-<component-set>
-  <components>
-    <component>
-      <role>org.apache.maven.doxia.sink.SinkFactory</role>
-      <role-hint>xhtml</role-hint>
-      <implementation>org.apache.maven.doxia.module.xhtml.XhtmlSinkFactory</implementation>
-      <description>Xhtml implementation of the Sink factory.</description>
-    </component>
-    <component>
-      <role>org.apache.maven.doxia.parser.Parser</role>
-      <role-hint>xhtml</role-hint>
-      <implementation>org.apache.maven.doxia.module.xhtml.XhtmlParser</implementation>
-      <description>Parse an xhtml model and emit events into a Doxia Sink.</description>
-    </component>
-    <component>
-      <role>org.apache.maven.doxia.module.site.SiteModule</role>
-      <role-hint>xhtml</role-hint>
-      <implementation>org.apache.maven.doxia.module.xhtml.XhtmlSiteModule</implementation>
-      <description><p>XhtmlSiteModule class.</description>
-    </component>
-  </components>
-</component-set>

Deleted: branches/doxia/maven/debian/libdoxia-java-doc.doc-base
===================================================================
--- trunk/doxia/debian/libdoxia-java-doc.doc-base	2011-09-09 14:21:04 UTC (rev 14786)
+++ branches/doxia/maven/debian/libdoxia-java-doc.doc-base	2011-09-09 15:50:02 UTC (rev 14792)
@@ -1,9 +0,0 @@
-Document: libdoxia-java
-Title: API Javadoc for libdoxia
-Author: doxia developers
-Abstract: This is the API Javadoc provided by the libdoxia library.
-Section: Programming
-
-Format: HTML
-Index: /usr/share/doc/libdoxia-java/api/index.html
-Files: /usr/share/doc/libdoxia-java/api/*

Copied: branches/doxia/maven/debian/libdoxia-java-doc.doc-base.api (from rev 14786, trunk/doxia/debian/libdoxia-java-doc.doc-base)
===================================================================
--- branches/doxia/maven/debian/libdoxia-java-doc.doc-base.api	                        (rev 0)
+++ branches/doxia/maven/debian/libdoxia-java-doc.doc-base.api	2011-09-09 15:50:02 UTC (rev 14792)
@@ -0,0 +1,10 @@
+Document: libdoxia-java
+Title: API Javadoc for Doxia
+Author: Doxia developers
+Abstract: This is the API Javadoc provided for the
+ libdoxia-java library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libdoxia-java/api/index.html
+Files: /usr/share/doc/libdoxia-java/api/*

Added: branches/doxia/maven/debian/libdoxia-java-doc.install
===================================================================
--- branches/doxia/maven/debian/libdoxia-java-doc.install	                        (rev 0)
+++ branches/doxia/maven/debian/libdoxia-java-doc.install	2011-09-09 15:50:02 UTC (rev 14792)
@@ -0,0 +1,2 @@
+target/apidocs/* usr/share/doc/libdoxia-java/api
+

Modified: branches/doxia/maven/debian/libdoxia-java.poms
===================================================================
--- trunk/doxia/debian/libdoxia-java.poms	2011-09-09 14:21:04 UTC (rev 14786)
+++ branches/doxia/maven/debian/libdoxia-java.poms	2011-09-09 15:50:02 UTC (rev 14792)
@@ -1,18 +1,45 @@
-pom.xml --no-parent
-doxia-core/pom.xml
-doxia-book/pom.xml
-doxia-logging-api/pom.xml
-doxia-sink-api/pom.xml
-doxia-modules/pom.xml
-doxia-modules/doxia-module-apt/pom.xml
-doxia-modules/doxia-module-confluence/pom.xml
-doxia-modules/doxia-module-docbook-simple/pom.xml
-doxia-modules/doxia-module-fml/pom.xml
-doxia-modules/doxia-module-fo/pom.xml
-doxia-modules/doxia-module-itext/pom.xml
-doxia-modules/doxia-module-latex/pom.xml
-doxia-modules/doxia-module-rtf/pom.xml
-doxia-modules/doxia-module-twiki/pom.xml
-doxia-modules/doxia-module-xdoc/pom.xml
-doxia-modules/doxia-module-xhtml/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 --no-parent --has-package-version
+doxia-logging-api/pom.xml --has-package-version
+doxia-sink-api/pom.xml --has-package-version
+doxia-test-docs/pom.xml --has-package-version
+doxia-core/pom.xml --has-package-version
+doxia-modules/pom.xml --has-package-version
+doxia-modules/doxia-module-apt/pom.xml --has-package-version
+doxia-modules/doxia-module-confluence/pom.xml --has-package-version
+doxia-modules/doxia-module-docbook-simple/pom.xml --has-package-version
+doxia-modules/doxia-module-fml/pom.xml --has-package-version
+doxia-modules/doxia-module-fo/pom.xml --has-package-version
+doxia-modules/doxia-module-itext/pom.xml --has-package-version
+doxia-modules/doxia-module-latex/pom.xml --has-package-version
+doxia-modules/doxia-module-rtf/pom.xml --has-package-version
+doxia-modules/doxia-module-twiki/pom.xml --has-package-version
+doxia-modules/doxia-module-xdoc/pom.xml --has-package-version
+doxia-modules/doxia-module-xhtml/pom.xml --has-package-version
+doxia-book/pom.xml --has-package-version
+doxia-maven-plugin/pom.xml --has-package-version
 

Added: branches/doxia/maven/debian/maven.cleanIgnoreRules
===================================================================
--- branches/doxia/maven/debian/maven.cleanIgnoreRules	                        (rev 0)
+++ branches/doxia/maven/debian/maven.cleanIgnoreRules	2011-09-09 15:50:02 UTC (rev 14792)
@@ -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: branches/doxia/maven/debian/maven.ignoreRules
===================================================================
--- trunk/doxia/debian/maven.ignoreRules	2011-09-09 14:21:04 UTC (rev 14786)
+++ branches/doxia/maven/debian/maven.ignoreRules	2011-09-09 15:50:02 UTC (rev 14792)
@@ -1 +1,17 @@
-org.apache.maven.doxia doxia-core test-jar
+# 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 * * * *

Added: branches/doxia/maven/debian/maven.properties
===================================================================
--- branches/doxia/maven/debian/maven.properties	                        (rev 0)
+++ branches/doxia/maven/debian/maven.properties	2011-09-09 15:50:02 UTC (rev 14792)
@@ -0,0 +1,4 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+# maven.test.skip=true
+

Added: branches/doxia/maven/debian/maven.publishedRules
===================================================================
--- branches/doxia/maven/debian/maven.publishedRules	                        (rev 0)
+++ branches/doxia/maven/debian/maven.publishedRules	2011-09-09 15:50:02 UTC (rev 14792)
@@ -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/
+

Modified: branches/doxia/maven/debian/maven.rules
===================================================================
--- trunk/doxia/debian/maven.rules	2011-09-09 14:21:04 UTC (rev 14786)
+++ branches/doxia/maven/debian/maven.rules	2011-09-09 15:50:02 UTC (rev 14792)
@@ -1,4 +1,40 @@
-com.lowagie itext jar 1.4
-junit junit jar s/3\..*/3.x/
-log4j log4j jar s/1\.2\..*/1.2.x/
-commons-httpclient commons-httpclient jar s/3\..*/3.x/
+# 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/
+
+com.lowagie itext jar 1.4 * *
+junit junit jar s/3\..*/3.x/ * *
+log4j log4j jar s/1\.2\..*/1.2.x/ * *
+org.apache.maven.doxia doxia-book jar s/.*/debian/ * *
+org.apache.maven.doxia doxia-core 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-confluence jar s/.*/debian/ * *
+org.apache.maven.doxia doxia-module-docbook-simple jar s/.*/debian/ * *
+org.apache.maven.doxia doxia-module-fml jar s/.*/debian/ * *
+org.apache.maven.doxia doxia-module-fo jar s/.*/debian/ * *
+org.apache.maven.doxia doxia-module-itext jar s/.*/debian/ * *
+org.apache.maven.doxia doxia-module-latex jar s/.*/debian/ * *
+org.apache.maven.doxia doxia-module-rtf jar s/.*/debian/ * *
+org.apache.maven.doxia doxia-module-twiki 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-modules pom s/.*/debian/ * *
+org.apache.maven.doxia doxia-sink-api jar s/.*/debian/ * *
+org.apache.maven.doxia doxia-test-docs jar s/.*/debian/ * *
+org.apache.maven.doxia doxia pom s/.*/debian/ * *
+org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ * *

Deleted: branches/doxia/maven/debian/orig-tar.sh
===================================================================
--- trunk/doxia/debian/orig-tar.sh	2011-09-09 14:21:04 UTC (rev 14786)
+++ branches/doxia/maven/debian/orig-tar.sh	2011-09-09 15:50:02 UTC (rev 14792)
@@ -1,18 +0,0 @@
-#!/bin/sh -e
-
-TAR=../doxia_$2.orig.tar.gz
-DIR=doxia-$2
-TAG=doxia-$2
-
-svn export http://svn.apache.org/repos/asf/maven/doxia/doxia/tags/$TAG $DIR
-# remove as it's packaged elsewhere
-rm -r $DIR/doxia-maven-plugin
-tar -c -z -f $TAR $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"
-fi

Copied: branches/doxia/maven/debian/orig-tar.sh (from rev 14790, trunk/doxia/debian/orig-tar.sh)
===================================================================
--- branches/doxia/maven/debian/orig-tar.sh	                        (rev 0)
+++ branches/doxia/maven/debian/orig-tar.sh	2011-09-09 15:50:02 UTC (rev 14792)
@@ -0,0 +1,16 @@
+#!/bin/sh -e
+
+VERSION=$2
+TAR=../doxia_$VERSION.orig.tar.gz
+DIR=doxia-$VERSION
+TAG=$(echo "doxia-$VERSION" | sed -re's/~(alpha|beta)/-\1-/')
+
+svn export http://svn.apache.org/repos/asf/maven/doxia/doxia/tags/${TAG}/ $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"
+fi

Modified: branches/doxia/maven/debian/rules
===================================================================
--- trunk/doxia/debian/rules	2011-09-09 14:21:04 UTC (rev 14786)
+++ branches/doxia/maven/debian/rules	2011-09-09 15:50:02 UTC (rev 14792)
@@ -1,54 +1,10 @@
 #!/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
-DEB_ANT_BUILD_TARGET := package javadoc
-DEB_ANT_BUILDFILE    := debian/build.xml
-DEB_ANT_ARGS         := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
-API_DOCS             := build/api
-CORE_LIBS            := core book logging-api sink-api
-MODULES              := apt confluence docbook-simple fml fo itext latex rtf twiki xdoc xhtml
+JAVA_HOME := /usr/lib/jvm/default-java
+DEB_MAVEN_DOC_TARGET := javadoc:jar javadoc:aggregate
 
 get-orig-source:
-	-uscan --download-version $(VERSION) --force-download --rename
-
-makebuilddir/lib$(PACKAGE)-java::
-	set -e; for COMPONENT in doxia-core doxia-book $(addprefix doxia-modules/doxia-module-, $(MODULES)); do \
-		COMPONENT_FILE=debian/$$(echo $$COMPONENT | cut -d'/' -f2 -)-components.xml; \
-		if [ -e $$COMPONENT_FILE ]; then \
-			install -d $$COMPONENT/build/classes/META-INF/plexus; \
-			install -m644 -T $$COMPONENT_FILE $$COMPONENT/build/classes/META-INF/plexus/components.xml; \
-		fi \
-	done
-
-binary-post-install/lib$(PACKAGE)-java::
-	mh_installpoms -plib$(PACKAGE)-java
-	set -e; for LIB in $(CORE_LIBS); do \
-	  mh_installjar -plib$(PACKAGE)-java -l --usj-name=$(PACKAGE)-$$LIB $(PACKAGE)-$$LIB/pom.xml $(PACKAGE)-$$LIB/build/$(PACKAGE)-$$LIB-$(VERSION).jar; \
-	done
-	set -e; for MODULE in $(MODULES); do \
-	  mh_installjar -plib$(PACKAGE)-java -l --usj-name=$(PACKAGE)-module-$$MODULE $(PACKAGE)-modules/doxia-module-$$MODULE/pom.xml $(PACKAGE)-modules/doxia-module-$$MODULE/build/$(PACKAGE)-module-$$MODULE-$(VERSION).jar; \
-	done
-
-binary-post-install/lib$(PACKAGE)-java-doc::
-	dh_install -plib$(PACKAGE)-java-doc $(API_DOCS) usr/share/doc/lib$(PACKAGE)-java
-
-clean::
-	-rm -rf debian/tmp
-
-# Extract plexus components.xml files generated from a standard Maven build
-PLEXUS_COMPONENTS=$(shell find . -name components.xml | grep "target/classes" | sed -re "s,.*/([a-z-]+)/target/.*,debian/\1-components.xml,")
-
-debian/%-components.xml:
-	# In $*
-	find . -type f -path *$*/target/classes/META-INF/plexus/components.xml -exec cp '{}' $@ \;
-	if [ -e $*/target/classes/META-INF/plexus/components.xml ]; then \
-		cp $*/target/classes/META-INF/plexus/components.xml $@; \
-	fi
-
-copy-plexus-components: $(PLEXUS_COMPONENTS)
+	uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename

Modified: branches/doxia/maven/debian/watch
===================================================================
--- trunk/doxia/debian/watch	2011-09-09 14:21:04 UTC (rev 14786)
+++ branches/doxia/maven/debian/watch	2011-09-09 15:50:02 UTC (rev 14792)
@@ -1,3 +1,4 @@
 version=3
-http://svn.apache.org/repos/asf/maven/doxia/doxia/tags/ doxia-(\d.*)/ \
-  debian debian/orig-tar.sh
+opts="uversionmangle=s/-(alpha|beta)-/~$1/" \
+  http://svn.apache.org/repos/asf/maven/doxia/doxia/tags/ \
+  doxia-(\d.*)/ debian debian/orig-tar.sh




More information about the pkg-java-commits mailing list