[libsaxon-java] 22/33: apply patch for 651185

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository libsaxon-java.

commit 58303dfca603643bed848850ac174a78980e9a19
Author: Tony Mancill <tmancill at debian.org>
Date:   Tue Dec 20 03:44:34 2011 +0000

    apply patch for 651185
---
 debian/changelog | 8 ++++++++
 debian/rules     | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cd15db0..29494c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libsaxon-java (1:6.5.5-8) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Apply path to ensure compatibility with OpenJDK7. (Closes: #651185)
+    - Thanks to James Page.
+
+ -- tony mancill <tmancill at debian.org>  Mon, 19 Dec 2011 19:32:37 -0800
+
 libsaxon-java (1:6.5.5-7) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/rules b/debian/rules
index bf2154f..38c698b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ BUILD=build
 APIDOC=build/api
 JDOM=com/icl/saxon/jdom
 CLASSPATH = /usr/share/java/jdom1.jar
-JAVADOC = $(JAVA_HOME)/bin/javadoc
+JAVADOC = $(JAVA_HOME)/bin/javadoc -encoding ISO-8859-1
 
 include /usr/share/gcj/debian_defaults
 ifneq (,$(filter $(DEB_HOST_ARCH), $(gcj_native_archs)))
@@ -24,7 +24,7 @@ endif
 
 override_dh_auto_build:
 	if [ ! -d $(BUILD) ]; then mkdir $(BUILD); mkdir $(APIDOC); fi	
-	$(JAVA_HOME)/bin/javac -nowarn -sourcepath $(SOURCES) -classpath $(CLASSPATH) -d $(BUILD) `find $(SOURCES) -name \*.java`
+	$(JAVA_HOME)/bin/javac -nowarn -source 1.5 -target 1.5 -sourcepath $(SOURCES) -classpath $(CLASSPATH) -d $(BUILD) `find $(SOURCES) -name \*.java`
 	cp -r $(SOURCES)/META-INF $(BUILD)
 	cp debian/MANIFEST.MF $(BUILD)/META-INF
 	# split off jdom classes, everything else into saxon.jar

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libsaxon-java.git