[Pkg-samba-maint] [samba] 02/02: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-samba/samba into debian_4.1
Jelmer Vernooij
jelmer at moszumanska.debian.org
Fri Dec 6 22:42:31 UTC 2013
This is an automated email from the git hooks/post-receive script.
jelmer pushed a commit to branch samba_4.1
in repository samba.
commit 646d645fa47ff7e3767b224677e651faa3f3250a
Merge: 6df2c29 77e8558
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Fri Dec 6 22:41:57 2013 +0000
Merge branch 'master' of git+ssh://git.debian.org/git/pkg-samba/samba into debian_4.1
Conflicts:
VERSION
WHATSNEW.txt
debian/changelog
docs/manpages/dbwrap_tool.1
docs/manpages/eventlogadm.8
docs/manpages/findsmb.1
docs/manpages/idmap_ad.8
docs/manpages/idmap_autorid.8
docs/manpages/idmap_hash.8
docs/manpages/idmap_ldap.8
docs/manpages/idmap_nss.8
docs/manpages/idmap_rid.8
docs/manpages/idmap_tdb.8
docs/manpages/idmap_tdb2.8
docs/manpages/libsmbclient.7
docs/manpages/lmhosts.5
docs/manpages/log2pcap.1
docs/manpages/net.8
docs/manpages/nmbd.8
docs/manpages/nmblookup.1
docs/manpages/ntlm_auth.1
docs/manpages/pam_winbind.8
docs/manpages/pam_winbind.conf.5
docs/manpages/pdbedit.8
docs/manpages/profiles.1
docs/manpages/rpcclient.1
docs/manpages/samba-tool.8
docs/manpages/samba.7
docs/manpages/samba.8
docs/manpages/sharesec.1
docs/manpages/smb.conf.5
docs/manpages/smbcacls.1
docs/manpages/smbclient.1
docs/manpages/smbcontrol.1
docs/manpages/smbcquotas.1
docs/manpages/smbd.8
docs/manpages/smbget.1
docs/manpages/smbgetrc.5
docs/manpages/smbpasswd.5
docs/manpages/smbpasswd.8
docs/manpages/smbspool.8
docs/manpages/smbstatus.1
docs/manpages/smbta-util.8
docs/manpages/smbtar.1
docs/manpages/smbtree.1
docs/manpages/swat.8
docs/manpages/testparm.1
docs/manpages/vfs_acl_tdb.8
docs/manpages/vfs_acl_xattr.8
docs/manpages/vfs_aio_fork.8
docs/manpages/vfs_aio_linux.8
docs/manpages/vfs_aio_pthread.8
docs/manpages/vfs_audit.8
docs/manpages/vfs_cacheprime.8
docs/manpages/vfs_cap.8
docs/manpages/vfs_catia.8
docs/manpages/vfs_commit.8
docs/manpages/vfs_crossrename.8
docs/manpages/vfs_default_quota.8
docs/manpages/vfs_dirsort.8
docs/manpages/vfs_extd_audit.8
docs/manpages/vfs_fake_perms.8
docs/manpages/vfs_fileid.8
docs/manpages/vfs_full_audit.8
docs/manpages/vfs_gpfs.8
docs/manpages/vfs_media_harmony.8
docs/manpages/vfs_netatalk.8
docs/manpages/vfs_notify_fam.8
docs/manpages/vfs_prealloc.8
docs/manpages/vfs_preopen.8
docs/manpages/vfs_readahead.8
docs/manpages/vfs_readonly.8
docs/manpages/vfs_recycle.8
docs/manpages/vfs_scannedonly.8
docs/manpages/vfs_shadow_copy.8
docs/manpages/vfs_shadow_copy2.8
docs/manpages/vfs_smb_traffic_analyzer.8
docs/manpages/vfs_streams_depot.8
docs/manpages/vfs_streams_xattr.8
docs/manpages/vfs_time_audit.8
docs/manpages/vfs_tsmsm.8
docs/manpages/vfs_xattr_tdb.8
docs/manpages/vfstest.1
docs/manpages/wbinfo.1
docs/manpages/winbind_krb5_locator.7
docs/manpages/winbindd.8
source3/autoconf/librpc/gen_ndr/messaging.h
source3/autoconf/librpc/gen_ndr/ndr_messaging.c
source3/include/autoconf/version.h
source3/winbindd/winbindd.c
debian/changelog | 26 ++++++++++++
debian/patches/26_heimdal_compat | 46 ++++++++++++++++++++++
debian/patches/series | 1 +
debian/po/de.po | 45 ++++++++++++---------
debian/po/nb.po | 25 +++++++-----
debian/po/th.po | 44 +++++++++++++--------
...-common-bin.prerm => samba-common-bin.postinst} | 2 +-
debian/samba-common.config | 15 -------
debian/samba.postinst | 4 ++
debian/samba.prerm | 11 ------
10 files changed, 148 insertions(+), 71 deletions(-)
diff --cc debian/changelog
index 85a03f2,4276ea5..7dbed58
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,25 -1,29 +1,51 @@@
+samba (2:4.1.1+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.
+
+ -- Jelmer Vernooij <jelmer at debian.org> Sun, 17 Nov 2013 11:47:57 +0000
+
+ samba (2:4.0.12+dfsg-2) UNRELEASED; urgency=low
+
+ * Move update-alternatives upgrade removal handling to the postinst, where
+ it belongs. Closes: #730090.
+ * Really remove all references to encrypted passwords: the
+ samba-common.config script still included references, which could cause
+ upgrade failures in some cases. Closes: #729167.
+
+ -- Steve Langasek <vorlon at debian.org> Sun, 24 Nov 2013 19:06:20 -0800
+
+ samba (2:4.0.12+dfsg-1) unstable; urgency=low
+
+ [ Ivo De Decker ]
+ * New upstream release.
+
+ [ Debconf translations ]
+ * Thai (Theppitak Karoonboonyanan). Closes: #728525
+ * Norwegian Bokmål (Bjørn Steensrud). Closes: #729070
+ * German (Holger Wansing). Closes: #729210
+
+ [ Jelmer Vernooij ]
+ * Add 26_heimdal_compat: Fix compatibility with newer versions of
+ Heimdal.
+
+ -- Ivo De Decker <ivo.dedecker at ugent.be> Sun, 24 Nov 2013 07:48:20 +0100
+
samba (2:4.0.11+dfsg-1) unstable; urgency=high
* New upstream security release. Fixes:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-samba/samba.git
More information about the Pkg-samba-maint
mailing list