Package: jsdoc-toolkit
Version: 2.4.0+dfsg-3
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch openjdk-7-transition

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

Dear Maintainer,

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

  * Transition to using default java implementation:
    - d/control: BD switched from openjdk-6-jdk -> default-jdk. 
    - d/rules: Set source/target = 1.5 to ensure backwards compatible
      bytecode is built.

Ubuntu is transitioning from openjdk-6 to openjdk-7 as default java; this patch
eases the transition and ensures that the code built by the package is backwards
compatible with java 1.5+.  Note that this transition is not a wheezy release
goal.

Thanks for considering the patch.


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

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

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

iQIcBAEBCAAGBQJQH5EDAAoJEL/srsug59jD8+YP/iIqk4M/t/4vta1meuqJ5iw4
EZy7Wt4WuUQMM+Jkzg7+kzv8clvL0NY3fgKFlgwZtGwg7CAdckhimJL/AFTFet1C
fRAFjxJDHJBnzwTCkw3nJcnKu40TBO5siA+Qcqg0kBgJjloRxT2vrwS4ucQbDMDP
jCZZCs5dP/++jYrmUWNMlhAm881qhHgWsvK8TDwVZvLXGUFFPt7QrCyl8Jl2L/yX
J+Y7vycOV9FHYTxfAQ48XauOAxb1RQRzCCirDIahWsDWoPhAgSUhXrCXTlacMdqz
ZPlZGEw6/CcCiVoKeWNCEHMavtxDZwC5gfUevVI+pY1+KWfBhalI/iw+S7o9tkoA
+DtP5y4xNZ4ypEaDqQFfhC1AYOMpQSJThG1wFRZUije+C+VC2Hqz5BtigzvUGmhZ
vL003m6BZ3To1RCOVYVk0FOBXJpjEPOP69wq2s0l+jXR7i8BPH3dgX+aRFGM86Ka
dYuH1oBhJ32GkDwqico/neA2I3b/HnxoBbx473nH6qadD8AXV2msGk6FILcLVExv
72pt8xmt4NlKUj0+sVF+64ZWCqaR19mdkVIwPzxvHQEtEMVVsZcxGGieP8seYTCp
i1/1Cx8/YA4V7WYhKxQYBMwqKuUjBDj19SWdSi4ozK5ri5M7idszmwR/qCtnVcQ0
MqjHOJbj0MknHp7NcD4V
=SDu7
-----END PGP SIGNATURE-----
diff -Nru jsdoc-toolkit-2.4.0+dfsg/debian/changelog jsdoc-toolkit-2.4.0+dfsg/debian/changelog
diff -Nru jsdoc-toolkit-2.4.0+dfsg/debian/control jsdoc-toolkit-2.4.0+dfsg/debian/control
--- jsdoc-toolkit-2.4.0+dfsg/debian/control	2011-07-16 15:35:30.000000000 +0100
+++ jsdoc-toolkit-2.4.0+dfsg/debian/control	2012-08-06 10:38:41.000000000 +0100
@@ -2,7 +2,7 @@
 Section: devel
 Priority: extra
 Maintainer: Georges Khaznadar <georg...@ofset.org>
-Build-Depends: debhelper (>= 7.0.50~), quilt, ant, openjdk-6-jdk, rhino,
+Build-Depends: debhelper (>= 7.0.50~), quilt, ant, default-jdk, rhino,
  xsltproc, docbook-xsl
 Standards-Version: 3.9.2
 Homepage: http://code.google.com/p/jsdoc-toolkit/
diff -Nru jsdoc-toolkit-2.4.0+dfsg/debian/rules jsdoc-toolkit-2.4.0+dfsg/debian/rules
--- jsdoc-toolkit-2.4.0+dfsg/debian/rules	2011-02-07 12:53:39.000000000 +0000
+++ jsdoc-toolkit-2.4.0+dfsg/debian/rules	2012-08-06 10:33:54.000000000 +0100
@@ -23,7 +23,7 @@
 	dh_auto_clean
 
 override_dh_auto_build:
-	cd jsdoc-toolkit/java; ant clean-build
+	cd jsdoc-toolkit/java; ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 clean-build
 	cd debian; $(XP) $(DB2MAN) manpage.xml
 	dh_auto_build
 

Reply via email to