[SCM] Java-based codings helper classes for Joni and JRuby branch, master, updated. debian/1.0.4-1-6-gf8b902e

[Hideki Yamane]

The following commit has been merged in the master branch:
commit 052f41d0d49db5428fafefbfc798ec057f410dd6
Author: Hideki Yamane <henrich at debian.org>
Date:   Sat Dec 15 08:03:02 2012 +0900

    Imported Debian patch 1.0.9-2

diff --git a/debian/ant.properties b/debian/ant.properties
new file mode 100644
index 0000000..c13a929
--- /dev/null
+++ b/debian/ant.properties
@@ -0,0 +1,6 @@
+# Ensure that source and target are 1.6
+# For backwards compat on Java 7
+# see https://lists.debian.org/debian-java/2012/12/msg00026.html
+#
+ant.build.javac.source=1.6
+ant.build.javac.target=1.6
diff --git a/debian/changelog b/debian/changelog
index fdcc927..83d8fac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+jcodings (1.0.9-2) experimental; urgency=low
+
+  * Team upload.
+  * debian/rules
+    - use debian/ant.properties to specify version to avoid incompatible
+      java bytecode format with OpenJDK 7 issue (LP: #1049779)
+  * add debian/ant.properties
+    - use "ant.build.javac.{source,target}=1.6"
+  * debian/control
+    - set "Standards-Version: 3.9.4"
+
+ -- Hideki Yamane <henrich at debian.org>  Sat, 15 Dec 2012 08:03:02 +0900
+
 jcodings (1.0.9-1) experimental; urgency=low
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 27582d5..78a2f78 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Torsten Werner <twerner at debian.org>
 Build-Depends: debhelper (>= 7), cdbs, maven-repo-helper
 Build-Depends-Indep: ant, default-jdk
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Vcs-Git: git://git.debian.org/pkg-java/jcodings.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/jcodings.git
 Homepage: http://github.com/jruby/jcodings
diff --git a/debian/rules b/debian/rules
index 711919a..5bff79c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
 JAVA_HOME := /usr/lib/jvm/default-java
+ANT := ant -propertyfile $(CURDIR)/debian/ant.properties
 
 install/libjcodings-java::
 	mh_installpom -plibjcodings-java pom.xml

-- 
Java-based codings helper classes for Joni and JRuby