[jruby-joni] 163/279: Imported Debian patch 1.1.9-2

[Hideki Yamane]

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

henrich pushed a commit to branch debian/sid
in repository jruby-joni.

commit 7485e2b2baa00456949a07a9836b5fb97c1e4db8
Author: Hideki Yamane <henrich at debian.org>
Date:   Sat Dec 15 08:26:06 2012 +0900

    Imported Debian patch 1.1.9-2
---
 debian/ant.properties |  6 ++++++
 debian/changelog      | 13 +++++++++++++
 debian/rules          |  2 ++
 3 files changed, 21 insertions(+)

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 d8d894c..866b379 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+jruby-joni (1.1.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: #1049784)
+  * 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:26:06 +0900
+
 jruby-joni (1.1.9-1) experimental; urgency=low
 
   * New upstream release
diff --git a/debian/rules b/debian/rules
index d5dd52a..bbf2b47 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,8 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1
 
+export ANT="ant -propertyfile $(CURDIR)/debian/ant.properties"
+
 %:
 	dh $@
 

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