[med-svn] r11450 - trunk/packages/libpal-java/trunk/debian

[Andreas Tille]

Author: tille
Date: 2012-06-24 15:44:36 +0000 (Sun, 24 Jun 2012)
New Revision: 11450

Added:
   trunk/packages/libpal-java/trunk/debian/ant.properties
Modified:
   trunk/packages/libpal-java/trunk/debian/changelog
   trunk/packages/libpal-java/trunk/debian/compat
   trunk/packages/libpal-java/trunk/debian/control
   trunk/packages/libpal-java/trunk/debian/rules
Log:
Take over patch from Miguel Landaeta <miguel at miguel.cc> to build under Java 7


Added: trunk/packages/libpal-java/trunk/debian/ant.properties
===================================================================
--- trunk/packages/libpal-java/trunk/debian/ant.properties	                        (rev 0)
+++ trunk/packages/libpal-java/trunk/debian/ant.properties	2012-06-24 15:44:36 UTC (rev 11450)
@@ -0,0 +1,4 @@
+# Ensure that source and target are 1.5
+# For backwards compat on Java 7
+ant.build.javac.source=1.5
+ant.build.javac.target=1.5

Modified: trunk/packages/libpal-java/trunk/debian/changelog
===================================================================
--- trunk/packages/libpal-java/trunk/debian/changelog	2012-06-24 15:10:22 UTC (rev 11449)
+++ trunk/packages/libpal-java/trunk/debian/changelog	2012-06-24 15:44:36 UTC (rev 11450)
@@ -1,3 +1,13 @@
+libpal-java (1.5.1-2) unstable; urgency=low
+
+  * Fix FTBFS with Java7 as default-java (thanks to Miguel Landaeta
+    <miguel at miguel.cc> for the patch)
+    Closes: #678562
+  * Bump Standards-Version to 3.9.3. No changes were required. 
+  * debhelper 9 (control+compat)
+
+ -- Andreas Tille <tille at debian.org>  Sun, 24 Jun 2012 17:13:04 +0200
+
 libpal-java (1.5.1-1) unstable; urgency=low
 
   * Initial Debian Upload (Closes: #657633)

Modified: trunk/packages/libpal-java/trunk/debian/compat
===================================================================
--- trunk/packages/libpal-java/trunk/debian/compat	2012-06-24 15:10:22 UTC (rev 11449)
+++ trunk/packages/libpal-java/trunk/debian/compat	2012-06-24 15:44:36 UTC (rev 11450)
@@ -1 +1 @@
-8
+9

Modified: trunk/packages/libpal-java/trunk/debian/control
===================================================================
--- trunk/packages/libpal-java/trunk/debian/control	2012-06-24 15:10:22 UTC (rev 11449)
+++ trunk/packages/libpal-java/trunk/debian/control	2012-06-24 15:44:36 UTC (rev 11450)
@@ -3,9 +3,9 @@
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
 Uploaders: Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 8), javahelper (>=0.25)
+Build-Depends: debhelper (>= 9), javahelper (>=0.25)
 Build-Depends-Indep: default-jdk, ant
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 Section: java
 Homepage: http://www.cebl.auckland.ac.nz/pal-project/
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/libpal-java/trunk/

Modified: trunk/packages/libpal-java/trunk/debian/rules
===================================================================
--- trunk/packages/libpal-java/trunk/debian/rules	2012-06-24 15:10:22 UTC (rev 11449)
+++ trunk/packages/libpal-java/trunk/debian/rules	2012-06-24 15:44:36 UTC (rev 11450)
@@ -9,8 +9,8 @@
 	cd src; ant clean
 
 override_dh_auto_build:
-	ant -buildfile src/build.xml
-	ant -buildfile src/build.xml doc
+	ant -buildfile src/build.xml -propertyfile debian/ant.properties
+	ant -buildfile src/build.xml -propertyfile debian/ant.properties doc
 
 get-orig-source:
 	. debian/get-orig-source