[pkg-java] r14796 - in trunk/doxia-sitetools/debian: . patches
Torsten Werner
twerner at alioth.debian.org
Sat Sep 10 15:44:18 UTC 2011
Author: twerner
Date: 2011-09-10 15:44:18 +0000 (Sat, 10 Sep 2011)
New Revision: 14796
Added:
trunk/doxia-sitetools/debian/README.source
trunk/doxia-sitetools/debian/libdoxia-sitetools-java-doc.doc-base.api
trunk/doxia-sitetools/debian/libdoxia-sitetools-java-doc.install
trunk/doxia-sitetools/debian/maven.cleanIgnoreRules
trunk/doxia-sitetools/debian/maven.ignoreRules
trunk/doxia-sitetools/debian/maven.properties
trunk/doxia-sitetools/debian/maven.publishedRules
trunk/doxia-sitetools/debian/patches/0002-disable-plexus-javadoc.patch
Removed:
trunk/doxia-sitetools/debian/build.properties
trunk/doxia-sitetools/debian/build.xml
trunk/doxia-sitetools/debian/doxia-decoration-model-components.xml
trunk/doxia-sitetools/debian/doxia-site-renderer-components.xml
Modified:
trunk/doxia-sitetools/debian/changelog
trunk/doxia-sitetools/debian/control
trunk/doxia-sitetools/debian/copyright
trunk/doxia-sitetools/debian/libdoxia-sitetools-java.poms
trunk/doxia-sitetools/debian/maven.rules
trunk/doxia-sitetools/debian/orig-tar.sh
trunk/doxia-sitetools/debian/patches/series
trunk/doxia-sitetools/debian/rules
trunk/doxia-sitetools/debian/watch
Log:
* Add a documentation package.
* Update debian/copyright.
Added: trunk/doxia-sitetools/debian/README.source
===================================================================
--- trunk/doxia-sitetools/debian/README.source (rev 0)
+++ trunk/doxia-sitetools/debian/README.source 2011-09-10 15:44:18 UTC (rev 14796)
@@ -0,0 +1,9 @@
+Information about doxia-sitetools
+------------------------------
+
+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: trunk/doxia-sitetools/debian/build.properties
===================================================================
--- trunk/doxia-sitetools/debian/build.properties 2011-09-10 15:08:27 UTC (rev 14795)
+++ trunk/doxia-sitetools/debian/build.properties 2011-09-10 15:44:18 UTC (rev 14796)
@@ -1,4 +0,0 @@
-javadoc.dir=build/api
-maven.test.skip=true
-classpath.compile = \
- ${basedir}/doxia-decoration-model/build/doxia-decoration-model-${version}.jar
Deleted: trunk/doxia-sitetools/debian/build.xml
===================================================================
--- trunk/doxia-sitetools/debian/build.xml 2011-09-10 15:08:27 UTC (rev 14795)
+++ trunk/doxia-sitetools/debian/build.xml 2011-09-10 15:44:18 UTC (rev 14796)
@@ -1,63 +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-decoration-model"/>
- <cleanmodule dir="doxia-doc-renderer"/>
- <cleanmodule dir="doxia-site-renderer"/>
- </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-decoration-model/src/main/mdo/decoration.mdo"
- plugin="xpp3-writer" output="./doxia-decoration-model/build/generated-sources"
- version="1.0.0"/>
- <modello model="./doxia-decoration-model/src/main/mdo/decoration.mdo"
- plugin="java" output="./doxia-decoration-model/build/generated-sources"
- version="1.0.0"/>
- <modello model="./doxia-decoration-model/src/main/mdo/decoration.mdo"
- plugin="xpp3-reader" output="./doxia-decoration-model/build/generated-sources"
- version="1.0.0"/>
- <!-- does not work with latest modello
- <modello model="./doxia-decoration-model/src/main/mdo/decoration.mdo"
- plugin="xsd" output="./doxia-decoration-model/build/generated-sources"
- version="1.0.0"/>
- -->
- </target>
-
- <target name="package" depends="generate-sources">
- <packagemodule dir=""/>
- <packagemodule dir="doxia-decoration-model"/>
- <packagemodule dir="doxia-doc-renderer"/>
- <packagemodule dir="doxia-site-renderer"/>
- </target>
-
-</project>
Modified: trunk/doxia-sitetools/debian/changelog
===================================================================
--- trunk/doxia-sitetools/debian/changelog 2011-09-10 15:08:27 UTC (rev 14795)
+++ trunk/doxia-sitetools/debian/changelog 2011-09-10 15:44:18 UTC (rev 14796)
@@ -4,8 +4,10 @@
* Newer but not newest upstream release.
* Refresh patch.
* Update Standards-Version: 3.9.2.
+ * Add a documentation package.
+ * Update debian/copyright.
- -- Torsten Werner <twerner at debian.org> Sat, 10 Sep 2011 17:08:09 +0200
+ -- Torsten Werner <twerner at debian.org> Sat, 10 Sep 2011 17:43:47 +0200
doxia-sitetools (1.1.2-1) unstable; urgency=low
Modified: trunk/doxia-sitetools/debian/control
===================================================================
--- trunk/doxia-sitetools/debian/control 2011-09-10 15:08:27 UTC (rev 14795)
+++ trunk/doxia-sitetools/debian/control 2011-09-10 15:44:18 UTC (rev 14796)
@@ -4,11 +4,12 @@
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Torsten Werner <twerner at debian.org>,
Ludovic Claude <ludovic.claude at laposte.net>, Michael Koch <konqueror at gmx.de>
-Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant,
- ant-optional, libmodello-java, libdoxia-java (>= 1.1.1), libplexus-containers-java,
- libplexus-i18n-java, libplexus-utils-java, libitext1-java, libxalan2-java,
- libplexus-velocity-java, velocity, libcommons-collections-java, fop
-Build-Depends: debhelper (>= 7), cdbs, default-jdk
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4)
+Build-Depends-Indep: libclirr-maven-plugin-java, libmodello-maven-plugin-java, libplexus-maven-plugin-java,
+ libcommons-collections3-java, libdoxia-java, libitext1-java, libjaxp1.3-java,
+ libplexus-containers-java, libplexus-i18n-java, libplexus-utils-java, libxalan2-java,
+ junit (>= 3.8.2), libdoxia-java, default-jdk-doc, libdoxia-java-doc, libplexus-containers-java-doc,
+ libplexus-utils-java-doc, libxalan2-java-doc, libmaven-javadoc-plugin-java
Standards-Version: 3.9.2
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/doxia-sitetools
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/doxia-sitetools/
@@ -16,10 +17,9 @@
Package: libdoxia-sitetools-java
Architecture: all
-Depends: ${misc:Depends}, libdoxia-java, libplexus-containers-java,
- libplexus-i18n-java, libplexus-utils-java
-Recommends: libitext1-java, libxalan2-java, libplexus-velocity-java, velocity,
- libcommons-collections-java
+Depends: ${misc:Depends}, ${maven:Depends}
+Recommends: ${maven:OptionalDepends}
+Suggests: libdoxia-sitetools-java-doc
Conflicts: libdoxia-java (<= 1.0-alpha-7-1)
Description: Extension package of the content generation framework Doxia
Doxia Sitetools generates sites, consisting of static and dynamic content that
@@ -34,3 +34,25 @@
Doxia is used exensively 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-sitetools-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}, ${maven:DocDepends}
+Recommends: ${maven:DocOptionalDepends}
+Suggests: libdoxia-sitetools-java
+Description: Documentation for Doxia Sitetools
+ Doxia Sitetools generates sites, consisting of static and dynamic content that
+ was generated by Doxia. 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 exensively 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 contains the API documentation of libdoxia-sitetools-java.
Modified: trunk/doxia-sitetools/debian/copyright
===================================================================
--- trunk/doxia-sitetools/debian/copyright 2011-09-10 15:08:27 UTC (rev 14795)
+++ trunk/doxia-sitetools/debian/copyright 2011-09-10 15:44:18 UTC (rev 14796)
@@ -1,30 +1,15 @@
-This package was debianized by Torsten Werner <twerner at debian.org>.
+Format: http://dep.debian.net/deps/dep5/
+Upstream-Name: Doxia Sitetools
+Source: http://maven.apache.org/doxia/doxia-sitetools
-doxia-sitetools was downloaded from http://maven.apache.org/doxia/
+Files: *
+Copyright: 2005-2011, The Apache Software Foundation.
+License: Apache-2.0
-Copyright: 2005-2007 The Apache Software Foundation.
+Files: debian/*
+Copyright: 2008-2011, Torsten Werner <Torsten Werner <twerner at debian.org>>
+License: Apache-2.0
-License:
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
-Please see `/usr/share/common-licenses/Apache-2.0' for the full text of
-the license.
-
-The Debian packaging is (C) 2008, Torsten Werner <twerner at debian.org> and
-is licensed under the GPL 3, see `/usr/share/common-licenses/GPL-3'.
+License: Apache-2.0
+ On Debian GNU/Linux system you can find the complete text of the
+ Apache-2.0 license in '/usr/share/common-licenses/Apache-2.0'
Deleted: trunk/doxia-sitetools/debian/doxia-decoration-model-components.xml
===================================================================
--- trunk/doxia-sitetools/debian/doxia-decoration-model-components.xml 2011-09-10 15:08:27 UTC (rev 14795)
+++ trunk/doxia-sitetools/debian/doxia-decoration-model-components.xml 2011-09-10 15:44:18 UTC (rev 14796)
@@ -1,9 +0,0 @@
-<component-set>
- <components>
- <component>
- <role>org.apache.maven.doxia.site.decoration.inheritance.DecorationModelInheritanceAssembler</role>
- <implementation>org.apache.maven.doxia.site.decoration.inheritance.DefaultDecorationModelInheritanceAssembler</implementation>
- <description>Manage inheritance of the decoration model.</description>
- </component>
- </components>
-</component-set>
Deleted: trunk/doxia-sitetools/debian/doxia-site-renderer-components.xml
===================================================================
--- trunk/doxia-sitetools/debian/doxia-site-renderer-components.xml 2011-09-10 15:08:27 UTC (rev 14795)
+++ trunk/doxia-sitetools/debian/doxia-site-renderer-components.xml 2011-09-10 15:44:18 UTC (rev 14796)
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<component-set>
- <components>
- <component>
- <role>org.codehaus.plexus.velocity.VelocityComponent</role>
- <role-hint>doxia-default</role-hint>
- <implementation>org.codehaus.plexus.velocity.DefaultVelocityComponent</implementation>
- <configuration>
- <properties>
- <property>
- <name>resource.loader</name>
- <value>classpath,site</value>
- </property>
- <property>
- <name>classpath.resource.loader.class</name>
- <value>org.codehaus.plexus.velocity.ContextClassLoaderResourceLoader</value>
- </property>
- <property>
- <name>site.resource.loader.class</name>
- <value>org.codehaus.plexus.velocity.SiteResourceLoader</value>
- </property>
- <property>
- <name>runtime.log.invalid.references</name>
- <value>false</value>
- </property>
- <property>
- <name>velocimacro.messages.on</name>
- <value>false</value>
- </property>
- <property>
- <name>resource.manager.logwhenfound</name>
- <value>false</value>
- </property>
-
- <property>
- <name>velocimacro.permissions.allow.inline.to.replace.global</name>
- <value>true</value>
- </property>
- </properties>
- </configuration>
- </component>
-
- <!-- The Renderer component -->
- <component>
- <role>org.apache.maven.doxia.siterenderer.Renderer</role>
- <role-hint>default</role-hint>
- <implementation>org.apache.maven.doxia.siterenderer.DefaultSiteRenderer</implementation>
- <requirements>
- <requirement>
- <role>org.codehaus.plexus.velocity.VelocityComponent</role>
- <field-name>velocity</field-name>
- <role-hint>doxia-default</role-hint>
- </requirement>
- <requirement>
- <role>org.apache.maven.doxia.module.site.manager.SiteModuleManager</role>
- <field-name>siteModuleManager</field-name>
- </requirement>
- <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>
- </components>
-</component-set>
Added: trunk/doxia-sitetools/debian/libdoxia-sitetools-java-doc.doc-base.api
===================================================================
--- trunk/doxia-sitetools/debian/libdoxia-sitetools-java-doc.doc-base.api (rev 0)
+++ trunk/doxia-sitetools/debian/libdoxia-sitetools-java-doc.doc-base.api 2011-09-10 15:44:18 UTC (rev 14796)
@@ -0,0 +1,10 @@
+Document: libdoxia-sitetools-java
+Title: API Javadoc for Doxia Sitetools
+Author: Doxia Sitetools developers
+Abstract: This is the API Javadoc provided for the
+ libdoxia-sitetools-java library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libdoxia-sitetools-java/api/index.html
+Files: /usr/share/doc/libdoxia-sitetools-java/api/*
Added: trunk/doxia-sitetools/debian/libdoxia-sitetools-java-doc.install
===================================================================
--- trunk/doxia-sitetools/debian/libdoxia-sitetools-java-doc.install (rev 0)
+++ trunk/doxia-sitetools/debian/libdoxia-sitetools-java-doc.install 2011-09-10 15:44:18 UTC (rev 14796)
@@ -0,0 +1,2 @@
+target/site/apidocs/* usr/share/doc/libdoxia-sitetools-java/api
+
Modified: trunk/doxia-sitetools/debian/libdoxia-sitetools-java.poms
===================================================================
--- trunk/doxia-sitetools/debian/libdoxia-sitetools-java.poms 2011-09-10 15:08:27 UTC (rev 14795)
+++ trunk/doxia-sitetools/debian/libdoxia-sitetools-java.poms 2011-09-10 15:44:18 UTC (rev 14796)
@@ -1,5 +1,29 @@
-pom.xml --no-parent
-doxia-doc-renderer/pom.xml
-doxia-site-renderer/pom.xml
-doxia-decoration-model/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-decoration-model/pom.xml --has-package-version
+doxia-doc-renderer/pom.xml --has-package-version
+doxia-site-renderer/pom.xml --has-package-version
Added: trunk/doxia-sitetools/debian/maven.cleanIgnoreRules
===================================================================
--- trunk/doxia-sitetools/debian/maven.cleanIgnoreRules (rev 0)
+++ trunk/doxia-sitetools/debian/maven.cleanIgnoreRules 2011-09-10 15:44:18 UTC (rev 14796)
@@ -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/
+
Added: trunk/doxia-sitetools/debian/maven.ignoreRules
===================================================================
--- trunk/doxia-sitetools/debian/maven.ignoreRules (rev 0)
+++ trunk/doxia-sitetools/debian/maven.ignoreRules 2011-09-10 15:44:18 UTC (rev 14796)
@@ -0,0 +1,19 @@
+# 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/
+
+htmlunit htmlunit * * * *
+org.apache.maven.doxia doxia-core * * * *
+org.apache.maven.plugins maven-project-info-reports-plugin * * * *
Added: trunk/doxia-sitetools/debian/maven.properties
===================================================================
--- trunk/doxia-sitetools/debian/maven.properties (rev 0)
+++ trunk/doxia-sitetools/debian/maven.properties 2011-09-10 15:44:18 UTC (rev 14796)
@@ -0,0 +1,4 @@
+# Include here properties to pass to Maven during the build.
+# For example:
+
+maven.test.skip=true
Added: trunk/doxia-sitetools/debian/maven.publishedRules
===================================================================
--- trunk/doxia-sitetools/debian/maven.publishedRules (rev 0)
+++ trunk/doxia-sitetools/debian/maven.publishedRules 2011-09-10 15:44:18 UTC (rev 14796)
@@ -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: trunk/doxia-sitetools/debian/maven.rules
===================================================================
--- trunk/doxia-sitetools/debian/maven.rules 2011-09-10 15:08:27 UTC (rev 14795)
+++ trunk/doxia-sitetools/debian/maven.rules 2011-09-10 15:44:18 UTC (rev 14796)
@@ -1,3 +1,38 @@
-commons-collections commons-collections jar s/3\..*/3.x/
-junit junit jar s/3\..*/3.x/
-com.lowagie itext jar 1.4
+# 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 * *
+commons-collections commons-collections jar s/3\..*/3.x/ * *
+junit junit jar s/3\..*/3.x/ * *
+org.apache.maven.doxia doxia-core jar s/.*/debian/ * *
+org.apache.maven.doxia doxia-decoration-model jar s/.*/debian/ * *
+org.apache.maven.doxia doxia-doc-renderer 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-xdoc jar s/.*/debian/ * *
+org.apache.maven.doxia doxia-module-xhtml jar s/.*/debian/ * *
+org.apache.maven.doxia doxia-sink-api jar s/.*/debian/ * *
+org.apache.maven.doxia doxia-site-renderer jar s/.*/debian/ * *
+org.apache.maven.doxia doxia-sitetools pom s/.*/debian/ * *
+org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ * *
+s/velocity/org.apache.velocity/ * * s/.*/debian/ * *
Modified: trunk/doxia-sitetools/debian/orig-tar.sh
===================================================================
--- trunk/doxia-sitetools/debian/orig-tar.sh 2011-09-10 15:08:27 UTC (rev 14795)
+++ trunk/doxia-sitetools/debian/orig-tar.sh 2011-09-10 15:44:18 UTC (rev 14796)
@@ -1,16 +1,16 @@
#!/bin/sh -e
-TAR=../doxia-sitetools_$2.orig.tar.gz
-DIR=doxia-sitetools-$2
-TAG=doxia-sitetools-$2
+VERSION=$2
+TAR=../doxia-sitetools_$VERSION.orig.tar.gz
+DIR=doxia-sitetools-$VERSION
+TAG=$(echo "doxia-sitetools-$VERSION" | sed -re's/~(alpha|beta)/-\1-/')
-svn export http://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/tags/$TAG $DIR
-tar -c -z -f $TAR $DIR
+svn export http://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/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
Added: trunk/doxia-sitetools/debian/patches/0002-disable-plexus-javadoc.patch
===================================================================
--- trunk/doxia-sitetools/debian/patches/0002-disable-plexus-javadoc.patch (rev 0)
+++ trunk/doxia-sitetools/debian/patches/0002-disable-plexus-javadoc.patch 2011-09-10 15:44:18 UTC (rev 14796)
@@ -0,0 +1,28 @@
+From: Torsten Werner <twerner at debian.org>
+Date: Sat, 10 Sep 2011 17:39:02 +0200
+Subject: disable plexus-javadoc
+
+There is a dependency that cannot be resolved.
+---
+ pom.xml | 7 -------
+ 1 files changed, 0 insertions(+), 7 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index f6259dc..8299e8a 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -260,13 +260,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>
+--
Modified: trunk/doxia-sitetools/debian/patches/series
===================================================================
--- trunk/doxia-sitetools/debian/patches/series 2011-09-10 15:08:27 UTC (rev 14795)
+++ trunk/doxia-sitetools/debian/patches/series 2011-09-10 15:44:18 UTC (rev 14796)
@@ -1 +1,2 @@
0001-fix-for-lastModified.patch
+0002-disable-plexus-javadoc.patch
Modified: trunk/doxia-sitetools/debian/rules
===================================================================
--- trunk/doxia-sitetools/debian/rules 2011-09-10 15:08:27 UTC (rev 14795)
+++ trunk/doxia-sitetools/debian/rules 2011-09-10 15:44:18 UTC (rev 14796)
@@ -1,48 +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 classworlds doxia-core doxia-module-itext doxia-module-xhtml \
- doxia-sink-api doxia-logging-api doxia-module-fo itext1 plexus-classworlds plexus-container-default \
- plexus-i18n plexus-utils plexus-interpolation plexus-velocity velocity xalan2 \
- google-collections xbean-reflect fop
-DEB_ANT_BUILD_TARGET := package
-DEB_ANT_BUILDFILE := debian/build.xml
-DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
+JAVA_HOME := /usr/lib/jvm/default-java
+DEB_MAVEN_DOC_TARGET := javadoc:jar javadoc:aggregate
get-orig-source:
- -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
-
-makebuilddir/lib$(PACKAGE)-java::
- set -e; for COMPONENT in doxia-decoration-model doxia-site-renderer; 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
- mh_installjar -plib$(PACKAGE)-java -l doxia-doc-renderer/pom.xml doxia-doc-renderer/build/doxia-doc-renderer-$(VERSION).jar
- mh_installjar -plib$(PACKAGE)-java -l doxia-site-renderer/pom.xml doxia-site-renderer/build/doxia-site-renderer-$(VERSION).jar
- mh_installjar -plib$(PACKAGE)-java -l doxia-decoration-model/pom.xml doxia-decoration-model/build/doxia-decoration-model-$(VERSION).jar
-
-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: trunk/doxia-sitetools/debian/watch
===================================================================
--- trunk/doxia-sitetools/debian/watch 2011-09-10 15:08:27 UTC (rev 14795)
+++ trunk/doxia-sitetools/debian/watch 2011-09-10 15:44:18 UTC (rev 14796)
@@ -1,3 +1,4 @@
version=3
-http://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/tags/ \
- doxia-sitetools-(.*)/ debian debian/orig-tar.sh
+opts="uversionmangle=s/-(alpha|beta)-/~$1/" \
+ http://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/tags/ \
+ doxia-sitetools-(\d.*)/ debian debian/orig-tar.sh
More information about the pkg-java-commits
mailing list