[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  fd880fd s4-version: Fix version finding for bzr branches.
       via  fce1069 ldb-samba: Add missing dependency on pyldb-util.
      from  b85a323 s3: Improve a debug message, we have more than pdb_tdb.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit fd880fda0d19bf261368c761b2e92314613357ae
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Feb 20 16:28:54 2011 +0100

    s4-version: Fix version finding for bzr branches.
    
    Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
    Autobuild-Date: Sun Feb 20 17:35:45 CET 2011 on sn-devel-104

commit fce10699256bce6b9f789ac2a63904b45dde4246
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Jan 30 10:58:47 2011 +0100

    ldb-samba: Add missing dependency on pyldb-util.

-----------------------------------------------------------------------

Summary of changes:
 buildtools/wafsamba/samba_version.py |    2 +-
 source4/lib/ldb-samba/wscript_build  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildtools/wafsamba/samba_version.py b/buildtools/wafsamba/samba_version.py
index 5069ea3..4fe280e 100644
--- a/buildtools/wafsamba/samba_version.py
+++ b/buildtools/wafsamba/samba_version.py
@@ -260,6 +260,6 @@ def load_version(env=None):
     if not env:
         env = samba_utils.LOAD_ENVIRONMENT()
 
-    version = samba_version_file("./VERSION", "..", env)
+    version = samba_version_file("./VERSION", ".", env)
     Utils.g_module.VERSION = version.STRING
     return version
diff --git a/source4/lib/ldb-samba/wscript_build b/source4/lib/ldb-samba/wscript_build
index fddf12f..5379801 100644
--- a/source4/lib/ldb-samba/wscript_build
+++ b/source4/lib/ldb-samba/wscript_build
@@ -9,7 +9,7 @@ bld.SAMBA_LIBRARY('ldbsamba',
                   autoproto='ldif_handlers_proto.h',
                   public_deps='ldb',
                   public_headers='ldb_wrap.h',
-                  deps='security ndr NDR_DRSBLOBS NDR_DNSP ldbwrap samdb-common SAMDB_SCHEMA tdb',
+                  deps='security ndr NDR_DRSBLOBS NDR_DNSP ldbwrap samdb-common SAMDB_SCHEMA tdb pyldb-util',
                   private_library=True
                   )
 


-- 
Samba Shared Repository