[SCM] client, protocol, and server for running Java programs from CLI branch, master, updated. debian/0.7.1-3-6-gb025af8

[Hideki Yamane]

The following commit has been merged in the master branch:
commit 263b8358ce4d0fd0a6d214156de73dd8b9479118
Author: Hideki Yamane <henrich at debian.org>
Date:   Sat Dec 15 08:41:01 2012 +0900

    Imported Debian patch 0.9.0+trunk95-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 953bc80..7646cb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+nailgun (0.9.0+trunk95-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: #1049742)
+  * 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:41:01 +0900
+
 nailgun (0.9.0+trunk95-1) unstable; urgency=medium
 
   * Bump up version number since it produces jar files with version as 
@@ -5,7 +18,7 @@ nailgun (0.9.0+trunk95-1) unstable; urgency=medium
   * set "urgency=medium" to introduce other packages' security fix to testing
     quickly.
   * debian/nailgun.links
-    - fix wrong symlink, now it should be changed to 0.9.0
+    - fix wrong symlink, now it should be changed to 0.9.0 (Closes: #688186)
 
  -- Hideki Yamane <henrich at debian.org>  Thu, 20 Sep 2012 22:58:48 +0900
 
diff --git a/debian/control b/debian/control
index c4e2b47..5e87097 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Hideki Yamane <henrich at debian.org>,
  Torsten Werner <twerner at debian.org>
 Build-Depends: debhelper (>= 9), ant, ant-optional, default-jdk,
  libcobertura-java, junit
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Homepage: http://martiansoftware.com/nailgun/
 Vcs-Git: git://git.debian.org/pkg-java/nailgun.git
 Vcs-Browser: http://git.debian.org/?p=pkg-java/nailgun.git
diff --git a/debian/rules b/debian/rules
index cdad850..50d6340 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,7 @@
 #export DH_VERBOSE=1
 
 export DEB_BUILD_MAINT_OPTIONS := hardening=+all
+export ANT="ant -propertyfile $(CURDIR)/debian/ant.properties"
 
 %:
 	dh $@

-- 
client, protocol, and server for running Java programs from CLI