[Pkg-samba-maint] [samba] 04/05: Remove build-dep on heimdal-dev.

[Ivo De Decker]

This is an automated email from the git hooks/post-receive script.

ivodd pushed a commit to branch wheezy-backports
in repository samba.

commit 1d6ccff0440e04c96db80a9da635378fd42dbdd9
Author: Ivo De Decker <ivo.dedecker at ugent.be>
Date:   Fri May 16 14:48:45 2014 +0200

    Remove build-dep on heimdal-dev.
---
 debian/changelog | 2 ++
 debian/control   | 4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e526a0a..aa1b4dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ samba (2:4.1.7+dfsg-2~bpo70+1) UNRELEASED; urgency=medium
   * Rebuild for wheezy-backports.
   * Revert workaround for #745233. It's not relevant for backports, and the
     newer version of libgmp isn't in wheezy.
+  * Remove build-dep on heimdal-dev, as libcups2-dev depends on libkrb5-dev in
+    wheezy, which conflicts with heimdal-dev.
 
  -- Ivo De Decker <ivo.dedecker at ugent.be>  Fri, 16 May 2014 14:42:03 +0200
 
diff --git a/debian/control b/debian/control
index 832022c..37f5693 100644
--- a/debian/control
+++ b/debian/control
@@ -15,10 +15,6 @@ Build-Depends: bison,
                docbook-xsl,
                faketime,
                flex,
-               heimdal-dev,
-# heimdal-multidev is pulled in by heimdal-dev, but it's listed here for when
-# heimdal-dev is removed because other build-deps pull in libkrb5-dev (like
-# libcups2-dev did in the past)
                heimdal-multidev (>= 1.6~),
                libacl1-dev,
                libaio-dev [linux-any],

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git