[Pkg-samba-maint] Merging some Ubuntu changes...useless change to samba-common.templates in Ubuntu

[Kees Cook]

Hi Christian,

On Thu, May 31, 2007 at 11:17:39PM +0200, Christian Perrier wrote:
> That one seems to be a regression in Ubuntu:
> 
> --- 3.0.25-1/debian/samba-common.templates	2007-05-21 12:15:48.000000000 +0100
> +++ 3.0.25-1ubuntu1/debian/samba-common.templates	2007-05-21 12:14:55.000000000 +0100
> @@ -28,10 +28,11 @@ _Description: Configure smb.conf automat
>  
>  Template: samba-common/workgroup
>  Type: string
> -_Description: Workgroup/Domain Name:
> - Please specify the workgroup you want this server to appear to be in
> - when queried by clients. Note that this parameter also controls the
> - domain name used with the security=domain setting.
> +Default: MSHOME
> +_Description: Workgroup/Domain Name?
> + This controls what workgroup your server will appear to be in when queried
> + by clients. Note that this parameter also controls the Domain name used
> + with the security=domain setting.
> 
> 
> The Debian version is more compliant with the debconf writing style
> suggestion. Also, the translations are OK with that version while they
> aren't with the Ubuntu rewrite. So that screen is probably not
> translated in Ubuntu.
> 
> However, I buy the default to MSHOME which we already adopted in our
> default smb.conf.
> 
> I suggest that the Ubuntu change is dropped by Ubuntu while we adopt
> adding the "Default: MSHOME" line

I think that sounds sane; the wording change is minor.

Also, I have added Mathias to the Cc list, as he will likely become
involved in some of the server-based packages, and as such may have some
comments.  Mathias, to catch you up, Christian has been doing a review of
the delta between Debian and Ubuntu's samba package, making various
excellent recommendations.

Thanks!

-- 
Kees Cook
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : http://lists.alioth.debian.org/pipermail/pkg-samba-maint/attachments/20070531/7bccf6d9/attachment-0001.pgp