Package: cobertura
Version: 1.9.4.1+dfsg-2
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Dear Maintainer,

In Ubuntu, the attached patch was applied to achieve the following:

  * Fix FTBFS with OpenJDK 7 (LP: #888927):
    - d/ant.properties: Set source/target to 1.5 for javac and javadoc 
      ant tasks to ensure backwards compatibility and avoid Java 7 
      encoding errors.
    - d/rules: Use ant.properties when building. 

Thanks for considering the patch.

- -- System Information:
Debian Release: wheezy/sid
  APT prefers precise-updates
  APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500, 
'precise')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-3-generic (SMP w/8 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAEBCAAGBQJO4I7HAAoJEL/srsug59jDkoIQALp09xhMtCvzbJeE6p8ZpzAq
moHYHxwBXgjxDeOfkqIwn/vmH/GydvziE+SbzRNX1j5Cr9U+0orUu6tdT5ftWxoj
1X/aVObHXDvABIPy9LPrzEjbtTgp6pO6KtlG36IjJBiDcroFgKNojspPx7EgMUt+
Mbm5Mp0/3eR4NUghH4gtHXTWAFwA9pecdyJNyqk3JWp/OdL0oXCaNRd3+ciJaQD1
zVdU0eD1FV6VzKKxrKcVsKD1L0wn4NT5rFIXhQanilkWmSZCNovyHFStdDJj6qxi
rtQNFpXTXdH0kT3rrOoVQ+5rUf8i+6A8SF4dQjE6Y1vLTQWK164yQ7Kf4cwipSy0
HjQAqdqMzuKWaXSiK66Bod4ov/6bs/SPZ356jBZomTATFaamrrpI0xwMA7QodHmn
1YxSKQdLWFgGgouTTDAQaM7AWms513krJ6tsm+htQHzNJS0BhmpPnQhepa9CDriD
zmurnc5zykQMBLbsuLUzfapjdByHjIkrAZela0R9+bp5gRuzUqqxymCqCSc1OZVz
k2kBUI3L3pOMcZbM/zbzEObOD/RiCNic8NBCduArmAP929clMW6hGyuC/EQa00Kt
Jw9ddiM2vBPS14ZW9xPT050KR28vwqdA4s01UX5wDBht5xvPeSJSAWOKY6StVQBu
TfRJElhmpNvHp4jxFsJB
=hFH4
-----END PGP SIGNATURE-----
=== added file 'debian/ant.properties'
--- debian/ant.properties	1970-01-01 00:00:00 +0000
+++ debian/ant.properties	2011-12-08 10:06:40 +0000
@@ -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 file 'debian/rules'
--- debian/rules	2010-05-11 19:21:46 +0000
+++ debian/rules	2011-12-08 10:07:24 +0000
@@ -7,7 +7,7 @@
 	dh --with javahelper $@
 
 override_dh_auto_build:
-	ant dist
+	ant -propertyfile debian/ant.properties dist
 	docbook-to-man debian/cobertura-check.sgml > cobertura-check.1
 	docbook-to-man debian/cobertura-instrument.sgml > cobertura-instrument.1
 	docbook-to-man debian/cobertura-merge.sgml > cobertura-merge.1

Reply via email to