* Merge from Debian unstable, remaining changes: + debian/patches/VERSION.patch: - set SAMBA_VERSION_SUFFIX to Ubuntu. + 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. - Other changes now in Debian packaging. + 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.install: install profile. - debian/control: have samba suggest ufw. + Add apport hook: - Created debian/source_samba.py. - debian/rules, debian/samba-common-bin.install: install hook. + Switch to upstart: - Added debian/samba.{nmbd,smbd}.upstart. - debian/samba.logrotate, debian/samba-common.dhcp, debian/samba.if-up: Make upstart compatible. * d/samba.install, d/samba-common-bin.install: Restore apport hook and ufw profile (LP: #999764). * Dropped: + debian/patches/CVE-2012-1182-*.patch: fixed in upstream release 3.6.4. + debian/patches/CVE-2012-2111.patch: fixed in upstream release 3.6.5. + debian/patches/fix-debuglevel-name-conflict.patch: fixed upstream - debug_level is no longer used as a global variable name. + debian/patches/error-trans.fix-276472: fixed upstream.