[Pkg-openldap-devel] [openldap] 01/01: Omit smbk5pwd from stage1 build (#724518)

[Ryan Tandy]

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

rtandy-guest pushed a commit to branch master
in repository openldap.

commit a45d86ea4423e1473a899ea4ae42b3f80b95bc07
Author: Ryan Tandy <ryan at nardis.ca>
Date:   Tue Aug 25 18:16:30 2015 +0000

    Omit smbk5pwd from stage1 build (#724518)
---
 debian/changelog | 3 +++
 debian/control   | 5 +++--
 debian/rules     | 4 ++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 401d0cc..ed8e162 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ openldap (2.4.42+dfsg-2) UNRELEASED; urgency=medium
 
   * Change explicit Pre-Depends: multiarch-support to ${misc:Pre-Depends}, as 
     recommended by lintian.
+  * Omit smbk5pwd from the stage1 build profile, allowing the dependency loop 
+    with heimdal to be broken for bootstrapping. Thanks Daniel Schepler.
+    (Closes: #724518)
 
  -- Ryan Tandy <ryan at nardis.ca>  Tue, 25 Aug 2015 11:49:24 -0700
 
diff --git a/debian/control b/debian/control
index 135abdf..74f7ffa 100644
--- a/debian/control
+++ b/debian/control
@@ -8,13 +8,13 @@ Uploaders: Roland Bauerschmidt <rb at debian.org>,
  Matthijs Möhlmann <matthijs at cacholong.nl>,
  Timo Aaltonen <tjaalton at ubuntu.com>,
  Ryan Tandy <ryan at nardis.ca>
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 9.20140227),
 	dpkg-dev (>= 1.16.1),
 	libdb5.3-dev, nettle-dev,
  libgnutls28-dev, unixodbc-dev, libncurses5-dev, libperl-dev (>= 5.8.0),
  libsasl2-dev, libslp-dev, libltdl-dev | libltdl3-dev (>= 1.4.3),
  libwrap0-dev, perl, po-debconf,
- groff-base, time, heimdal-multidev,
+ groff-base, time, heimdal-multidev <!stage1>,
  dh-autoreconf
 Build-Conflicts: libbind-dev, bind-dev, libicu-dev, autoconf2.13
 Standards-Version: 3.9.6
@@ -45,6 +45,7 @@ Package: slapd-smbk5pwd
 Section: net
 Priority: extra
 Architecture: any
+Build-Profiles: <!stage1>
 Depends: slapd (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: Keeps Samba and Kerberos passwords in sync within slapd.
  Extends the PasswordModify Extended Operation to update Kerberos keys
diff --git a/debian/rules b/debian/rules
index 33a9901..204c8e2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -87,14 +87,18 @@ override_dh_auto_configure:
 
 override_dh_auto_build:
 	dh_auto_build -- $(MAKEVARS)
+ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
 	$(MAKE) -C contrib/slapd-modules/smbk5pwd
+endif
 	$(MAKE) -C contrib/slapd-modules/autogroup
 	$(MAKE) -C contrib/slapd-modules/lastbind
 	$(MAKE) -C contrib/slapd-modules/passwd/sha2
 
 override_dh_auto_install:
 	dh_auto_install -- $(MAKEVARS)
+ifeq ($(filter stage1,$(DEB_BUILD_PROFILES)),)
 	$(MAKE) -C contrib/slapd-modules/smbk5pwd install DESTDIR=$(installdir)
+endif
 	$(MAKE) -C contrib/slapd-modules/autogroup install DESTDIR=$(installdir)
 	$(MAKE) -C contrib/slapd-modules/lastbind install DESTDIR=$(installdir)
 	$(MAKE) -C contrib/slapd-modules/passwd/sha2 install DESTDIR=$(installdir)

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