Package: collectd
Version: 4.10.1-2.1
Severity: normal
Tags: patch
User: [email protected]
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 use default java implementation:
- d/control: Switch BD openjdk-6-jdk -> default-jdk.
- d/rules: Check for /usr/lib/jvm/default-java before searching
other paths when setting up JAVA_HOME.
This will automatically transition the package when the default
java implementation changes (as it has done in Ubuntu quantal).
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-7-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)
iQIcBAEBCAAGBQJQGSkSAAoJEL/srsug59jD2dcP/i0rKyyk3loQYJL2Ns40l8YC
QTattinE6HK9L5GbVNpm+Fw6dH/H8J/bUGz2PSBjMp1e7JgTg96XpdAZz32fV7pB
0bB6GRfet/nxi9P2fXVy9saN/iu3qVbk+mKO4SGwYw40LS0gUotp/+vT4SvjziQN
VrgSJm5+9ly1dyGnr5vTtPdgMCq3LMcuqIAOhGqeNxMN+6Skj6jBwgrzozsa8jdv
xlm/cqWZjEd4GpSY4ODzckg5H75cm0SGoH5wl2MpKvt6h3v2Asvxj3ZbQa3viBUc
mmPE6Mpv1wIOQ10yUWMwVLpMMUeTZGlQi2VQb99tmaGeqCoTF4/E0kkIJHlfmbw5
e8mzJML9V3EIX2fr5laMGFYnwFF7G3yNRHFaqWSwMnHCwDiX6MiRwcXMNUki+nav
QJaZ+2EQKvH8W2MB5K6bB2N/VwM30gfycI4tEdPyWQ+LOfG4YEy39yOtABONhkCs
qOWrz+/NQnSjcWkUZQOA9ETGa2eGgNsSAjt5aJLanvQ+v2Mk8fI2qTjB6l7aST48
aJAJES08fsSld4llzN17Hc0QeukzYoRtsFAzH4H7gH3Na8OVeZxoqQHqplwQe2HX
Lh3iQEvVorNKodX1GQ+b2r3ucAn3nDAiz0QrxVb73hkMSJvXqv67CcWYXG8qkc2/
iZ43O1On3BLjBORjBSyK
=Uefw
-----END PGP SIGNATURE-----
diff -u collectd-4.10.1/debian/rules collectd-4.10.1/debian/rules
--- collectd-4.10.1/debian/rules
+++ collectd-4.10.1/debian/rules
@@ -40,7 +40,7 @@
ifeq (,$(JAVA_ARCHDIR))
JAVA_ARCHDIR = $(DEB_BUILD_ARCH)
endif
-JAVA_HOME = $(firstword $(wildcard /usr/lib/jvm/java-6-openjdk-$(DEB_HOST_ARCH) /usr/lib/jvm/java-6-openjdk))
+JAVA_HOME = $(firstword $(wildcard /usr/lib/jvm/default-java /usr/lib/jvm/java-6-openjdk-$(DEB_HOST_ARCH) /usr/lib/jvm/java-6-openjdk))
JAVA_LIBDIR = $(JAVA_HOME)/jre/lib/$(JAVA_ARCHDIR)/server
JAVAC = $(JAVA_HOME)/bin/javac
diff -u collectd-4.10.1/debian/changelog collectd-4.10.1/debian/changelog
diff -u collectd-4.10.1/debian/control collectd-4.10.1/debian/control
--- collectd-4.10.1/debian/control
+++ collectd-4.10.1/debian/control
@@ -34,7 +34,7 @@
libxml2-dev,
libyajl-dev,
linux-libc-dev (>= 2.6.25-4) [!kfreebsd-i386 !kfreebsd-amd64] | linux-libc-dev (<< 2.6.25-1) [!kfreebsd-i386 !kfreebsd-amd64],
- openjdk-6-jdk [!hppa !kfreebsd-i386 !kfreebsd-amd64],
+ default-jdk [!hppa !kfreebsd-i386 !kfreebsd-amd64],
protobuf-c-compiler,
python-dev
Build-Conflicts: libpthread-dev
