Package: httpunit
Version: 1.7+dfsg-8
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 OpenJDK7 (LP: #888940):
    - d/ant.properties: Specify source/target as 1.5 for javac and
      javadoc ant tasks to ensure backwards compatibility and work
      around Java 7 encoding errors.
    - d/rules: Use ant.properties.

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)

iQIcBAEBCAAGBQJO4MBhAAoJEL/srsug59jDH54QALgXxIkipEOCC0afIjWd0vJi
5IrV/FI4MJkSsNhGiTQyRceXHE2MJlO2Jk9c7E1yU4UlHXlrcfDS/Of/ng7YxkwG
d7Pm7wM7SVQ71a/wGq5aSXKpp61eaAiTjN4XjQOpWz0spjXwKKkflRRBneuzHisH
DwJzNzxLV1q+2lQbN1Gp8JNnsv2fKq+sC8XySqOBRvqjcEX6LGC+SWuMJgoRUOaG
hUQ0qp75Rf8/A2b/R2HKUY531matqV10CcOCnwzn9kxmX1G976hHzBL2CNXVyQfw
lgBsOCxukz6c717+ZOwRDHvefvCtB5BAMnlOUWXKv9SF6rXPUG5mWTmbI4fJnbUw
6UVgn6WJ0zk8km9NZ0UPKJp3oR9osCjlj22meQn/neH18OqJCYteSzOLNy/RGKnB
mRE+pOlHUml/8tZx30esVtDYLW8ciCPW7qTKo3s+18wgTerX1hdS8frmDJhpV/Sz
zPNqvnrIS44ZOj9UMlwQhr4E57X5dL3HQPL6C9zARy3+jvzYxjqUWW+xFTEu1lxj
2JtYBoLHGbfnQfv2rMlxkJ4P/kDk9iS/mJ14Rap/AAa7qpKSNDW564JefKIrfLKm
Lbq30Mj95G9WMDKRmKhVsR426pspb2aNjVINJeIr/4PPNNIiZTdF36bzW2fPRn23
m8ri0/BrWzv5AnNqB9iK
=WKqx
-----END PGP SIGNATURE-----
=== added file 'debian/ant.properties'
--- debian/ant.properties	1970-01-01 00:00:00 +0000
+++ debian/ant.properties	2011-12-08 13:39:45 +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	2011-09-26 23:01:21 +0000
+++ debian/rules	2011-12-08 13:40:09 +0000
@@ -11,7 +11,7 @@
 	rm -f doc/tutorial/task1.zip
 
 override_dh_auto_build:
-	ant dist
+	ant -propertyfile debian/ant.properties dist
 
 get-orig-source:
 	sh -e debian/orig-tar.sh

Reply via email to