This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository libxalan2-java.
commit fed2b6e9a50f7d3c8028018048adeae4dde899e8
Author: Ludovic Claude <ludovic.cla...@laposte.net>
Date: Tue Aug 4 12:53:19 2009 +0000
* Update patch and orig tarball
---
debian/orig-tar.sh | 19 +++++++++++++++++++
debian/patches/build.patch | 38 ++++++++++++++++++++++++--------------
debian/rules | 2 --
debian/watch | 2 +-
4 files changed, 44 insertions(+), 17 deletions(-)
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
new file mode 100755
index 0000000..2561cda
--- /dev/null
+++ b/debian/orig-tar.sh
@@ -0,0 +1,19 @@
+#!/bin/sh -e
+
+VERSION=$2
+TAR=../libxalan2-java_$VERSION.orig.tar.gz
+DIR=libxalan2-java-$VERSION
+
+mkdir $DIR
+tar -x -v -z -f $TAR $DIR
+dos2unix $DIR/build.xml
+rm $TAR
+GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.class' $DIR
+rm -r $DIR
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+ . .svn/deb-layout
+ mv $TAR $origDir
+ echo "moved $TAR to $origDir"
+fi
diff --git a/debian/patches/build.patch b/debian/patches/build.patch
index 0b4af50..2c927bb 100644
--- a/debian/patches/build.patch
+++ b/debian/patches/build.patch
@@ -48,21 +48,21 @@
<arg line="targetDirectory=${build.docs} ${xdocs.book}
${xdocs.style}"/>
</java>
</target>
-@@ -1029,6 +1036,7 @@
+@@ -1028,6 +1035,7 @@
+ <javadoc
additionalparam="-breakiterator"
destdir="${build.apidocs}"
++ maxmemory="512m"
public="true"
-+ maxmemory="256m"
sourcepath="${src.dir}"
overview="${src.dir}/javadocOverview.html"
- packagenames="org.apache.*,org.xml.*,org.w3c.*,javax.xml.*"
@@ -1039,7 +1047,9 @@
doctitle="${Name-in-docs} ${impl.version}"
bottom="Copyright © ${year} Apache XML Project. All Rights
Reserved.">
<classpath refid="docs.class.path" />
-+ <!--
++ <!--
<taglet name="xalan2jtaglet.XSLUsageTag" path="${taglet.jar}"/>
-+ -->
++ -->
<group title="Transformations API for XML (TrAX)"
packages="javax.xml.transform*"/>
<group title="Java API for XML Parsing"
packages="javax.xml.parsers"/>
<group title="Xalan Core"
@@ -114,15 +114,7 @@
<arg line="${build.docs}/xalan-collate.fo build/docs/xalan.pdf"/>
</java>
</target>
-@@ -1526,6 +1542,7 @@
- <!--
- <echo message="Transform xsltc_todo.xml and put the result in
${build.docs}/xsltc"/>
- <java fork="yes" classname="${xalan.cmdline.class}">
-+ <jvmarg value="-Djava.awt.headless=true"/>
- <classpath refid="docs.class.path" />
- <arg line="-in xsltc_todo.xml -xsl todo.xsl -out
build/docs/xsltc/todo.html"/>
- </java> -->
-@@ -1536,6 +1553,7 @@
+@@ -1536,6 +1552,7 @@
<java fork="yes"
classname="${doc.generator}"
classpathref="docs.class.path" >
@@ -130,3 +122,21 @@
<arg line="targetDirectory=${build.docs}/xsltc
${xdocs.dir}/sources/xsltc.xml ${xdocs.style}"/>
</java>
<copy todir="${build.docs}/xsltc"
+@@ -1695,7 +1712,7 @@
+ use="true"
+ windowtitle="${Name-in-docs} Serializer ${impl.version}"
+ doctitle="${Name-in-docs} Serializer ${impl.version}"
+- bottom="Copyright © ${year} Apache XML Project. All Rights
Reserved.">
++ bottom="Copyright ${year} Apache XML Project. All Rights Reserved.">
+ <classpath refid="docs.class.path" />
+ <taglet name="xalan2jtaglet.XSLUsageTag" path="${taglet.jar}"/>
+ <group title="Serializer" packages="org.apache.xml.serialize*"/>
+@@ -1713,7 +1730,7 @@
+ use="true"
+ windowtitle="${Name-in-docs} Serializer ${impl.version}"
+ doctitle="${Name-in-docs} Serializer ${impl.version}"
+- bottom="Copyright © ${year} Apache XML Project. All Rights
Reserved.">
++ bottom="Copyright ${year} Apache XML Project. All Rights Reserved.">
+ <classpath refid="docs.class.path" />
+ <doclet name="xalanjdoc.Standard" path="${doclet.jar}">
+ <param name="-d" value="${build.apidocs}"/>
diff --git a/debian/rules b/debian/rules
index 8be54a6..d9e482f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,8 +5,6 @@ include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/class/ant.mk
-QUILT_PATCH_OPTS="--ignore-whitespace"
-
PACKAGE := $(DEB_SOURCE_PACKAGE)
VERSION := $(DEB_UPSTREAM_VERSION)
JAVA_HOME := /usr/lib/jvm/default-java
diff --git a/debian/watch b/debian/watch
index 4c533c3..88fae6d 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
version=3
opts=uversionmangle=s/_/./g \
- http://www.apache.org/dist/xml/xalan-j/source/
xalan-j_?([\d+_]+|\d+)-src\.tar.* debian uupdate
+ http://www.apache.org/dist/xml/xalan-j/source/
xalan-j_?([\d+_]+|\d+)-src\.tar.* debian debian/orig-tar.sh
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/libxalan2-java.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
