[pkg-java] r8910 - trunk/doxia-sitetools/debian
Ludovic Claude
ludovicc-guest at alioth.debian.org
Mon Jul 6 22:18:01 UTC 2009
Author: ludovicc-guest
Date: 2009-07-06 22:18:01 +0000 (Mon, 06 Jul 2009)
New Revision: 8910
Added:
trunk/doxia-sitetools/debian/doxia-decoration-model-components.xml
trunk/doxia-sitetools/debian/doxia-site-renderer-components.xml
trunk/doxia-sitetools/debian/libdoxia-sitetools-java.poms
trunk/doxia-sitetools/debian/maven.rules
Removed:
trunk/doxia-sitetools/debian/components.xml-decoration-model
trunk/doxia-sitetools/debian/components.xml-site-renderer
Modified:
trunk/doxia-sitetools/debian/build.properties
trunk/doxia-sitetools/debian/build.xml
trunk/doxia-sitetools/debian/changelog
trunk/doxia-sitetools/debian/control
trunk/doxia-sitetools/debian/copyright
trunk/doxia-sitetools/debian/orig-tar.sh
trunk/doxia-sitetools/debian/rules
Log:
* New version
Modified: trunk/doxia-sitetools/debian/build.properties
===================================================================
--- trunk/doxia-sitetools/debian/build.properties 2009-07-06 22:05:25 UTC (rev 8909)
+++ trunk/doxia-sitetools/debian/build.properties 2009-07-06 22:18:01 UTC (rev 8910)
@@ -1,3 +1,4 @@
javadoc.dir=build/api
+maven.test.skip=true
classpath.compile = \
${basedir}/doxia-decoration-model/build/doxia-decoration-model-${version}.jar
Modified: trunk/doxia-sitetools/debian/build.xml
===================================================================
--- trunk/doxia-sitetools/debian/build.xml 2009-07-06 22:05:25 UTC (rev 8909)
+++ trunk/doxia-sitetools/debian/build.xml 2009-07-06 22:18:01 UTC (rev 8910)
@@ -2,16 +2,35 @@
<project name="pkg-java" default="package" basedir="..">
- <property file="debian/build.properties"/>
- <property name="maven.test.skip" value="true"/>
- <property name="maven.build.xml" value="/usr/share/maven-ant-helper/maven-build.xml"/>
- <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/>
+ <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">
- <ant target="clean" antfile="${maven.build.xml}" dir="."/>
- <ant target="clean" antfile="${maven.build.xml}" dir="doxia-decoration-model"/>
- <ant target="clean" antfile="${maven.build.xml}" dir="doxia-doc-renderer"/>
- <ant target="clean" antfile="${maven.build.xml}" dir="doxia-site-renderer"/>
+ <delete dir="build"/>
+ <cleanmodule dir="doxia-decoration-model"/>
+ <cleanmodule dir="doxia-doc-renderer"/>
+ <cleanmodule dir="doxia-site-renderer"/>
</target>
<target name="generate-sources">
@@ -32,33 +51,13 @@
plugin="xsd" output="./doxia-decoration-model/build/generated-sources"
version="1.0.0"/>
-->
-
- <modello model="./doxia-doc-renderer/src/main/mdo/document.mdo"
- plugin="xpp3-writer" output="./doxia-doc-renderer/build/generated-sources"
- version="1.0.0"/>
- <modello model="./doxia-doc-renderer/src/main/mdo/document.mdo"
- plugin="java" output="./doxia-doc-renderer/build/generated-sources"
- version="1.0.0"/>
- <modello model="./doxia-doc-renderer/src/main/mdo/document.mdo"
- plugin="xpp3-reader" output="./doxia-doc-renderer/build/generated-sources"
- version="1.0.0"/>
- <!-- does not work with latest modello
- <modello model="./doxia-doc-renderer/src/main/mdo/document.mdo"
- plugin="xsd" output="./doxia-doc-renderer/build/generated-sources"
- version="1.0.0"/>
- -->
</target>
- <target name="package" depends="generate-sources">
- <ant target="package" antfile="${maven.build.xml}" dir="doxia-decoration-model">
- <property name="artifactId" value="doxia-decoration-model"/>
- </ant>
- <ant target="package" antfile="${maven.build.xml}" dir="doxia-doc-renderer">
- <property name="artifactId" value="doxia-doc-renderer"/>
- </ant>
- <ant target="package" antfile="${maven.build.xml}" dir="doxia-site-renderer">
- <property name="artifactId" value="doxia-site-renderer"/>
- </ant>
- </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 2009-07-06 22:05:25 UTC (rev 8909)
+++ trunk/doxia-sitetools/debian/changelog 2009-07-06 22:18:01 UTC (rev 8910)
@@ -1,3 +1,16 @@
+doxia-sitetools (1.1-1) unstable; urgency=low
+
+ * New upstream version, add myself to Uploaders
+ * Change section to java, bump up Standards-Version to 3.8.1
+ * Add ${misc:Depends} to Depends to clear Lintian warnings
+ * Add the Maven POM 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
+ * Add Depends: and Recommends: on the binary package
+
+ -- Ludovic Claude <ludovic.claude at laposte.net> Thu, 14 May 2009 18:27:59 +0100
+
doxia-sitetools (1.0-alpha-11-3) unstable; urgency=low
* Add plexus component descriptors.
Deleted: trunk/doxia-sitetools/debian/components.xml-decoration-model
===================================================================
--- trunk/doxia-sitetools/debian/components.xml-decoration-model 2009-07-06 22:05:25 UTC (rev 8909)
+++ trunk/doxia-sitetools/debian/components.xml-decoration-model 2009-07-06 22:18:01 UTC (rev 8910)
@@ -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/components.xml-site-renderer
===================================================================
--- trunk/doxia-sitetools/debian/components.xml-site-renderer 2009-07-06 22:05:25 UTC (rev 8909)
+++ trunk/doxia-sitetools/debian/components.xml-site-renderer 2009-07-06 22:18:01 UTC (rev 8910)
@@ -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>
Modified: trunk/doxia-sitetools/debian/control
===================================================================
--- trunk/doxia-sitetools/debian/control 2009-07-06 22:05:25 UTC (rev 8909)
+++ trunk/doxia-sitetools/debian/control 2009-07-06 22:18:01 UTC (rev 8910)
@@ -1,22 +1,22 @@
Source: doxia-sitetools
-Section: devel
+Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Torsten Werner <twerner at debian.org>
-Build-Depends-Indep: default-jdk, maven-ant-helper, libclassworlds-java,
- libdoxia-java, libitext-java, libmodello-java, libplexus-containers-java,
- libplexus-classworlds-java, libplexus-i18n-java, libplexus-utils-java,
- libplexus-velocity-java, libxalan2-java, velocity, libgoogle-collections-java,
- libxbean-java
-Build-Depends: ant, debhelper (>= 5), cdbs
-Standards-Version: 3.8.0
+Uploaders: Torsten Werner <twerner at debian.org>, Ludovic Claude <ludovic.claude at laposte.net>
+Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional,
+ libmodello-java,
+ libdoxia-java, libplexus-containers-java, libplexus-i18n-java, libplexus-utils-java,
+ libitext1-java, libxalan2-java, libplexus-velocity-java, velocity, libcommons-collections-java
+Build-Depends: debhelper (>= 5), cdbs, default-jdk
+Standards-Version: 3.8.1
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/doxia-sitetools
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/doxia-sitetools/
Homepage: http://maven.apache.org/doxia/doxia-sitetools/
Package: libdoxia-sitetools-java
Architecture: all
-Section: devel
+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
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
Modified: trunk/doxia-sitetools/debian/copyright
===================================================================
--- trunk/doxia-sitetools/debian/copyright 2009-07-06 22:05:25 UTC (rev 8909)
+++ trunk/doxia-sitetools/debian/copyright 2009-07-06 22:18:01 UTC (rev 8910)
@@ -27,4 +27,4 @@
the license.
The Debian packaging is (C) 2008, Torsten Werner <twerner at debian.org> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+is licensed under the GPL 3, see `/usr/share/common-licenses/GPL-3'.
Added: trunk/doxia-sitetools/debian/doxia-decoration-model-components.xml
===================================================================
--- trunk/doxia-sitetools/debian/doxia-decoration-model-components.xml (rev 0)
+++ trunk/doxia-sitetools/debian/doxia-decoration-model-components.xml 2009-07-06 22:18:01 UTC (rev 8910)
@@ -0,0 +1,9 @@
+<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>
Added: trunk/doxia-sitetools/debian/doxia-site-renderer-components.xml
===================================================================
--- trunk/doxia-sitetools/debian/doxia-site-renderer-components.xml (rev 0)
+++ trunk/doxia-sitetools/debian/doxia-site-renderer-components.xml 2009-07-06 22:18:01 UTC (rev 8910)
@@ -0,0 +1,89 @@
+<?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.poms
===================================================================
--- trunk/doxia-sitetools/debian/libdoxia-sitetools-java.poms (rev 0)
+++ trunk/doxia-sitetools/debian/libdoxia-sitetools-java.poms 2009-07-06 22:18:01 UTC (rev 8910)
@@ -0,0 +1,5 @@
+pom.xml --no-parent
+doxia-doc-renderer/pom.xml
+doxia-site-renderer/pom.xml
+doxia-decoration-model/pom.xml
+
Added: trunk/doxia-sitetools/debian/maven.rules
===================================================================
--- trunk/doxia-sitetools/debian/maven.rules (rev 0)
+++ trunk/doxia-sitetools/debian/maven.rules 2009-07-06 22:18:01 UTC (rev 8910)
@@ -0,0 +1,2 @@
+commons-collections commons-collections jar s/3\..*/3.x/
+junit junit jar s/3\..*/3.x/
Property changes on: trunk/doxia-sitetools/debian/orig-tar.sh
___________________________________________________________________
Modified: svn:executable
-
+ *
Modified: trunk/doxia-sitetools/debian/rules
===================================================================
--- trunk/doxia-sitetools/debian/rules 2009-07-06 22:05:25 UTC (rev 8909)
+++ trunk/doxia-sitetools/debian/rules 2009-07-06 22:18:01 UTC (rev 8910)
@@ -3,30 +3,46 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.mk
-PACKAGE := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ')
-VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | sed 's/Version: \(.*\)-.*/\1/')
+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
DEB_ANT_BUILD_TARGET := package
DEB_ANT_BUILDFILE := debian/build.xml
-DEB_ANT_ARGS := -Dversion=$(VERSION)
-DEB_JARS := classworlds doxia-core doxia-module-itext doxia-module-xhtml \
- doxia-sink-api itext plexus-classworlds plexus-container-default-1.0 \
- plexus-i18n plexus-utils plexus-interpolation plexus-velocity velocity xalan2 \
- google-collect xbean-reflect
+DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
get-orig-source:
- uscan --force-download
+ -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
makebuilddir/lib$(PACKAGE)-java::
- install -d doxia-decoration-model/build/classes/META-INF/plexus/
- install -m644 debian/components.xml-decoration-model doxia-decoration-model/build/classes/META-INF/plexus/components.xml
- install -d doxia-site-renderer/build/classes/META-INF/plexus/
- install -m644 debian/components.xml-site-renderer doxia-site-renderer/build/classes/META-INF/plexus/components.xml
+ 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::
- dh_install -plib$(PACKAGE)-java doxia-decoration-model/build/doxia-decoration-model-$(VERSION).jar usr/share/java
- dh_link -plib$(PACKAGE)-java usr/share/java/doxia-decoration-model-$(VERSION).jar usr/share/java/doxia-decoration-model.jar
- dh_install -plib$(PACKAGE)-java doxia-doc-renderer/build/doxia-doc-renderer-$(VERSION).jar usr/share/java
- dh_link -plib$(PACKAGE)-java usr/share/java/doxia-doc-renderer-$(VERSION).jar usr/share/java/doxia-doc-renderer.jar
- dh_install -plib$(PACKAGE)-java doxia-site-renderer/build/doxia-site-renderer-$(VERSION).jar usr/share/java
- dh_link -plib$(PACKAGE)-java usr/share/java/doxia-site-renderer-$(VERSION).jar usr/share/java/doxia-site-renderer.jar
+ 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)
Property changes on: trunk/doxia-sitetools/debian/rules
___________________________________________________________________
Modified: svn:executable
-
+ *
More information about the pkg-java-commits
mailing list