[doxia] 07/07: * Use Maven to build the package. - Disable tests because there are issues with Maven finding a test-jar. - Add several (too many) patches.
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Aug 6 09:41:03 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to annotated tag debian/1.1.4-1
in repository doxia.
commit 3314fb50a0ba34ddb78bda34b3eea0d1eb4fe406
Author: Torsten Werner <twerner at debian.org>
Date: Fri Sep 9 22:28:03 2011 +0000
* Use Maven to build the package.
- Disable tests because there are issues with Maven finding a test-jar.
- Add several (too many) patches.
---
debian/README.source | 9 ++
debian/build.properties | 28 ----
debian/build.xml | 100 --------------
debian/changelog | 5 +-
debian/control | 26 ++--
debian/doxia-book-components.xml | 130 ------------------
debian/doxia-core-components.xml | 73 ----------
debian/doxia-module-apt-components.xml | 28 ----
debian/doxia-module-confluence-components.xml | 22 ---
debian/doxia-module-docbook-simple-components.xml | 39 ------
debian/doxia-module-fml-components.xml | 16 ---
debian/doxia-module-fo-components.xml | 10 --
debian/doxia-module-itext-components.xml | 10 --
debian/doxia-module-latex-components.xml | 10 --
debian/doxia-module-rtf-components.xml | 10 --
debian/doxia-module-twiki-components.xml | 22 ---
debian/doxia-module-xdoc-components.xml | 28 ----
debian/doxia-module-xhtml-components.xml | 22 ---
...doc.doc-base => libdoxia-java-doc.doc-base.api} | 7 +-
debian/libdoxia-java-doc.install | 2 +
debian/libdoxia-java.poms | 62 ++++++---
debian/maven.cleanIgnoreRules | 17 +++
debian/maven.ignoreRules | 18 ++-
debian/maven.properties | 5 +
debian/maven.publishedRules | 19 +++
debian/maven.rules | 44 +++++-
debian/orig-tar.sh | 15 +-
.../patches/{modello.patch => 0001-modello.patch} | 26 +++-
...2-add-version-to-plexus-container-default.patch | 21 +++
.../0003-switch-to-plexus-component-metadata.patch | 151 +++++++++++++++++++++
.../patches/0004-remove-doxia-core-test-jar.patch | 46 +++++++
.../0005-don-t-build-doxia-maven-plugin.patch | 22 +++
.../0006-specificy-source-and-target-version.patch | 28 ++++
debian/patches/0007-disable-plexus-javadoc.patch | 28 ++++
debian/patches/series | 8 +-
debian/rules | 52 +------
debian/watch | 5 +-
37 files changed, 512 insertions(+), 652 deletions(-)
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..42a8468
--- /dev/null
+++ b/debian/README.source
@@ -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.
diff --git a/debian/build.properties b/debian/build.properties
deleted file mode 100644
index 382f331..0000000
--- a/debian/build.properties
+++ /dev/null
@@ -1,28 +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/httpclient.jar:\
- /usr/share/java/fop.jar:\
- /usr/share/java/itext1.jar:\
- /usr/share/java/httpcore.jar
diff --git a/debian/build.xml b/debian/build.xml
deleted file mode 100644
index 32b9c90..0000000
--- a/debian/build.xml
+++ /dev/null
@@ -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>
diff --git a/debian/changelog b/debian/changelog
index caced6a..a7defa0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,11 @@ doxia (1.1.4-1) UNRELEASED; urgency=low
* Remove Trygve and Paul from Uploaders list.
* Update Standards-Version: 3.9.2.
* Improve short descriptions.
+ * Use Maven to build the package.
+ - Disable tests because there are issues with Maven finding a test-jar.
+ - Add several (too many) patches.
- -- Torsten Werner <twerner at debian.org> Fri, 09 Sep 2011 16:27:50 +0200
+ -- Torsten Werner <twerner at debian.org> Fri, 09 Sep 2011 17:33:03 +0200
doxia (1.1.2-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index e3ebdfb..67c4d7a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,12 +3,15 @@ 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-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, libhttpclient-java, libhttpcore-java
-Build-Depends: ant, debhelper (>= 7), cdbs (>= 0.4.5.3), default-jdk
+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-component-metadata-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
@@ -16,10 +19,8 @@ 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, libhttpclient-java, libhttpcore-java
+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
@@ -36,9 +37,10 @@ Description: powerful content generation framework
Package: libdoxia-java-doc
Architecture: all
Section: doc
-Depends: ${misc:Depends}, default-jdk-doc
+Depends: ${misc:Depends}, ${maven:DocDepends}
+Recommends: ${maven:DocOptionalDepends}
Suggests: libdoxia-java
-Description: documentation for 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.
.
diff --git a/debian/doxia-book-components.xml b/debian/doxia-book-components.xml
deleted file mode 100644
index 9ab8102..0000000
--- a/debian/doxia-book-components.xml
+++ /dev/null
@@ -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>
diff --git a/debian/doxia-core-components.xml b/debian/doxia-core-components.xml
deleted file mode 100644
index 5226312..0000000
--- a/debian/doxia-core-components.xml
+++ /dev/null
@@ -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>
diff --git a/debian/doxia-module-apt-components.xml b/debian/doxia-module-apt-components.xml
deleted file mode 100644
index 90862a4..0000000
--- a/debian/doxia-module-apt-components.xml
+++ /dev/null
@@ -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>
diff --git a/debian/doxia-module-confluence-components.xml b/debian/doxia-module-confluence-components.xml
deleted file mode 100644
index 59cea04..0000000
--- a/debian/doxia-module-confluence-components.xml
+++ /dev/null
@@ -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>
diff --git a/debian/doxia-module-docbook-simple-components.xml b/debian/doxia-module-docbook-simple-components.xml
deleted file mode 100644
index cf112b4..0000000
--- a/debian/doxia-module-docbook-simple-components.xml
+++ /dev/null
@@ -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>
diff --git a/debian/doxia-module-fml-components.xml b/debian/doxia-module-fml-components.xml
deleted file mode 100644
index eab8853..0000000
--- a/debian/doxia-module-fml-components.xml
+++ /dev/null
@@ -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>
diff --git a/debian/doxia-module-fo-components.xml b/debian/doxia-module-fo-components.xml
deleted file mode 100644
index f5af2a9..0000000
--- a/debian/doxia-module-fo-components.xml
+++ /dev/null
@@ -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>
diff --git a/debian/doxia-module-itext-components.xml b/debian/doxia-module-itext-components.xml
deleted file mode 100644
index 1299563..0000000
--- a/debian/doxia-module-itext-components.xml
+++ /dev/null
@@ -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>
diff --git a/debian/doxia-module-latex-components.xml b/debian/doxia-module-latex-components.xml
deleted file mode 100644
index ff2a7fd..0000000
--- a/debian/doxia-module-latex-components.xml
+++ /dev/null
@@ -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>
diff --git a/debian/doxia-module-rtf-components.xml b/debian/doxia-module-rtf-components.xml
deleted file mode 100644
index 62a72a9..0000000
--- a/debian/doxia-module-rtf-components.xml
+++ /dev/null
@@ -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>
diff --git a/debian/doxia-module-twiki-components.xml b/debian/doxia-module-twiki-components.xml
deleted file mode 100644
index 30ec0b7..0000000
--- a/debian/doxia-module-twiki-components.xml
+++ /dev/null
@@ -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>
diff --git a/debian/doxia-module-xdoc-components.xml b/debian/doxia-module-xdoc-components.xml
deleted file mode 100644
index fdb75f4..0000000
--- a/debian/doxia-module-xdoc-components.xml
+++ /dev/null
@@ -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>
diff --git a/debian/doxia-module-xhtml-components.xml b/debian/doxia-module-xhtml-components.xml
deleted file mode 100644
index e87a709..0000000
--- a/debian/doxia-module-xhtml-components.xml
+++ /dev/null
@@ -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>
diff --git a/debian/libdoxia-java-doc.doc-base b/debian/libdoxia-java-doc.doc-base.api
similarity index 54%
rename from debian/libdoxia-java-doc.doc-base
rename to debian/libdoxia-java-doc.doc-base.api
index 88e9189..8757cd4 100644
--- a/debian/libdoxia-java-doc.doc-base
+++ b/debian/libdoxia-java-doc.doc-base.api
@@ -1,7 +1,8 @@
Document: libdoxia-java
-Title: API Javadoc for libdoxia
-Author: doxia developers
-Abstract: This is the API Javadoc provided by the libdoxia library.
+Title: API Javadoc for Doxia
+Author: Doxia developers
+Abstract: This is the API Javadoc provided for the
+ libdoxia-java library.
Section: Programming
Format: HTML
diff --git a/debian/libdoxia-java-doc.install b/debian/libdoxia-java-doc.install
new file mode 100644
index 0000000..94ad818
--- /dev/null
+++ b/debian/libdoxia-java-doc.install
@@ -0,0 +1,2 @@
+target/site/apidocs/* usr/share/doc/libdoxia-java/api
+
diff --git a/debian/libdoxia-java.poms b/debian/libdoxia-java.poms
index 9319dbc..5885e82 100644
--- a/debian/libdoxia-java.poms
+++ b/debian/libdoxia-java.poms
@@ -1,18 +1,46 @@
-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
+# the maven plugin FTBFS but we have a separate source package
+#doxia-maven-plugin/pom.xml --has-package-version
diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules
new file mode 100644
index 0000000..b47b61d
--- /dev/null
+++ b/debian/maven.cleanIgnoreRules
@@ -0,0 +1,17 @@
+# Maven clean ignore rules - ignore some Maven dependencies and plugins
+# during the clean phase of a Maven build
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+# for the version. In this case, the element is simply matched
+# and left as it is
+# - * (the star character, alone). In this case, anything will
+# match and be left as it is. For example, using * on the
+# position of the artifact field will match any artifact id
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., this dependency is then removed
+# from the POM before mvn clean is called
+# junit junit jar s/3\\..*/3.x/
+
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index eaee7ec..e82ae06 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -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 * * * *
diff --git a/debian/maven.properties b/debian/maven.properties
new file mode 100644
index 0000000..4d5df60
--- /dev/null
+++ b/debian/maven.properties
@@ -0,0 +1,5 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+
+maven.test.skip=true
+
diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules
new file mode 100644
index 0000000..822f087
--- /dev/null
+++ b/debian/maven.publishedRules
@@ -0,0 +1,19 @@
+# Maven published rules - additional rules to publish, to help
+# the packaging work of Debian maintainers using mh_make
+# Format of this file is:
+# [group] [artifact] [type] [version] [classifier] [scope]
+# where each element can be either
+# - the exact string, for example org.apache for the group, or 3.1
+# for the version. In this case, the element is simply matched
+# and left as it is
+# - * (the star character, alone). In this case, anything will
+# match and be left as it is. For example, using * on the
+# position of the artifact field will match any artifact id
+# - a regular expression of the form s/match/replace/
+# in this case, elements that match are transformed using
+# the regex rule.
+# All elements much match before a rule can be applied
+# Example rule: match jar with groupid= junit, artifactid= junit
+# and version starting with 3., replacing the version with 3.x
+# junit junit jar s/3\\..*/3.x/
+
diff --git a/debian/maven.rules b/debian/maven.rules
index 67cee1d..3af15d6 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -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/ * *
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index e09e21d..750eccb 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -1,17 +1,16 @@
#!/bin/sh -e
-TAR=../doxia_$2.orig.tar.gz
-DIR=doxia-$2
-TAG=doxia-$2
+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
-# remove as it's packaged elsewhere
-tar -c -z -f $TAR $DIR
+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"
+ mv $TAR $origDir && echo "moved $TAR to $origDir"
fi
diff --git a/debian/patches/modello.patch b/debian/patches/0001-modello.patch
similarity index 68%
rename from debian/patches/modello.patch
rename to debian/patches/0001-modello.patch
index a673b44..7f3cd8d 100644
--- a/debian/patches/modello.patch
+++ b/debian/patches/0001-modello.patch
@@ -1,7 +1,16 @@
-Index: doxia-1.1.1/doxia-core/src/main/mdo/document.mdo
-===================================================================
---- doxia-1.1.1.orig/doxia-core/src/main/mdo/document.mdo 2009-10-01 00:38:16.000000000 +0200
-+++ doxia-1.1.1/doxia-core/src/main/mdo/document.mdo 2009-10-01 00:59:38.000000000 +0200
+From: Torsten Werner <twerner at debian.org>
+Date: Fri, 9 Sep 2011 21:14:55 +0200
+Subject: modello
+
+---
+ doxia-core/src/main/mdo/document.mdo | 15 ++++++++++-----
+ .../maven/doxia/module/fo/FoAggregateSink.java | 2 +-
+ 2 files changed, 11 insertions(+), 6 deletions(-)
+
+diff --git a/doxia-core/src/main/mdo/document.mdo b/doxia-core/src/main/mdo/document.mdo
+index a338c49..1807f42 100644
+--- a/doxia-core/src/main/mdo/document.mdo
++++ b/doxia-core/src/main/mdo/document.mdo
@@ -500,7 +500,7 @@
return ISO_8601_FORMAT.format( getCreationDate() );
}
@@ -74,9 +83,11 @@ Index: doxia-1.1.1/doxia-core/src/main/mdo/document.mdo
}
]]>
</code>
---- doxia-1.1.1.orig/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
-+++ doxia-1.1.1/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
-@@ -1128,7 +1128,7 @@
+diff --git a/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java b/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
+index 72d6789..7aa1d63 100644
+--- a/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
++++ b/doxia-modules/doxia-module-fo/src/main/java/org/apache/maven/doxia/module/fo/FoAggregateSink.java
+@@ -1219,7 +1219,7 @@ public class FoAggregateSink
att.addAttribute( "height", "0.3in" );
att.addAttribute( "text-align", "left" );
writeStartTag( BLOCK_TAG, att );
@@ -85,3 +96,4 @@ Index: doxia-1.1.1/doxia-core/src/main/mdo/document.mdo
writeEndTag( BLOCK_TAG );
writeEndTag( TABLE_CELL_TAG );
+--
diff --git a/debian/patches/0002-add-version-to-plexus-container-default.patch b/debian/patches/0002-add-version-to-plexus-container-default.patch
new file mode 100644
index 0000000..67b259b
--- /dev/null
+++ b/debian/patches/0002-add-version-to-plexus-container-default.patch
@@ -0,0 +1,21 @@
+From: Torsten Werner <twerner at debian.org>
+Date: Fri, 9 Sep 2011 21:16:55 +0200
+Subject: add version to plexus-container-default
+
+---
+ doxia-logging-api/pom.xml | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/doxia-logging-api/pom.xml b/doxia-logging-api/pom.xml
+index 2267734..71ff169 100644
+--- a/doxia-logging-api/pom.xml
++++ b/doxia-logging-api/pom.xml
+@@ -37,6 +37,7 @@ under the License.
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
++ <version>1.0-beta-3.0.7</version>
+ </dependency>
+ </dependencies>
+ </project>
+--
diff --git a/debian/patches/0003-switch-to-plexus-component-metadata.patch b/debian/patches/0003-switch-to-plexus-component-metadata.patch
new file mode 100644
index 0000000..5a9d7e9
--- /dev/null
+++ b/debian/patches/0003-switch-to-plexus-component-metadata.patch
@@ -0,0 +1,151 @@
+From: Torsten Werner <twerner at debian.org>
+Date: Sat, 10 Sep 2011 00:06:13 +0200
+Subject: switch to plexus-component-metadata
+
+The old plexus-maven-plugin fails in merge-descriptors and has been replaced by
+plexus-component-metadata.
+---
+ doxia-modules/doxia-module-apt/pom.xml | 11 ++++-------
+ doxia-modules/doxia-module-docbook-simple/pom.xml | 9 +++------
+ doxia-modules/doxia-module-fml/pom.xml | 9 +++------
+ doxia-modules/doxia-module-xdoc/pom.xml | 9 +++------
+ pom.xml | 9 ++++-----
+ 5 files changed, 17 insertions(+), 30 deletions(-)
+
+diff --git a/doxia-modules/doxia-module-apt/pom.xml b/doxia-modules/doxia-module-apt/pom.xml
+index 010c559..a652578 100644
+--- a/doxia-modules/doxia-module-apt/pom.xml
++++ b/doxia-modules/doxia-module-apt/pom.xml
+@@ -49,21 +49,18 @@ under the License.
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
++ <artifactId>plexus-component-metadata</artifactId>
+ <configuration>
+- <descriptors>
+- <descriptor>src/main/components/components.xml</descriptor>
+- <descriptor>target/generated-resources/plexus/META-INF/plexus/components.xml</descriptor>
+- </descriptors>
++ <staticMetadataDirectory>${basedir}/src/main/components/</staticMetadataDirectory>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+- <goal>merge-descriptors</goal>
++ <goal>generate-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+-</project>
+\ No newline at end of file
++</project>
+diff --git a/doxia-modules/doxia-module-docbook-simple/pom.xml b/doxia-modules/doxia-module-docbook-simple/pom.xml
+index 64f671a..a3bf3b2 100644
+--- a/doxia-modules/doxia-module-docbook-simple/pom.xml
++++ b/doxia-modules/doxia-module-docbook-simple/pom.xml
+@@ -45,17 +45,14 @@ under the License.
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
++ <artifactId>plexus-component-metadata</artifactId>
+ <configuration>
+- <descriptors>
+- <descriptor>src/main/components/components.xml</descriptor>
+- <descriptor>target/generated-resources/plexus/META-INF/plexus/components.xml</descriptor>
+- </descriptors>
++ <staticMetadataDirectory>${basedir}/src/main/components/</staticMetadataDirectory>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+- <goal>merge-descriptors</goal>
++ <goal>generate-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+diff --git a/doxia-modules/doxia-module-fml/pom.xml b/doxia-modules/doxia-module-fml/pom.xml
+index 2afafe8..2a4b94f 100644
+--- a/doxia-modules/doxia-module-fml/pom.xml
++++ b/doxia-modules/doxia-module-fml/pom.xml
+@@ -77,17 +77,14 @@ under the License.
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
++ <artifactId>plexus-component-metadata</artifactId>
+ <configuration>
+- <descriptors>
+- <descriptor>src/main/components/components.xml</descriptor>
+- <descriptor>target/generated-resources/plexus/META-INF/plexus/components.xml</descriptor>
+- </descriptors>
++ <staticMetadataDirectory>${basedir}/src/main/components</staticMetadataDirectory>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+- <goal>merge-descriptors</goal>
++ <goal>generate-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+diff --git a/doxia-modules/doxia-module-xdoc/pom.xml b/doxia-modules/doxia-module-xdoc/pom.xml
+index f393ef8..947d1e2 100644
+--- a/doxia-modules/doxia-module-xdoc/pom.xml
++++ b/doxia-modules/doxia-module-xdoc/pom.xml
+@@ -68,17 +68,14 @@ under the License.
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
++ <artifactId>plexus-component-metadata</artifactId>
+ <configuration>
+- <descriptors>
+- <descriptor>src/main/components/components.xml</descriptor>
+- <descriptor>target/generated-resources/plexus/META-INF/plexus/components.xml</descriptor>
+- </descriptors>
++ <staticMetadataDirectory>${basedir}/src/main/components/components.xml</staticMetadataDirectory>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+- <goal>merge-descriptors</goal>
++ <goal>generate-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+diff --git a/pom.xml b/pom.xml
+index 5f9dee3..160e2d4 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -271,9 +271,8 @@ under the License.
+ <!-- TODO need to upgrade to last version or Maven parent version -->
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
+- <!-- Version 1.3.8 makes the descriptor merges fail, probably due to PLX-409 -->
+- <version>1.3.5</version>
++ <artifactId>plexus-component-metadata</artifactId>
++ <version>1.0-beta-3.0.7</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.modello</groupId>
+@@ -328,11 +327,11 @@ under the License.
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
++ <artifactId>plexus-component-metadata</artifactId>
+ <executions>
+ <execution>
+ <goals>
+- <goal>descriptor</goal>
++ <goal>generate-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
+--
diff --git a/debian/patches/0004-remove-doxia-core-test-jar.patch b/debian/patches/0004-remove-doxia-core-test-jar.patch
new file mode 100644
index 0000000..2c27cf3
--- /dev/null
+++ b/debian/patches/0004-remove-doxia-core-test-jar.patch
@@ -0,0 +1,46 @@
+From: Torsten Werner <twerner at debian.org>
+Date: Sat, 10 Sep 2011 00:09:54 +0200
+Subject: remove doxia-core test-jar
+
+There are issues with finding the artifact.
+---
+ doxia-book/pom.xml | 7 -------
+ doxia-modules/pom.xml | 7 -------
+ 2 files changed, 0 insertions(+), 14 deletions(-)
+
+diff --git a/doxia-book/pom.xml b/doxia-book/pom.xml
+index 4e9ea7a..94b5dac 100644
+--- a/doxia-book/pom.xml
++++ b/doxia-book/pom.xml
+@@ -85,13 +85,6 @@ under the License.
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+
+- <!-- test -->
+- <dependency>
+- <groupId>org.apache.maven.doxia</groupId>
+- <artifactId>doxia-core</artifactId>
+- <type>test-jar</type>
+- <scope>test</scope>
+- </dependency>
+ </dependencies>
+
+ <build>
+diff --git a/doxia-modules/pom.xml b/doxia-modules/pom.xml
+index eed8abc..1fa8d8b 100644
+--- a/doxia-modules/pom.xml
++++ b/doxia-modules/pom.xml
+@@ -57,12 +57,5 @@ under the License.
+ <artifactId>doxia-sink-api</artifactId>
+ </dependency>
+
+- <!-- test -->
+- <dependency>
+- <groupId>org.apache.maven.doxia</groupId>
+- <artifactId>doxia-core</artifactId>
+- <type>test-jar</type>
+- <scope>test</scope>
+- </dependency>
+ </dependencies>
+ </project>
+--
diff --git a/debian/patches/0005-don-t-build-doxia-maven-plugin.patch b/debian/patches/0005-don-t-build-doxia-maven-plugin.patch
new file mode 100644
index 0000000..97f21c6
--- /dev/null
+++ b/debian/patches/0005-don-t-build-doxia-maven-plugin.patch
@@ -0,0 +1,22 @@
+From: Torsten Werner <twerner at debian.org>
+Date: Sat, 10 Sep 2011 00:13:53 +0200
+Subject: don't build doxia-maven-plugin
+
+It fails to build and we have a separate source package anyway.
+---
+ pom.xml | 1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 160e2d4..26c9f8f 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -98,7 +98,6 @@ under the License.
+ <module>doxia-core</module>
+ <module>doxia-modules</module>
+ <module>doxia-book</module>
+- <module>doxia-maven-plugin</module>
+ </modules>
+
+ <scm>
+--
diff --git a/debian/patches/0006-specificy-source-and-target-version.patch b/debian/patches/0006-specificy-source-and-target-version.patch
new file mode 100644
index 0000000..99aaa60
--- /dev/null
+++ b/debian/patches/0006-specificy-source-and-target-version.patch
@@ -0,0 +1,28 @@
+From: Torsten Werner <twerner at debian.org>
+Date: Sat, 10 Sep 2011 00:14:48 +0200
+Subject: specificy source and target version
+
+---
+ pom.xml | 8 ++++++++
+ 1 files changed, 8 insertions(+), 0 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 26c9f8f..22ad945 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -347,6 +347,14 @@ under the License.
+ </execution>
+ </executions>
+ </plugin>
++ <plugin>
++ <groupId>org.apache.maven.plugins</groupId>
++ <artifactId>maven-compiler-plugin</artifactId>
++ <configuration>
++ <source>1.4</source>
++ <target>1.4</target>
++ </configuration>
++ </plugin>
+ </plugins>
+ </build>
+
+--
diff --git a/debian/patches/0007-disable-plexus-javadoc.patch b/debian/patches/0007-disable-plexus-javadoc.patch
new file mode 100644
index 0000000..3412e3b
--- /dev/null
+++ b/debian/patches/0007-disable-plexus-javadoc.patch
@@ -0,0 +1,28 @@
+From: Torsten Werner <twerner at debian.org>
+Date: Sat, 10 Sep 2011 00:15:06 +0200
+Subject: disable plexus-javadoc
+
+It has some unresolved dependency.
+---
+ pom.xml | 7 -------
+ 1 files changed, 0 insertions(+), 7 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 22ad945..d18ba78 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -306,13 +306,6 @@ under the License.
+ <link>http://plexus.codehaus.org/plexus-utils/apidocs/</link>
+ <link>http://junit.sourceforge.net/javadoc/</link>
+ </links>
+- <tagletArtifacts>
+- <tagletArtifact>
+- <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-javadoc</artifactId>
+- <version>1.0</version>
+- </tagletArtifact>
+- </tagletArtifacts>
+ </configuration>
+ </plugin>
+ <plugin>
+--
diff --git a/debian/patches/series b/debian/patches/series
index 9e40621..24d5bb1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,7 @@
-modello.patch
+0001-modello.patch
+0002-add-version-to-plexus-container-default.patch
+0003-switch-to-plexus-component-metadata.patch
+0004-remove-doxia-core-test-jar.patch
+0005-don-t-build-doxia-maven-plugin.patch
+0006-specificy-source-and-target-version.patch
+0007-disable-plexus-javadoc.patch
diff --git a/debian/rules b/debian/rules
index dce15f2..562f1f3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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
diff --git a/debian/watch b/debian/watch
index b66a356..acd413e 100644
--- a/debian/watch
+++ b/debian/watch
@@ -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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/doxia.git
More information about the pkg-java-commits
mailing list