* Merge from Debian testing. (LP: #958534) Remaining changes: + debian/patches/VERSION.patch: - set SAMBA_VERSION_SUFFIX to Ubuntu. + debian/patches/error-trans.fix-276472: - Add the translation of Unix Error code -ENOTSUP to NT Error Code - NT_STATUS_NOT_SUPPORTED to prevent the Permission denied error. + debian/smb.conf: - add "(Samba, Ubuntu)" to server string. - comment out the default [homes] share, and add a comment about "valid users = %S" to show users how to restrict access to \\server\username to only username. - Set 'usershare allow guests', so that usershare admins are allowed to create public shares in addition to authenticated ones. - add map to guest = Bad user, maps bad username to guest access. + debian/samba-common.config: - Do not change priority to high if dhclient3 is installed. - Use priority medium instead of high for the workgroup question. + debian/control: - Don't build against or suggest ctdb. - Add dependency on samba-common-bin to samba. + Add ufw integration: - Created debian/samba.ufw.profile - debian/rules, debian/samba.dirs, debian/samba.files: install profile - debian/control: have samba suggest ufw + Add apport hook: - Created debian/source_samba.py. - debian/rules, debian/samba.dirs, debian/samba-common-bin.files: install + Switch to upstart: - Add debian/samba.{nmbd,smbd}.upstart. + debian/samba.logrotate, debian/samba-common.dhcp, debian/samba.if-up: - Make them upstart compatible + debian/patches/fix-debuglevel-name-conflict.patch: don't use 'debug_level' as a global variable name in an NSS module. * Updated symbols for debian/libsmbclient.symbols and debian/libwbclient0.symbols [ Christian Perrier ] * Fix example samba.ldif syntax. Closes: #659963 * Set minimal version of tdb ot 1.2.6 in Build-Depends (thanks, backports!) * Lower priority of debconf question to medium after some pondering. After all, we have a sane default. Closes: #662801 * Merge some Ubuntu patches: - samba.config: Avoid scary pdbedit warnings on first import. - samba.postinst: Add more informative error message for the case where smb.conf was manually deleted. [ Maarten Bezemer ] * Removed references to the testprns command from documentation * Added notes that the smbsh command is not available in this package Closes: #662243 [ Debconf translations ] * Indonesian (Arief S Fitrianto). Closes: #660312 * Slovak (Ivan Masár). Closes: #661125 [ Steve Langasek ] * Use Debian copyright-format 1.0 in debian/copyright. -------------- This line and the following will be ignored -------------- added: .pc/documentation2.patch/ .pc/documentation2.patch/docs/ .pc/documentation2.patch/docs-xml/ .pc/documentation2.patch/docs-xml/manpages-3/ .pc/documentation2.patch/docs-xml/manpages-3/nmbd.8.xml .pc/documentation2.patch/docs-xml/manpages-3/samba.7.xml .pc/documentation2.patch/docs-xml/manpages-3/smb.conf.5.xml .pc/documentation2.patch/docs-xml/manpages-3/smbd.8.xml .pc/documentation2.patch/docs-xml/using_samba/ .pc/documentation2.patch/docs-xml/using_samba/appd.xml .pc/documentation2.patch/docs-xml/using_samba/ch01.xml .pc/documentation2.patch/docs-xml/using_samba/ch07.xml .pc/documentation2.patch/docs/htmldocs/ .pc/documentation2.patch/docs/htmldocs/manpages/ .pc/documentation2.patch/docs/htmldocs/manpages/nmbd.8.html .pc/documentation2.patch/docs/htmldocs/manpages/samba.7.html .pc/documentation2.patch/docs/htmldocs/manpages/smb.conf.5.html .pc/documentation2.patch/docs/htmldocs/manpages/smbd.8.html .pc/documentation2.patch/docs/manpages/ .pc/documentation2.patch/docs/manpages/nmbd.8 .pc/documentation2.patch/docs/manpages/samba.7 .pc/documentation2.patch/docs/manpages/smb.conf.5 .pc/documentation2.patch/docs/manpages/smbd.8 .pc/documentation2.patch/examples/ .pc/documentation2.patch/examples/tridge/ .pc/documentation2.patch/examples/tridge/smb.conf .pc/documentation2.patch/swat/ .pc/documentation2.patch/swat/lang/ .pc/documentation2.patch/swat/lang/tr/ .pc/documentation2.patch/swat/lang/tr/help/ .pc/documentation2.patch/swat/lang/tr/help/welcome.html .pc/fix-samba.ldip-syntax.patch/ .pc/fix-samba.ldip-syntax.patch/examples/ .pc/fix-samba.ldip-syntax.patch/examples/LDAP/ .pc/fix-samba.ldip-syntax.patch/examples/LDAP/samba.ldif debian/patches/documentation2.patch debian/patches/fix-samba.ldip-syntax.patch modified: .pc/applied-patches debian/changelog debian/control debian/copyright debian/libsmbclient.symbols debian/libwbclient0.symbols debian/patches/series debian/po/id.po debian/po/sk.po docs-xml/manpages-3/nmbd.8.xml docs-xml/manpages-3/samba.7.xml docs-xml/manpages-3/smb.conf.5.xml docs-xml/manpages-3/smbd.8.xml docs-xml/using_samba/appd.xml docs-xml/using_samba/ch01.xml docs-xml/using_samba/ch07.xml docs/htmldocs/manpages/nmbd.8.html docs/htmldocs/manpages/samba.7.html docs/htmldocs/manpages/smb.conf.5.html docs/htmldocs/manpages/smbd.8.html docs/manpages/nmbd.8 docs/manpages/samba.7 docs/manpages/smb.conf.5 docs/manpages/smbd.8 examples/LDAP/samba.ldif examples/tridge/smb.conf swat/lang/tr/help/welcome.html unknown: .pc/.quilt_patches .pc/.quilt_series pending merges: Christian Perrier 2012-03-12 [ Christian Perrier ]