[Pkg-samba-maint] [samba] 01/05: Merge branch 'samba_4.0' into samba_4.0_integration

[Jeroen Dekkers]

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

dekkers-guest pushed a commit to branch samba_4.0_integration
in repository samba.

commit fbe573ab0d4e799f2b55524951229c1a2739e00a
Merge: 9d37cae 2285114
Author: Jeroen Dekkers <jeroen at dekkers.ch>
Date:   Fri Sep 20 21:19:27 2013 +0200

    Merge branch 'samba_4.0' into samba_4.0_integration

 debian/control |    1 +
 1 file changed, 1 insertion(+)

diff --cc debian/control
index 4332f32,15074ca..0238784
--- a/debian/control
+++ b/debian/control
@@@ -350,9 -612,13 +350,10 @@@ Pre-Depends: ${misc:Pre-Depends
  Architecture: any
  Section: python
  Provides: ${python:Provides}
 -Depends: libnetapi0 (=${binary:Version}),
 -         libsamba-hostconfig0 (=${binary:Version}),
 -         libsamba-util0 (=${binary:Version}),
 -         libsmbd0 (=${binary:Version}),
 -         python-ldb,
 +Depends: python-ldb,
           python-tdb,
 +         samba-libs (=${binary:Version}),
+          python-crypto,
           ${misc:Depends},
           ${python:Depends},
           ${shlibs:Depends}

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