From efbdef15bd2f66b338d840e5a69077ad40d95c6c Mon Sep 17 00:00:00 2001 From: gregor herrmann Date: Sun, 26 May 2013 01:00:00 +0200 Subject: [PATCH] diff for NMU version 5.1.0-3.1 Closes: #683525, #708718. Signed-off-by: Sebastian Harl --- debian/changelog | 15 ++++++++++++ debian/collectd-core.overrides | 2 +- debian/control | 2 +- debian/patches/00list | 1 + debian/patches/pod-perl-5.18.dpatch | 38 +++++++++++++++++++++++++++++ debian/rules | 2 +- 6 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 debian/patches/pod-perl-5.18.dpatch diff --git a/debian/changelog b/debian/changelog index ba1e1d6..052b65a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,18 @@ +collectd (5.1.0-3.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix "FTBFS with perl 5.18: POD errors": + add patch pod-perl-5.18 that adds =encoding to some POD files. + (Closes: #708718) + * Fix "Transition package to use default java implementation": + apply modified patch from Ubuntu / James Page: + - switch build dependency from openjdk-6-jdk to default-jdk + - set JAVA_HOME to /usr/lib/jvm/default-java + - update lintian override accordingly + (Closes: #683525) + + -- gregor herrmann Sun, 26 May 2013 00:52:37 +0200 + collectd (5.1.0-3) unstable; urgency=low * debian/patches/migrate-4-5-df.dpatch, debian/collectd-core.postinst: diff --git a/debian/collectd-core.overrides b/debian/collectd-core.overrides index ec28843..b67a020 100644 --- a/debian/collectd-core.overrides +++ b/debian/collectd-core.overrides @@ -10,5 +10,5 @@ collectd-core: capitalization-error-in-description python Python # The "java" plugin uses libjvm.so which can only be found in a non-standard # directory. According to the Java guys the path name and the ABI is stable # though ... -collectd-core: binary-or-shlib-defines-rpath usr/lib/collectd/java.so /usr/lib/jvm/java-6-openjdk-* +collectd-core: binary-or-shlib-defines-rpath usr/lib/collectd/java.so /usr/lib/jvm/default-java/jre/lib/*/server diff --git a/debian/control b/debian/control index 7d587f1..c4c01f6 100644 --- a/debian/control +++ b/debian/control @@ -39,7 +39,7 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch, libxml2-dev, libyajl-dev, linux-libc-dev (>= 2.6.25-4) [linux-any] | linux-libc-dev (<< 2.6.25-1) [linux-any], - openjdk-6-jdk [!hppa !kfreebsd-any !hurd-any], + default-jdk [!hppa !kfreebsd-i386 !kfreebsd-amd64], protobuf-c-compiler, python-dev Build-Conflicts: libpthread-dev diff --git a/debian/patches/00list b/debian/patches/00list index 390f00f..f9ab071 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -3,3 +3,4 @@ collection_conf_path.dpatch bts559801_plugin_find_fix.dpatch rtnl_dump_filter.dpatch migrate-4-5-df.dpatch +pod-perl-5.18.dpatch diff --git a/debian/patches/pod-perl-5.18.dpatch b/debian/patches/pod-perl-5.18.dpatch new file mode 100644 index 0000000..be07870 --- /dev/null +++ b/debian/patches/pod-perl-5.18.dpatch @@ -0,0 +1,38 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## pod-perl-5.18.dpatch by gregor herrmann +## +# Description: add =encoding to POD. perl 5.18 is more picky and exists with an error. +# Origin: vendor +# Bug-Debian: http://bugs.debian.org/708718 +# Forwarded: no +# Author: gregor herrmann +# Last-Update: 2013-05-19 + +@DPATCH@ +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' collectd-5.1.0~/src/collectd-java.pod collectd-5.1.0/src/collectd-java.pod +--- collectd-5.1.0~/src/collectd-java.pod 2012-04-02 10:04:58.000000000 +0200 ++++ collectd-5.1.0/src/collectd-java.pod 2013-05-19 16:18:19.323246574 +0200 +@@ -1,3 +1,5 @@ ++=encoding utf8 ++ + =head1 NAME + + collectd-java - Documentation of collectd's "java plugin" +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' collectd-5.1.0~/src/collectd.conf.pod collectd-5.1.0/src/collectd.conf.pod +--- collectd-5.1.0~/src/collectd.conf.pod 2012-04-02 10:04:58.000000000 +0200 ++++ collectd-5.1.0/src/collectd.conf.pod 2013-05-19 16:17:52.395246170 +0200 +@@ -1,3 +1,5 @@ ++=encoding utf8 ++ + =head1 NAME + + collectd.conf - Configuration for the system statistics collection daemon B +diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' collectd-5.1.0~/src/collectdctl.pod collectd-5.1.0/src/collectdctl.pod +--- collectd-5.1.0~/src/collectdctl.pod 2012-04-02 10:04:58.000000000 +0200 ++++ collectd-5.1.0/src/collectdctl.pod 2013-05-19 16:18:04.251246348 +0200 +@@ -1,3 +1,5 @@ ++=encoding latin1 ++ + =head1 NAME + + collectdctl - Control interface for collectd diff --git a/debian/rules b/debian/rules index 8e186fc..aa8f598 100755 --- a/debian/rules +++ b/debian/rules @@ -37,7 +37,7 @@ JAVA_ARCHDIR = $(shell /usr/share/javahelper/java-arch.sh $(DEB_BUILD_ARCH)) ifeq (,$(JAVA_ARCHDIR)) JAVA_ARCHDIR = $(DEB_BUILD_ARCH) endif -JAVA_HOME = /usr/lib/jvm/java-6-openjdk-$(DEB_BUILD_ARCH) +JAVA_HOME = /usr/lib/jvm/default-java JAVA_LIBDIR = $(JAVA_HOME)/jre/lib/$(JAVA_ARCHDIR)/server JAVAC = $(JAVA_HOME)/bin/javac -- 2.30.2