[SCM] jxplorer - Java LDAP browser branch, master, updated. debian/3.2.2_rc1+dfsg-2-2-g1dd6ad4

[Miguel Landaeta]

The following commit has been merged in the master branch:
commit 05b6073769fc4ec60103bd94d87d200025d8c0a8
Author: Miguel Landaeta <miguel at miguel.cc>
Date:   Tue Dec 13 19:21:59 2011 -0430

    Fix FTBFS with OpenJDK 7

diff --git a/debian/changelog b/debian/changelog
index e4f8edc..7792ee4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+jxplorer (3.2.2~rc1+dfsg-3) UNRELEASED; urgency=low
+
+  [ Miguel Landaeta ]
+  * Team upload.
+
+  [ James Page ]
+  * Fix FTBFS with OpenJDK 7 (LP: #888957) (Closes: #651535):
+    - d/rules: Call jh_build with source/target set to 1.5 to ensure
+      backwards compatibility and work around Java 7 encoding errors. 
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Tue, 13 Dec 2011 19:07:48 -0430
+
 jxplorer (3.2.2~rc1+dfsg-2) unstable; urgency=low
 
   * Team upload
diff --git a/debian/rules b/debian/rules
index 915be7e..811d5cc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,7 @@ override_dh_auto_build:
 	-mkdir jars
 	cd help && jar cf ../jars/jxplorer_help.jar *
 	# build jxplorer
-	jh_build jxplorer.jar src
+	jh_build --javacopts="-source 1.5 -target 1.5" --javadoc-opts="-source 1.5" jxplorer.jar src
 	# tests
 	$(JAVA) com.ca.directory.jxplorer.viewer.tableviewer.TableViewerTestSuite
 	$(JAVA) com.ca.commons.naming.NamingTestSuite

-- 
jxplorer - Java LDAP browser