Bug#675027: jetty: Add detection to init script for openjdk-7 and openjdk-6 multiarch installations

[James Page]

Package: jetty
Version: 6.1.26-1
Severity: normal
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu quantal ubuntu-patch

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

Dear Maintainer,

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

  * d/jetty.init: Look for JAVA_HOME in multiarch locations for
    openjdk-6 and openjdk-7 (LP: #878527).

All openjdk-[6,7]-\* packages now install to multiarch locations and the
jetty init script was not correcty scanning them resulting in a failure
to start if anything other than default-jre-headless was installed.

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'), (100, 'precise-backports')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-24-generic (SMP w/8 CPU cores)
Locale: LANG=en_US.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)

iQIcBAEBCAAGBQJPxL1GAAoJEL/srsug59jDp5oQAKKZRnfBi6KywzLPieKVJkA9
bXmM381exB96zaJB7WgHGdYh8O3GgCH/4zGO7NFFeFlxzOyg7Joeaxs/8dItJnUk
bHRolnQYvsdjR6kVpsv0vsxYI8y2jdLeqLJHE9S6f4GhSIabCaSxegFiQKom2DOQ
t27F6GCb4oY6f8n57/3Zw01HqOumZ3H5c+yieXBqi8sHHm8G5USmv0KX5lUYqdSw
RySm4coAk1o7qvqODujpiwbZ9u5MFX6mNy+32Ie7dsysdoYZc0tprZq6MItB+wH4
1cTRwHlLj5BHqbXGf1e5NQ40vKdTbNG/WuWQSbxVIJnq9uUrI/ytcj4jpJutEsAU
wPg74C2+ilVyEgorTSrWTHZNudE4LYYGSx+fzTC/TxBZMJtnyYH1WOzgkZjTcba0
igdhVNzDSkSslSq2bpSUtoDzr48goTTSUefSnUkpf53b5+dGBUiJ+BdpExcwwqS7
nlxlxXQMLTLr2ZJrKd2EP0pTUQSEeKisDECbrflLD2Ih5NzNMXlk79X23pOX3SL/
X36VQJ1oc8xGLAoUXxT+oRRDzHjkvbGNj15xWH/eOePKWVbhE5p6hbODRzxTpIsF
kGHFlmN5de6E+HcZHqcFe9l8A2lysfHu294ECc0DTrQT2bwN8cMAogxxSddRgly0
Sun3JgWIqGRqac/jaIND
=J47i
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: jetty_6.1.26-1ubuntu1.debdiff
Type: text/x-diff
Size: 551 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-java-maintainers/attachments/20120529/147e960d/attachment-0001.diff>