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 d0d106604670863f050d36c20738144c50339142
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Mon Sep 28 15:22:20 2015 +0200
Simplified debian/patches/build.patch
---
debian/ant.properties | 8 ++++++--
debian/changelog | 1 +
debian/patches/build.patch | 37 -------------------------------------
debian/rules | 6 ------
4 files changed, 7 insertions(+), 45 deletions(-)
diff --git a/debian/ant.properties b/debian/ant.properties
index 08bf23d..b81fd96 100644
--- a/debian/ant.properties
+++ b/debian/ant.properties
@@ -1,12 +1,16 @@
+lib.dir=/usr/share/java
+tools.dir=/usr/share/java
xmlapis.jar=/usr/share/java/xmlParserAPIs.jar
parser.jar=/usr/share/java/xercesImpl.jar
bsf.jar=/usr/share/java/bsf.jar
bcel.jar=/usr/share/java/bcel.jar
+bcel.jar.name=bcel.jar
java_cup.jar=/usr/share/java/cup.jar
-#jlex.jar=/usr/share/java/JLex.jar
-runtime.jar=/usr/share/java/cup.jar
+runtime.jar.name=cup.jar
regexp.jar=/usr/share/java/regexp.jar
+stylebook.jar=/usr/share/java/stylebook.jar
build.boot.class.path=/usr/share/java/jaxp-1.3.jar
+
# Ensure that source and target are 1.5
# For backwards compat on Java 7
ant.build.javac.source=1.5
diff --git a/debian/changelog b/debian/changelog
index 657269f..6928d73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
libxalan2-java (2.7.1-10) UNRELEASED; urgency=medium
* Team upload.
+ * Simplified debian/patches/build.patch
* debian/control:
- Standards-Version updated to 3.9.6 (no changes)
* Moved the package to Git
diff --git a/debian/patches/build.patch b/debian/patches/build.patch
index 439b5e7..82ecc5c 100644
--- a/debian/patches/build.patch
+++ b/debian/patches/build.patch
@@ -1,42 +1,5 @@
--- a/build.xml
+++ b/build.xml
-@@ -80,10 +80,10 @@
- <!-- Xalan Java directories -->
- <!-- <property name="bin.dir" value="./bin"/> -->
- <property name="build.dir" value="./build"/>
-- <property name="lib.dir" value="./lib"/>
-+ <property name="lib.dir" value="/usr/share/java"/>
- <property name="samples.dir" value="./samples"/>
- <property name="src.dir" value="./src"/>
-- <property name="tools.dir" value="./tools"/>
-+ <property name="tools.dir" value="/usr/share/java"/>
- <property name="xdocs.dir" value="./xdocs"/>
-
- <property name="apachexml.reldir" value="org/apache/xml"/>
-@@ -98,19 +98,19 @@
- <property name="xmlapis.jar"
value="${lib.dir}/${xmlapis.jar.name}"/>
- <property name="parser.jar.name" value="xercesImpl.jar"/>
- <property name="parser.jar"
value="${lib.dir}/${parser.jar.name}"/>
-- <property name="bcel.jar.name" value="BCEL.jar"/>
-+ <property name="bcel.jar.name" value="bcel.jar"/>
- <property name="bcel.jar"
value="${lib.dir}/${bcel.jar.name}"/>
-- <property name="runtime.jar.name" value="runtime.jar"/>
-+ <property name="runtime.jar.name" value="cup.jar"/>
- <property name="runtime.jar"
value="${lib.dir}/${runtime.jar.name}"/>
- <property name="regexp.jar.name" value="regexp.jar"/>
- <property name="regexp.jar"
value="${lib.dir}/${regexp.jar.name}"/>
-
- <!-- Jars need to build Xalan Java (Interpretive, Compiled, or both) or
build the docs -->
-- <property name="java_cup.jar.name" value="java_cup.jar"/>
-+ <property name="java_cup.jar.name" value="cup.jar"/>
- <property name="java_cup.jar"
value="${tools.dir}/${java_cup.jar.name}"/>
- <property name="jlex.jar.name" value="JLex.jar"/>
- <property name="jlex.jar"
value="${tools.dir}/${jlex.jar.name}"/>
-- <property name="stylebook.jar.name"
value="stylebook-1.0-b3_xalan-2.jar"/>
-+ <property name="stylebook.jar.name" value="stylebook.jar"/>
- <property name="stylebook.jar"
value="${tools.dir}/${stylebook.jar.name}"/>
- <property name="doclet.jar.name" value="xalan2jdoc.jar"/>
- <property name="doclet.jar"
value="${tools.dir}/${doclet.jar.name}"/>
@@ -354,11 +354,13 @@
puts the result in xdocs/sources/xalan for inclusion in the
readme.xml -->
<echo message="Transform commits.xml and put the result in ${xdocs.dir}"/>
diff --git a/debian/rules b/debian/rules
index 4a399ca..698cfd6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,14 +18,8 @@ DEB_ANT_BUILD_TARGET := jar xsltc.unbundledjar javadocs docs
clean::
rm -f xdocs/sources/xalan/*DONE XSLTCDONE
- rm -f lib/BCEL.jar lib/regexp.jar
mh_clean
-pre-build::
- rm -f lib/BCEL.jar lib/regexp.jar
- ln -s /usr/share/java/bcel.jar lib/BCEL.jar
- ln -s /usr/share/java/regexp.jar lib/regexp.jar
-
install/libxalan2-java::
mh_installpoms -p$(PACKAGE);
mh_installjar -p$(PACKAGE) -l --usj-name=xalan2 debian/xalan.pom
build/xalan.jar
--
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
