[xml/sgml-commit] r2147 - in /packages/refdb/trunk/debian: patches/series rules

[malat at users.alioth.debian.org]

Author: malat
Date: Fri Jan 11 12:37:31 2013
New Revision: 2147

URL: http://svn.debian.org/wsvn/debian-xml-sgml/?sc=1&rev=2147
Log:
Fix fop failure

Modified:
    packages/refdb/trunk/debian/patches/series
    packages/refdb/trunk/debian/rules

Modified: packages/refdb/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/refdb/trunk/debian/patches/series?rev=2147&op=diff
==============================================================================
--- packages/refdb/trunk/debian/patches/series (original)
+++ packages/refdb/trunk/debian/patches/series Fri Jan 11 12:37:31 2013
@@ -3,7 +3,7 @@
 fixcomp.patch
 removegetopt.patch
 fixversion.patch
-#fix-doc-installation.patch
+fix-doc-installation.patch
 fix-underlinking.patch
 fixfopjava.patch
 bug695846.patch

Modified: packages/refdb/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-xml-sgml/packages/refdb/trunk/debian/rules?rev=2147&op=diff
==============================================================================
--- packages/refdb/trunk/debian/rules (original)
+++ packages/refdb/trunk/debian/rules Fri Jan 11 12:37:31 2013
@@ -1,5 +1,8 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1
+
+#Â This is extremely important to get fop running properly:
+export JAVA_HOME=/usr/lib/jvm/default-java
 
 # deduce documentation option (build-indep target)
 ifeq "" "$(filter %-doc,$(shell dh_listpackages))"
@@ -8,7 +11,8 @@
 
 %:
 	#dh $@ --with autoreconf
-	dh $@ --parallel --with autotools_dev
+	#dh $@ --parallel --with autotools_dev
+	dh $@
 
 override_dh_auto_configure:
 	autoreconf -i --force