[Pkg-samba-maint] [samba] 26/26: Merge branch 'master' into samba_4.1

[Ivo De Decker]

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

idd-guest pushed a commit to branch samba_4.1
in repository samba.

commit 64067c90006d53ca1422b609a6b9003585fe6b2b
Merge: 404b157 bd7c26e
Author: Ivo De Decker <ivo.dedecker at ugent.be>
Date:   Mon Dec 9 23:06:14 2013 +0100

    Merge branch 'master' into samba_4.1
    
    Conflicts:
    	debian/changelog

 debian/changelog                 | 30 ++++++++++++++++++++++++++++--
 debian/po/es.po                  | 34 +++++++++++++++++++++++-----------
 debian/samba-common-bin.postinst |  9 ++++++---
 debian/samba-common-bin.prerm    |  7 +++++++
 debian/samba.postinst            |  4 +++-
 debian/samba.prerm               |  7 +++++++
 6 files changed, 74 insertions(+), 17 deletions(-)

diff --cc debian/changelog
index a534237,11cc04e..414dba9
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,28 -1,18 +1,41 @@@
 +samba (2:4.1.3+dfsg-1) UNRELEASED; urgency=low
 +
 +  [ Jelmer Vernooij ]
 +  * New upstream release.
 +   + Drop 0002-lib-replace-Allow-OS-vendor-to-assert-that-getpass-i.patch:
 +     upstream no longer uses getpass.
 +  * Add source dependency on libntdb1, and stop passing --disable-ntdb,
 +    which has been removed.
 +  * Remove handling for SWAT, which is no longer shipped upstream.
 +  * Split VFS modules out from samba-libs into a separate binary
 +    package.
 +  * Move service and process_model modules from the samba-libs to the
 +    samba package. Prevents dependencies on libkdc2-heimdal and
 +    libhdb9-heimdal.
 +
 +  [ Ivo De Decker ]
 +  * Add build-dep on python-ntdb.
 +  * Add build-dep on libncurses5-dev.
 +  * Add depends on python-ntdb to samba.
 +  * New upstream release.
 +
 + -- Jelmer Vernooij <jelmer at debian.org>  Sun, 17 Nov 2013 11:47:57 +0000
 +
- samba (2:4.0.12+dfsg-2) UNRELEASED; urgency=low
+ samba (2:4.0.13+dfsg-2) UNRELEASED; urgency=low
  
+   [ Steve Langasek ]
+   * Check for alternative's presence before calling update-alternatives
+     --remove-all, instead of silently ignoring all errors from
+     update-alternatives.
+ 
+   [ Debconf translations ]
+   * Spanish (Javier Fernández-Sanguino).  Closes: #731800
+ 
+  -- Steve Langasek <vorlon at debian.org>  Mon, 09 Dec 2013 11:13:59 -0800
+ 
+ samba (2:4.0.13+dfsg-1) unstable; urgency=high
+ 
+   [ Steve Langasek ]
    * Move update-alternatives upgrade removal handling to the postinst, where
      it belongs.  Closes: #730090.
    * Really remove all references to encrypted passwords: the

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