[Pkg-samba-maint] [samba] 02/03: Merge in 4.3 package changes.

[Jelmer Vernooij]

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

jelmer pushed a commit to branch master
in repository samba.

commit 8723742a98fced929a617443769e44cc9fed529c
Author: Jelmer Vernooij <jelmer at jelmer.uk>
Date:   Wed Apr 27 01:29:49 2016 +0000

    Merge in 4.3 package changes.
---
 buildtools/wafsamba/wscript | 1 +
 debian/changelog            | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index 9e437e3..586cc4b 100755
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -303,6 +303,7 @@ def configure(conf):
 
     conf.CHECK_COMMAND(['uname', '-a'],
                        msg='Checking build system',
+                       define='BUILD_SYSTEM',
                        on_target=False)
     conf.CHECK_UNAME()
 
diff --git a/debian/changelog b/debian/changelog
index 3fc4eac..c96f7b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+samba (2:4.4.2+dfsg-2) UNRELEASED; urgency=medium
+
+  * Merge in 4.3 package changes.
+
+ -- Jelmer Vernooij <jelmer at debian.org>  Wed, 27 Apr 2016 01:29:47 +0000
+
 samba (2:4.4.2+dfsg-1) unstable; urgency=medium
 
   * New upstream release.

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