[pkg-java] r10388 - trunk/libjboss-marshalling-java/debian
Torsten Werner
twerner at alioth.debian.org
Tue Sep 15 19:32:45 UTC 2009
Author: twerner
Date: 2009-09-15 19:32:45 +0000 (Tue, 15 Sep 2009)
New Revision: 10388
Added:
trunk/libjboss-marshalling-java/debian/libjboss-marshalling-java.poms
Removed:
trunk/libjboss-marshalling-java/debian/poms
Modified:
trunk/libjboss-marshalling-java/debian/
trunk/libjboss-marshalling-java/debian/build.properties
trunk/libjboss-marshalling-java/debian/build.xml
trunk/libjboss-marshalling-java/debian/control
trunk/libjboss-marshalling-java/debian/orig-tar.sh
trunk/libjboss-marshalling-java/debian/rules
trunk/libjboss-marshalling-java/debian/watch
Log:
package builds
Property changes on: trunk/libjboss-marshalling-java/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Modified: trunk/libjboss-marshalling-java/debian/build.properties
===================================================================
--- trunk/libjboss-marshalling-java/debian/build.properties 2009-09-15 18:58:00 UTC (rev 10387)
+++ trunk/libjboss-marshalling-java/debian/build.properties 2009-09-15 19:32:45 UTC (rev 10388)
@@ -1,26 +1,5 @@
-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/fop.jar:\
- /usr/share/java/itext1.jar
+build.javaVersion = 1.5
+build.javaVersion = 1.5
+javadoc.dir = build/api
+maven.test.skip = true
+classpath.compile = ${basedir}/api/build/marshalling-api-${version}.jar
Modified: trunk/libjboss-marshalling-java/debian/build.xml
===================================================================
--- trunk/libjboss-marshalling-java/debian/build.xml 2009-09-15 18:58:00 UTC (rev 10387)
+++ trunk/libjboss-marshalling-java/debian/build.xml 2009-09-15 19:32:45 UTC (rev 10388)
@@ -7,93 +7,46 @@
<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>
+ <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>
+ <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"/>
+ <delete dir="build"/>
+ <cleanmodule dir="api"/>
+ <cleanmodule dir="river"/>
+ <cleanmodule dir="serial"/>
+ <cleanmodule dir="serialization-java"/>
</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 name="package">
+ <packagemodule dir="api"/>
+ <packagemodule dir="river"/>
+ <packagemodule dir="serial"/>
+ <packagemodule dir="serialization-java"/>
</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/"/>
+ <packageset dir="api/src/main/java/"/>
+ <packageset dir="river/src/main/java/"/>
+ <packageset dir="serial/src/main/java/"/>
+ <packageset dir="serialization-java/src/main/java/"/>
</javadoc>
</target>
Modified: trunk/libjboss-marshalling-java/debian/control
===================================================================
--- trunk/libjboss-marshalling-java/debian/control 2009-09-15 18:58:00 UTC (rev 10387)
+++ trunk/libjboss-marshalling-java/debian/control 2009-09-15 19:32:45 UTC (rev 10388)
@@ -5,7 +5,7 @@
Uploaders: Torsten Werner <twerner at debian.org>
Build-Depends-Indep: maven-repo-helper (>= 0.7), maven-ant-helper (>> 4)
Build-Depends: ant, debhelper (>= 5), cdbs, default-jdk
-Standards-Version: 3.8.<F3>
+Standards-Version: 3.8.3
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libjboss-marshalling-java
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjboss-marshalling-java/
Homepage: http://jboss.org/jbossmarshalling/
Copied: trunk/libjboss-marshalling-java/debian/libjboss-marshalling-java.poms (from rev 10387, trunk/libjboss-marshalling-java/debian/poms)
===================================================================
--- trunk/libjboss-marshalling-java/debian/libjboss-marshalling-java.poms (rev 0)
+++ trunk/libjboss-marshalling-java/debian/libjboss-marshalling-java.poms 2009-09-15 19:32:45 UTC (rev 10388)
@@ -0,0 +1,6 @@
+pom.xml
+api/pom.xml
+river/pom.xml
+serial/pom.xml
+serialization-java/pom.xml
+
Modified: trunk/libjboss-marshalling-java/debian/orig-tar.sh
===================================================================
--- trunk/libjboss-marshalling-java/debian/orig-tar.sh 2009-09-15 18:58:00 UTC (rev 10387)
+++ trunk/libjboss-marshalling-java/debian/orig-tar.sh 2009-09-15 19:32:45 UTC (rev 10388)
@@ -1,12 +1,10 @@
#!/bin/sh -e
-TAR=../doxia_$2.orig.tar.gz
-DIR=doxia-$2
-TAG=doxia-$2
+TAR=../libjboss-marshalling-java_$2.orig.tar.gz
+DIR=jboss-marshalling-$2
+TAG=$2
-svn export http://svn.apache.org/repos/asf/maven/doxia/doxia/tags/$TAG $DIR
-# remove as it's packaged elsewhere
-rm -r $DIR/doxia-maven-plugin
+svn export http://anonsvn.jboss.org/repos/jbossmarshalling/core/tags/$TAG $DIR
tar -c -z -f $TAR $DIR
rm -rf $DIR ../$TAG
@@ -16,3 +14,4 @@
mv $TAR $origDir
echo "moved $TAR to $origDir"
fi
+
Deleted: trunk/libjboss-marshalling-java/debian/poms
===================================================================
--- trunk/libjboss-marshalling-java/debian/poms 2009-09-15 18:58:00 UTC (rev 10387)
+++ trunk/libjboss-marshalling-java/debian/poms 2009-09-15 19:32:45 UTC (rev 10388)
@@ -1,6 +0,0 @@
-pom.xml
-api/pom.xml
-river/pom.xml
-serial/pom.xml
-serialization-java/pom.xml
-
Modified: trunk/libjboss-marshalling-java/debian/rules
===================================================================
--- trunk/libjboss-marshalling-java/debian/rules 2009-09-15 18:58:00 UTC (rev 10387)
+++ trunk/libjboss-marshalling-java/debian/rules 2009-09-15 19:32:45 UTC (rev 10388)
@@ -3,7 +3,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.mk
-PACKAGE := $(DEB_SOURCE_PACKAGE)
+PACKAGE := jboss-marshalling
VERSION := $(DEB_UPSTREAM_VERSION)
JAVA_HOME := /usr/lib/jvm/default-java
DEB_JARS := ant-nodeps
@@ -11,16 +11,16 @@
DEB_ANT_BUILDFILE := debian/build.xml
DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
API_DOCS := build/api
-MODULES := api river serial serialization-java
get-orig-source:
uscan --download-version $(VERSION) --force-download --rename
binary-post-install/lib$(PACKAGE)-java::
mh_installpoms -plib$(PACKAGE)-java
- set -e; for MODULE in $(MODULES); do \
- mh_installjar -plib$(PACKAGE)-java $$MODULE/pom.xml $$MODULE/build/$$MODULE-$(VERSION).jar; \
- done
+ mh_installjar -plib$(PACKAGE)-java -l api/pom.xml api/build/marshalling-api-$(VERSION).jar
+ mh_installjar -plib$(PACKAGE)-java -l river/pom.xml river/build/river-$(VERSION).jar
+ mh_installjar -plib$(PACKAGE)-java -l serial/pom.xml serial/build/serial-$(VERSION).jar
+ mh_installjar -plib$(PACKAGE)-java -l serialization-java/pom.xml serialization-java/build/serialization-java-$(VERSION).jar
#binary-post-install/lib$(PACKAGE)-java-doc::
# dh_install -plib$(PACKAGE)-java-doc $(API_DOCS) usr/share/doc/lib$(PACKAGE)-java
Modified: trunk/libjboss-marshalling-java/debian/watch
===================================================================
--- trunk/libjboss-marshalling-java/debian/watch 2009-09-15 18:58:00 UTC (rev 10387)
+++ trunk/libjboss-marshalling-java/debian/watch 2009-09-15 19:32:45 UTC (rev 10388)
@@ -1,3 +1,3 @@
version=3
-http://svn.apache.org/repos/asf/maven/doxia/doxia/tags/ doxia-(\d.*)/ \
+http://anonsvn.jboss.org/repos/jbossmarshalling/core/tags/ (\d.*)/ \
debian debian/orig-tar.sh
More information about the pkg-java-commits
mailing list