Merged branch 'unstable-nmu'.

Conflicts:
	debian/changelog
	debian/patches/00list

diff --git a/debian/changelog b/debian/changelog
index e28d806e8e7ac07ad3048f8550d47004cf065393..3d26132c6727bd6d770fa42da7df3f09d6bdbbfa 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -87,6 +87,21 @@ collectd (5.2.0-1) experimental; urgency=low
 
  -- Sebastian Harl <tokkee@debian.org>  Tue, 20 Nov 2012 15:40:12 +0100
 
+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 <gregoa@debian.org>  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 ec28843e0f0552c27f32b32d6479c9860ae54318..b67a020b31de6d002b9ef662d47ff8a29120068a 100644 (file)
--- 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 c58c2d2ddc130cd23c7b8f2efe76f5b441a21d93..e66c4e8a296018ba7b03d5ee2e69684bffcdc646 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -40,7 +40,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 23aacf62e043c084fffcce668440b01881337668..5a851be66aad4567499813be8a955a92f1ec9c14 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -2,3 +2,4 @@ rrd_filter_path.dpatch
 collection_conf_path.dpatch
 myplugin_includes.dpatch
 bts559801_plugin_find_fix.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 (file)
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 <gregoa@debian.org>
+##
+# 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 <gregoa@debian.org>
+# 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<collectd>
+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 af70f20dc99c346a4e4cc896643194aa948b98b2..49bf62092904649f6d38cfdec17377e412c78132 100755 (executable)
--- 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