-
Committer:
Package Import Robot
-
Author(s):
James Page
-
Date:
2012-08-08 10:36:23 UTC
-
mfrom:
(0.39.34 sid)
-
Revision ID:
package-import@ubuntu.com-20120808103623-d0bb8eqcwy4ep5ju
Tags: 2:3.6.6-3ubuntu1
* 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.
+ 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.
- Added debian/winbind.upstart.
- debian/samba.logrotate, debian/samba-common.dhcp, debian/samba.if-up:
Make upstart compatible.
+ d/rules: Drop explicit configuration options for ctdb.
* d/patches/cups-1.6.1_compat.patch: Cherry picked patch from upstream VCS
for compatibility with cups >= 1.6.