[pkg-java] r7671 - trunk/doxia-sitetools/debian

[twerner at alioth.debian.org]

Author: twerner
Date: 2008-12-15 21:08:24 +0000 (Mon, 15 Dec 2008)
New Revision: 7671

Modified:
   trunk/doxia-sitetools/debian/build.xml
   trunk/doxia-sitetools/debian/changelog
   trunk/doxia-sitetools/debian/control
   trunk/doxia-sitetools/debian/rules
Log:
* Update for newest modello package.
* Run modello for doxia-decoration-model.

Modified: trunk/doxia-sitetools/debian/build.xml
===================================================================
--- trunk/doxia-sitetools/debian/build.xml	2008-12-15 20:26:00 UTC (rev 7670)
+++ trunk/doxia-sitetools/debian/build.xml	2008-12-15 21:08:24 UTC (rev 7671)
@@ -17,9 +17,22 @@
   <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"/>
+    -->
+
     <modello model="./doxia-doc-renderer/src/main/mdo/document.mdo"
       plugin="xpp3-writer" output="./doxia-doc-renderer/build/generated-sources"
       version="1.0.0"/>
@@ -29,6 +42,11 @@
     <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">

Modified: trunk/doxia-sitetools/debian/changelog
===================================================================
--- trunk/doxia-sitetools/debian/changelog	2008-12-15 20:26:00 UTC (rev 7670)
+++ trunk/doxia-sitetools/debian/changelog	2008-12-15 21:08:24 UTC (rev 7671)
@@ -1,3 +1,10 @@
+doxia-sitetools (1.0-alpha-11-2) unstable; urgency=low
+
+  * Update for newest modello package.
+  * Run modello for doxia-decoration-model.
+
+ -- Torsten Werner <twerner at debian.org>  Mon, 15 Dec 2008 22:07:33 +0100
+
 doxia-sitetools (1.0-alpha-11-1) unstable; urgency=low
 
   * Initial release. (Closes: #507082)

Modified: trunk/doxia-sitetools/debian/control
===================================================================
--- trunk/doxia-sitetools/debian/control	2008-12-15 20:26:00 UTC (rev 7670)
+++ trunk/doxia-sitetools/debian/control	2008-12-15 21:08:24 UTC (rev 7671)
@@ -4,9 +4,10 @@
 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-container-default-java,
- libplexus-i18n-java, libplexus-utils-java, libplexus-velocity-java, libxalan2-java,
- velocity
+ 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
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/doxia-sitetools

Modified: trunk/doxia-sitetools/debian/rules
===================================================================
--- trunk/doxia-sitetools/debian/rules	2008-12-15 20:26:00 UTC (rev 7670)
+++ trunk/doxia-sitetools/debian/rules	2008-12-15 21:08:24 UTC (rev 7671)
@@ -10,8 +10,9 @@
 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-container-default plexus-i18n plexus-utils \
-  plexus-velocity velocity xalan2
+  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
 
 get-orig-source:
 	uscan --force-download