From 341e503b8154cb2c802b9292a77934653e20eacc Mon Sep 17 00:00:00 2001 From: Yves-Alexis Perez Date: Tue, 10 Nov 2009 07:01:06 +0000 Subject: [PATCH] * debian/rules: - disable nm on kfreebsd, fix FTBFS, thanks Petr Salinger. closes: # 555304 * debian/control: - build-dep on hal on kfreebsd. git-svn-id: file:///svn/pkg-evolution/unstable/evolution@1406 ed03ce00-e4f4-0310-9448-ee38221cb277 --- debian/changelog | 9 +++++++++ debian/control | 2 +- debian/rules | 4 ++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 74b49a857d..040b846cf4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +evolution (2.28.1-2) UNRELEASED; urgency=low + + * debian/rules: + - disable nm on kfreebsd, fix FTBFS, thanks Petr Salinger. closes: # 555304 + * debian/control: + - build-dep on hal on kfreebsd. + + -- Yves-Alexis Perez Tue, 10 Nov 2009 07:59:43 +0100 + evolution (2.28.1-1) unstable; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 7c0bf3fef0..7c37ec3de0 100644 --- a/debian/control +++ b/debian/control @@ -49,8 +49,8 @@ Build-Depends: debhelper (>= 5.0.0), libgconf2-dev, libgnomeprint2.2-dev (>= 2.7.0), libgnomeprintui2.2-dev (>= 2.2.1), - libhal-dev (>= 0.5.4) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libcamel1.2-dev (>= 2.28.0), + libhal-dev (>= 0.5.4) [!hurd-i386], libedataserver1.2-dev (>= 2.28.0), libegroupwise1.2-dev (>= 2.28.0), libedataserverui1.2-dev (>= 2.28.0), diff --git a/debian/rules b/debian/rules index d4e18775b0..e34ba52062 100755 --- a/debian/rules +++ b/debian/rules @@ -36,6 +36,10 @@ DEB_CONFIGURE_EXTRA_FLAGS += \ --libexecdir=/usr/lib \ --enable-plugins=experimental +ifneq ($(DEB_HOST_ARCH_OS),linux) +DEB_CONFIGURE_EXTRA_FLAGS += --disable-nm +endif + clean:: debconf-updatepo find -name '*.schemas' | xargs rm -f