[SCM] dita-ot packaging branch, master, updated. upstream/1.5.3-6-gffa8917

[Jakub Adam]

The following commit has been merged in the master branch:
commit ffa8917029c6e22bbc7eebe4d183dac8c94f9886
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Sat Apr 14 20:00:10 2012 +0200

    Build demo/fo/lib/fo.jar

diff --git a/debian/control b/debian/control
index e1fceac..0d66a89 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Jakub Adam <jakub.adam at ktknet.cz>
 Build-Depends: debhelper (>= 8~), cdbs, default-jdk, ant, javahelper,
- libcommons-codec-java, libxerces2-java, libsaxon-java
+ libcommons-codec-java, libxerces2-java, libsaxon-java, libicu4j-4.4-java
 Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/git/pkg-java/dita-ot.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/dita-ot.git
diff --git a/debian/dita-ot.classpath b/debian/dita-ot.classpath
index f3d00f9..7a78002 100644
--- a/debian/dita-ot.classpath
+++ b/debian/dita-ot.classpath
@@ -1 +1,2 @@
 usr/share/dita-ot/lib/dost.jar /usr/share/java/xml-resolver.jar /usr/share/java/xercesImpl.jar /usr/share/java/commons-codec.jar /usr/share/java/xalan2.jar
+usr/share/dita-ot/demo/fo/lib/fo.jar /usr/share/java/com.ibm.icu-4.4.jar
diff --git a/debian/patches/debian-custom-build.patch b/debian/patches/debian-custom-build.patch
index d21a58e..ba229bf 100644
--- a/debian/patches/debian-custom-build.patch
+++ b/debian/patches/debian-custom-build.patch
@@ -130,7 +130,7 @@ index 0bdc69d..697ac21 100644
  
    <target name="doc" depends="update-doc" description="Build documentation">
 diff --git a/demo/fo/buildPackage.xml b/demo/fo/buildPackage.xml
-index dde3951..c4b532f 100644
+index dde3951..d55da00 100644
 --- a/demo/fo/buildPackage.xml
 +++ b/demo/fo/buildPackage.xml
 @@ -14,7 +14,7 @@
@@ -138,8 +138,7 @@ index dde3951..c4b532f 100644
    <property name="ant.jar" location="${classpath.dir}/ant162.jar" />
    <property name="resolver.jar" location="${lib.dir}/resolver.jar" />
 -  <property name="icu4j.jar" location="${lib.dir}/icu4j.jar" />
-+  <property name="icu4j.jar" location="/usr/share/java/icu4j.jar" />
++  <property name="icu4j.jar" location="/usr/share/java/com.ibm.icu-4.4.jar" />
    <property name="xep.jar" location="${lib.dir}/xep/lib/xep.jar" />
  
    <path id="build.class.path">
--- 
diff --git a/debian/rules b/debian/rules
index b6933b5..0dbcc5c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,13 +11,15 @@ DEB_ANT_BUILD_TARGET := package-java update-doc package-binary-minimum
 DEB_ANT_CLEAN_TARGET := clean-package clean-java cleanup
 
 # Minimal version does not install fo.jar
-#build:
-#	cd demo/fo && CLASSPATH=$(DEB_CLASSPATH) ant -f buildPackage.xml package-java
+build:
+	cd demo/fo && CLASSPATH=$(DEB_CLASSPATH) ant -f buildPackage.xml package-java
 
 DITA_OT_DIR=debian/dita-ot/usr/share/dita-ot
 install/dita-ot::
 	mkdir -p $(DITA_OT_DIR)
 	tar xf build/dita-minimal.tar.gz --directory=$(DITA_OT_DIR) --strip-components=1
+	rm -rf $(DITA_OT_DIR)/demo/fo/src
+	cp -r demo/fo/lib $(DITA_OT_DIR)/demo/fo
 
 clean::
 	rm -rf build.xml demo/fo/build.xml demo/fo/bin demo/fo/lib lib/dost.jar out \

-- 
dita-ot packaging