From 8a09cf3cd0202146e8c926779ff9e00e2f61fdb4 Mon Sep 17 00:00:00 2001 From: Sebastian Harl Date: Thu, 17 May 2012 17:40:41 +0200 Subject: [PATCH] control: Use linux-any, kfreebsd-any, etc. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit … rather than hardcoded list of non-Linux architectures to make life of porters easier; thanks to Robert Millan for reporting this and providing a pointer to the fix. Closes: #634690 --- debian/changelog | 4 ++++ debian/control | 18 +++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9ce9473..5d81a3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,10 @@ collectd (4.10.7-1) unstable; urgency=low * debian/control: - Updated to standards-version 3.9.3 -- no changes. - Build depend on javahelper providing java-arch.sh. + - Use linux-any, kfreebsd-any, etc. rather than hardcoded list of + non-Linux architectures to make life of porters easier; thanks to Robert + Millan for reporting this and providing a pointer to the fix + (Closes: #634690). * debian/collectd-core.postrm, debian/collectd-core.templates: - Prompt the user (debconf priority high) when purging the collected data providing an option to opt out. The question defaults to remove the diff --git a/debian/control b/debian/control index f48be3b..1fdfa88 100644 --- a/debian/control +++ b/debian/control @@ -4,13 +4,13 @@ Priority: optional Maintainer: Sebastian Harl Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch, bison, flex, autotools-dev, libltdl-dev, pkg-config, - iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel !kfreebsd-i386 !kfreebsd-amd64], - iptables-dev (>= 1.4.3.2-2) [!kfreebsd-i386 !kfreebsd-amd64], + iproute-dev [!alpha !amd64 !hppa !ia64 !ppc64 !mips !mipsel !kfreebsd-any !hurd-any], + iptables-dev (>= 1.4.3.2-2) [linux-any], javahelper, libcurl4-gnutls-dev (>= 7.18.2-5) | libcurl4-gnutls-dev (<= 7.18.2-1) | libcurl3-gnutls-dev, libdbi0-dev, libesmtp-dev, - libganglia1-dev (>= 3) [!kfreebsd-i386 !kfreebsd-amd64], + libganglia1-dev (>= 3) [linux-any], libgcrypt11-dev, libglib2.0-dev, libhal-dev, @@ -24,18 +24,18 @@ Build-Depends: debhelper (>= 5), dpkg-dev (>= 1.14.10), po-debconf, dpatch, libpq-dev, libprotobuf-c0-dev, librrd-dev (>= 1.4~), - libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64], + libsensors4-dev [linux-any], # libsnmp-dev (>= 5.4.2.1~dfsg-4~) | (libsnmp-dev & perl (<< 5.10.1~rc2-1~)) libsnmp-dev (>= 5.4.2.1~dfsg-4~) | libsnmp-dev | libsnmp9-dev, libsnmp-dev (>= 5.4.2.1~dfsg-4~) | perl (<< 5.10.1~rc2-1~), - libtokyocabinet-dev [!kfreebsd-i386 !kfreebsd-amd64], - libtokyotyrant-dev [!kfreebsd-i386 !kfreebsd-amd64], + libtokyocabinet-dev [linux-any], + libtokyotyrant-dev [linux-any], libupsclient1-dev, - libvirt-dev (>= 0.4.0-6) [!kfreebsd-i386 !kfreebsd-amd64], + libvirt-dev (>= 0.4.0-6) [linux-any], 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], + 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], protobuf-c-compiler, python-dev Build-Conflicts: libpthread-dev -- 2.30.2