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

[Christian Perrier]

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


-------------- 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/0c819e99/attachment.pgp