r1406 - in /unstable/evolution/debian: changelog control rules

[corsac at users.alioth.debian.org]

Author: corsac
Date: Tue Nov 10 07:01:06 2009
New Revision: 1406

URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=1406
Log:
* debian/rules:
  - disable nm on kfreebsd, fix FTBFS, thanks Petr Salinger. closes: # 555304
* debian/control:
  - build-dep on hal on kfreebsd.

Modified:
    unstable/evolution/debian/changelog
    unstable/evolution/debian/control
    unstable/evolution/debian/rules

Modified: unstable/evolution/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/changelog?rev=1406&op=diff
==============================================================================
--- unstable/evolution/debian/changelog (original)
+++ unstable/evolution/debian/changelog Tue Nov 10 07:01:06 2009
@@ -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 <corsac at debian.org>  Tue, 10 Nov 2009 07:59:43 +0100
+
 evolution (2.28.1-1) unstable; urgency=low
 
   * New upstream release.

Modified: unstable/evolution/debian/control
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/control?rev=1406&op=diff
==============================================================================
--- unstable/evolution/debian/control (original)
+++ unstable/evolution/debian/control Tue Nov 10 07:01:06 2009
@@ -49,8 +49,8 @@
                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),

Modified: unstable/evolution/debian/rules
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution/debian/rules?rev=1406&op=diff
==============================================================================
--- unstable/evolution/debian/rules (original)
+++ unstable/evolution/debian/rules Tue Nov 10 07:01:06 2009
@@ -36,6 +36,10 @@
 	--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