[Pkg-samba-maint] r1107 - in trunk: . patches
Peter Eisentraut
petere at costa.debian.org
Fri Aug 4 12:40:20 UTC 2006
Author: petere
Date: 2006-08-04 12:40:19 +0000 (Fri, 04 Aug 2006)
New Revision: 1107
Modified:
trunk/changelog
trunk/patches/fhs.patch
trunk/swat.files
Log:
* Put localized swat messages into /usr/share/samba, where swat looks for
them. Closes: #376991
Modified: trunk/changelog
===================================================================
--- trunk/changelog 2006-08-04 12:16:43 UTC (rev 1106)
+++ trunk/changelog 2006-08-04 12:40:19 UTC (rev 1107)
@@ -62,6 +62,8 @@
* Python transition preparations: renamed package to python-samba,
removed hardcoded references to Python version 2.3. Closes: #380939
* Removed unwanted swat debconf warning
+ * Put localized swat messages into /usr/share/samba, where swat looks for
+ them. Closes: #376991
-- Christian Perrier <bubulle at debian.org> Sun, 23 Jul 2006 18:50:35 +0200
Modified: trunk/patches/fhs.patch
===================================================================
--- trunk/patches/fhs.patch 2006-08-04 12:16:43 UTC (rev 1106)
+++ trunk/patches/fhs.patch 2006-08-04 12:40:19 UTC (rev 1107)
@@ -1,7 +1,7 @@
Index: samba-3.0.23a/source/Makefile.in
===================================================================
---- samba-3.0.23a.orig/source/Makefile.in 2006-07-23 18:51:13.902415207 +0200
-+++ samba-3.0.23a/source/Makefile.in 2006-07-23 18:52:13.206895570 +0200
+--- samba-3.0.23a.orig/source/Makefile.in 2006-08-04 14:01:30.000000000 +0200
++++ samba-3.0.23a/source/Makefile.in 2006-08-04 14:02:00.000000000 +0200
@@ -100,6 +100,13 @@
# the directory where lock files go
LOCKDIR = @lockdir@
@@ -25,7 +25,7 @@
PATH_FLAGS = $(PATH_FLAGS6) $(PASSWD_FLAGS)
# Note that all executable programs now provide for an optional executable suffix.
-@@ -1454,7 +1461,7 @@
+@@ -1454,10 +1461,10 @@
@$(SHELL) $(srcdir)/script/installscripts.sh $(INSTALLPERMS) $(DESTDIR)$(BINDIR) $(SCRIPTS)
installdat: installdirs
@@ -33,11 +33,15 @@
+ @$(SHELL) $(srcdir)/script/installdat.sh $(DESTDIR) $(CODEPAGEDIR) $(srcdir)
installmsg: installdirs
- @$(SHELL) $(srcdir)/script/installmsg.sh $(DESTDIR) $(LIBDIR) $(srcdir)
+- @$(SHELL) $(srcdir)/script/installmsg.sh $(DESTDIR) $(LIBDIR) $(srcdir)
++ @$(SHELL) $(srcdir)/script/installmsg.sh $(DESTDIR) $(CODEPAGEDIR) $(srcdir)
+
+ installswat: installdirs installmsg
+ @$(SHELL) $(srcdir)/script/installswat.sh $(DESTDIR) $(SWATDIR) $(srcdir)
Index: samba-3.0.23a/source/configure.in
===================================================================
---- samba-3.0.23a.orig/source/configure.in 2006-07-23 18:51:14.046416373 +0200
-+++ samba-3.0.23a/source/configure.in 2006-07-23 18:52:13.222895700 +0200
+--- samba-3.0.23a.orig/source/configure.in 2006-08-04 14:01:30.000000000 +0200
++++ samba-3.0.23a/source/configure.in 2006-08-04 14:01:39.000000000 +0200
@@ -37,7 +37,7 @@
[ --with-fhs Use FHS-compliant paths (default=no)],
[ case "$withval" in
@@ -70,8 +74,8 @@
Index: samba-3.0.23a/source/dynconfig.c
===================================================================
---- samba-3.0.23a.orig/source/dynconfig.c 2006-07-23 18:51:14.094416762 +0200
-+++ samba-3.0.23a/source/dynconfig.c 2006-07-23 18:52:13.226895732 +0200
+--- samba-3.0.23a.orig/source/dynconfig.c 2006-08-04 14:01:30.000000000 +0200
++++ samba-3.0.23a/source/dynconfig.c 2006-08-04 14:01:39.000000000 +0200
@@ -53,6 +53,13 @@
pstring dyn_LMHOSTSFILE = LMHOSTSFILE;
@@ -116,8 +120,8 @@
+}
Index: samba-3.0.23a/source/groupdb/mapping.c
===================================================================
---- samba-3.0.23a.orig/source/groupdb/mapping.c 2006-07-23 18:51:14.154417248 +0200
-+++ samba-3.0.23a/source/groupdb/mapping.c 2006-07-23 18:52:13.230895765 +0200
+--- samba-3.0.23a.orig/source/groupdb/mapping.c 2006-08-04 14:01:30.000000000 +0200
++++ samba-3.0.23a/source/groupdb/mapping.c 2006-08-04 14:01:39.000000000 +0200
@@ -56,7 +56,7 @@
if (tdb)
return True;
@@ -129,8 +133,8 @@
return False;
Index: samba-3.0.23a/source/include/dynconfig.h
===================================================================
---- samba-3.0.23a.orig/source/include/dynconfig.h 2006-07-23 18:51:14.214417734 +0200
-+++ samba-3.0.23a/source/include/dynconfig.h 2006-07-23 18:52:13.230895765 +0200
+--- samba-3.0.23a.orig/source/include/dynconfig.h 2006-08-04 14:01:30.000000000 +0200
++++ samba-3.0.23a/source/include/dynconfig.h 2006-08-04 14:01:39.000000000 +0200
@@ -31,8 +31,12 @@
extern pstring dyn_CONFIGFILE;
extern pstring dyn_LOGFILEBASE, dyn_LMHOSTSFILE;
@@ -146,8 +150,8 @@
+char *dyn_CACHEDIR(void);
Index: samba-3.0.23a/source/intl/lang_tdb.c
===================================================================
---- samba-3.0.23a.orig/source/intl/lang_tdb.c 2006-07-23 18:51:14.266418155 +0200
-+++ samba-3.0.23a/source/intl/lang_tdb.c 2006-07-23 18:52:13.234895797 +0200
+--- samba-3.0.23a.orig/source/intl/lang_tdb.c 2006-08-04 14:01:30.000000000 +0200
++++ samba-3.0.23a/source/intl/lang_tdb.c 2006-08-04 14:01:39.000000000 +0200
@@ -131,7 +131,7 @@
if (!lang)
return True;
@@ -159,8 +163,8 @@
DEBUG(10, ("lang_tdb_init: %s: %s\n", msg_path,
Index: samba-3.0.23a/source/lib/util.c
===================================================================
---- samba-3.0.23a.orig/source/lib/util.c 2006-07-23 18:51:14.318418576 +0200
-+++ samba-3.0.23a/source/lib/util.c 2006-07-23 18:52:13.242895862 +0200
+--- samba-3.0.23a.orig/source/lib/util.c 2006-08-04 14:01:31.000000000 +0200
++++ samba-3.0.23a/source/lib/util.c 2006-08-04 14:01:39.000000000 +0200
@@ -2567,6 +2567,61 @@
}
@@ -225,8 +229,8 @@
* @retval Pointer to a static #fstring containing the extension.
Index: samba-3.0.23a/source/lib/util_unistr.c
===================================================================
---- samba-3.0.23a.orig/source/lib/util_unistr.c 2006-07-23 18:51:14.370418997 +0200
-+++ samba-3.0.23a/source/lib/util_unistr.c 2006-07-23 18:52:13.246895895 +0200
+--- samba-3.0.23a.orig/source/lib/util_unistr.c 2006-08-04 14:01:31.000000000 +0200
++++ samba-3.0.23a/source/lib/util_unistr.c 2006-08-04 14:01:39.000000000 +0200
@@ -88,10 +88,10 @@
}
initialised = 1;
@@ -251,8 +255,8 @@
mapped_file = 1;
Index: samba-3.0.23a/source/libsmb/samlogon_cache.c
===================================================================
---- samba-3.0.23a.orig/source/libsmb/samlogon_cache.c 2006-07-23 18:51:14.502420066 +0200
-+++ samba-3.0.23a/source/libsmb/samlogon_cache.c 2006-07-23 18:52:13.246895895 +0200
+--- samba-3.0.23a.orig/source/libsmb/samlogon_cache.c 2006-08-04 14:01:31.000000000 +0200
++++ samba-3.0.23a/source/libsmb/samlogon_cache.c 2006-08-04 14:01:39.000000000 +0200
@@ -34,7 +34,7 @@
BOOL netsamlogon_cache_init(void)
{
@@ -273,8 +277,8 @@
DEBUG(5, ("netsamlogon_clear_cached_user: failed to open cache\n"));
Index: samba-3.0.23a/source/nmbd/nmbd_serverlistdb.c
===================================================================
---- samba-3.0.23a.orig/source/nmbd/nmbd_serverlistdb.c 2006-07-23 18:51:14.554420487 +0200
-+++ samba-3.0.23a/source/nmbd/nmbd_serverlistdb.c 2006-07-23 18:52:13.250895927 +0200
+--- samba-3.0.23a.orig/source/nmbd/nmbd_serverlistdb.c 2006-08-04 14:01:31.000000000 +0200
++++ samba-3.0.23a/source/nmbd/nmbd_serverlistdb.c 2006-08-04 14:01:39.000000000 +0200
@@ -325,7 +325,7 @@
updatecount++;
@@ -286,8 +290,8 @@
pstrcat(fname,SERVER_LIST);
Index: samba-3.0.23a/source/nmbd/nmbd_winsserver.c
===================================================================
---- samba-3.0.23a.orig/source/nmbd/nmbd_winsserver.c 2006-07-23 18:51:14.610420940 +0200
-+++ samba-3.0.23a/source/nmbd/nmbd_winsserver.c 2006-07-23 18:52:13.258895992 +0200
+--- samba-3.0.23a.orig/source/nmbd/nmbd_winsserver.c 2006-08-04 14:01:31.000000000 +0200
++++ samba-3.0.23a/source/nmbd/nmbd_winsserver.c 2006-08-04 14:01:39.000000000 +0200
@@ -585,7 +585,7 @@
add_samba_names_to_subnet(wins_server_subnet);
@@ -308,8 +312,8 @@
Index: samba-3.0.23a/source/passdb/login_cache.c
===================================================================
---- samba-3.0.23a.orig/source/passdb/login_cache.c 2006-07-23 18:51:14.662421361 +0200
-+++ samba-3.0.23a/source/passdb/login_cache.c 2006-07-23 18:52:13.262896024 +0200
+--- samba-3.0.23a.orig/source/passdb/login_cache.c 2006-08-04 14:01:31.000000000 +0200
++++ samba-3.0.23a/source/passdb/login_cache.c 2006-08-04 14:01:39.000000000 +0200
@@ -36,7 +36,7 @@
/* skip file open if it's already opened */
if (cache) return True;
@@ -321,8 +325,8 @@
else {
Index: samba-3.0.23a/source/nsswitch/winbindd_cache.c
===================================================================
---- samba-3.0.23a.orig/source/nsswitch/winbindd_cache.c 2006-07-23 18:51:14.826422690 +0200
-+++ samba-3.0.23a/source/nsswitch/winbindd_cache.c 2006-07-23 18:52:13.270896089 +0200
+--- samba-3.0.23a.orig/source/nsswitch/winbindd_cache.c 2006-08-04 14:01:31.000000000 +0200
++++ samba-3.0.23a/source/nsswitch/winbindd_cache.c 2006-08-04 14:01:39.000000000 +0200
@@ -1889,7 +1889,7 @@
return True;
@@ -343,8 +347,8 @@
O_RDWR|O_CREAT, 0600);
Index: samba-3.0.23a/source/nsswitch/winbindd_util.c
===================================================================
---- samba-3.0.23a.orig/source/nsswitch/winbindd_util.c 2006-07-23 18:51:14.878423111 +0200
-+++ samba-3.0.23a/source/nsswitch/winbindd_util.c 2006-07-23 18:52:13.274896121 +0200
+--- samba-3.0.23a.orig/source/nsswitch/winbindd_util.c 2006-08-04 14:01:31.000000000 +0200
++++ samba-3.0.23a/source/nsswitch/winbindd_util.c 2006-08-04 14:01:39.000000000 +0200
@@ -1181,7 +1181,7 @@
SMB_STRUCT_STAT stbuf;
TDB_CONTEXT *idmap_tdb;
@@ -356,8 +360,8 @@
/* nothing to convert return */
Index: samba-3.0.23a/source/param/loadparm.c
===================================================================
---- samba-3.0.23a.orig/source/param/loadparm.c 2006-07-23 18:51:14.938423596 +0200
-+++ samba-3.0.23a/source/param/loadparm.c 2006-07-23 18:52:13.294896283 +0200
+--- samba-3.0.23a.orig/source/param/loadparm.c 2006-08-04 14:01:31.000000000 +0200
++++ samba-3.0.23a/source/param/loadparm.c 2006-08-04 14:01:39.000000000 +0200
@@ -107,6 +107,9 @@
char *szAddPrinterCommand;
char *szDeletePrinterCommand;
@@ -384,8 +388,8 @@
{"utmp directory", P_STRING, P_GLOBAL, &Globals.szUtmpDir, NULL, NULL, FLAG_ADVANCED},
Index: samba-3.0.23a/source/passdb/secrets.c
===================================================================
---- samba-3.0.23a.orig/source/passdb/secrets.c 2006-07-23 18:51:14.718421815 +0200
-+++ samba-3.0.23a/source/passdb/secrets.c 2006-07-23 18:52:13.298896316 +0200
+--- samba-3.0.23a.orig/source/passdb/secrets.c 2006-08-04 14:01:31.000000000 +0200
++++ samba-3.0.23a/source/passdb/secrets.c 2006-08-04 14:01:39.000000000 +0200
@@ -58,8 +58,7 @@
if (tdb)
return True;
@@ -398,8 +402,8 @@
Index: samba-3.0.23a/source/printing/nt_printing.c
===================================================================
---- samba-3.0.23a.orig/source/printing/nt_printing.c 2006-07-23 18:51:14.986423985 +0200
-+++ samba-3.0.23a/source/printing/nt_printing.c 2006-07-23 18:52:13.314896445 +0200
+--- samba-3.0.23a.orig/source/printing/nt_printing.c 2006-08-04 14:01:31.000000000 +0200
++++ samba-3.0.23a/source/printing/nt_printing.c 2006-08-04 14:01:39.000000000 +0200
@@ -551,28 +551,28 @@
if (tdb_drivers)
@@ -446,8 +450,8 @@
Index: samba-3.0.23a/source/printing/printing.c
===================================================================
---- samba-3.0.23a.orig/source/printing/printing.c 2006-07-23 18:51:15.038424406 +0200
-+++ samba-3.0.23a/source/printing/printing.c 2006-07-23 18:52:13.322896510 +0200
+--- samba-3.0.23a.orig/source/printing/printing.c 2006-08-04 14:01:31.000000000 +0200
++++ samba-3.0.23a/source/printing/printing.c 2006-08-04 14:01:39.000000000 +0200
@@ -183,8 +183,8 @@
int services = lp_numservices();
int snum;
@@ -461,8 +465,8 @@
/* handle a Samba upgrade */
Index: samba-3.0.23a/source/printing/printing_db.c
===================================================================
---- samba-3.0.23a.orig/source/printing/printing_db.c 2006-07-23 18:51:15.094424860 +0200
-+++ samba-3.0.23a/source/printing/printing_db.c 2006-07-23 18:52:13.326896543 +0200
+--- samba-3.0.23a.orig/source/printing/printing_db.c 2006-08-04 14:01:31.000000000 +0200
++++ samba-3.0.23a/source/printing/printing_db.c 2006-08-04 14:01:39.000000000 +0200
@@ -91,7 +91,7 @@
DLIST_ADD(print_db_head, p);
}
@@ -474,8 +478,8 @@
Index: samba-3.0.23a/source/sam/idmap_tdb.c
===================================================================
---- samba-3.0.23a.orig/source/sam/idmap_tdb.c 2006-07-23 18:51:15.150425313 +0200
-+++ samba-3.0.23a/source/sam/idmap_tdb.c 2006-07-23 18:52:13.326896543 +0200
+--- samba-3.0.23a.orig/source/sam/idmap_tdb.c 2006-08-04 14:01:31.000000000 +0200
++++ samba-3.0.23a/source/sam/idmap_tdb.c 2006-08-04 14:01:39.000000000 +0200
@@ -449,7 +449,7 @@
BOOL tdb_is_new = False;
@@ -487,8 +491,8 @@
return NT_STATUS_NO_MEMORY;
Index: samba-3.0.23a/source/smbd/lanman.c
===================================================================
---- samba-3.0.23a.orig/source/smbd/lanman.c 2006-07-23 18:51:15.210425799 +0200
-+++ samba-3.0.23a/source/smbd/lanman.c 2006-07-23 18:52:13.338896640 +0200
+--- samba-3.0.23a.orig/source/smbd/lanman.c 2006-08-04 14:01:31.000000000 +0200
++++ samba-3.0.23a/source/smbd/lanman.c 2006-08-04 14:01:39.000000000 +0200
@@ -1052,9 +1052,9 @@
BOOL local_list_only;
int i;
@@ -503,8 +507,8 @@
Index: samba-3.0.23a/source/utils/net_idmap.c
===================================================================
---- samba-3.0.23a.orig/source/utils/net_idmap.c 2006-07-23 18:51:15.262426220 +0200
-+++ samba-3.0.23a/source/utils/net_idmap.c 2006-07-23 18:52:13.342896672 +0200
+--- samba-3.0.23a.orig/source/utils/net_idmap.c 2006-08-04 14:01:31.000000000 +0200
++++ samba-3.0.23a/source/utils/net_idmap.c 2006-08-04 14:01:39.000000000 +0200
@@ -136,7 +136,7 @@
return NT_STATUS_UNSUCCESSFUL;
}
@@ -516,8 +520,8 @@
return NT_STATUS_NO_MEMORY;
Index: samba-3.0.23a/source/registry/reg_db.c
===================================================================
---- samba-3.0.23a.orig/source/registry/reg_db.c 2006-07-23 18:51:15.314426641 +0200
-+++ samba-3.0.23a/source/registry/reg_db.c 2006-07-23 18:52:13.346896705 +0200
+--- samba-3.0.23a.orig/source/registry/reg_db.c 2006-08-04 14:01:31.000000000 +0200
++++ samba-3.0.23a/source/registry/reg_db.c 2006-08-04 14:01:39.000000000 +0200
@@ -205,12 +205,12 @@
if ( tdb_reg )
return True;
@@ -550,8 +554,8 @@
unbecome_root();
Index: samba-3.0.23a/source/lib/account_pol.c
===================================================================
---- samba-3.0.23a.orig/source/lib/account_pol.c 2006-07-23 18:51:14.446419612 +0200
-+++ samba-3.0.23a/source/lib/account_pol.c 2006-07-23 18:52:13.350896737 +0200
+--- samba-3.0.23a.orig/source/lib/account_pol.c 2006-08-04 14:01:31.000000000 +0200
++++ samba-3.0.23a/source/lib/account_pol.c 2006-08-04 14:01:39.000000000 +0200
@@ -262,7 +262,7 @@
return True;
}
@@ -563,8 +567,8 @@
return False;
Index: samba-3.0.23a/source/registry/reg_perfcount.c
===================================================================
---- samba-3.0.23a.orig/source/registry/reg_perfcount.c 2006-07-23 18:51:15.370427095 +0200
-+++ samba-3.0.23a/source/registry/reg_perfcount.c 2006-07-23 18:52:13.354896770 +0200
+--- samba-3.0.23a.orig/source/registry/reg_perfcount.c 2006-08-04 14:01:31.000000000 +0200
++++ samba-3.0.23a/source/registry/reg_perfcount.c 2006-08-04 14:01:39.000000000 +0200
@@ -44,7 +44,7 @@
fstr_sprintf( path, "%s/%s", PERFCOUNTDIR, dbname );
@@ -585,8 +589,8 @@
Index: samba-3.0.23a/source/rpc_server/srv_eventlog_lib.c
===================================================================
---- samba-3.0.23a.orig/source/rpc_server/srv_eventlog_lib.c 2006-07-23 18:51:15.438427645 +0200
-+++ samba-3.0.23a/source/rpc_server/srv_eventlog_lib.c 2006-07-23 18:52:13.358896802 +0200
+--- samba-3.0.23a.orig/source/rpc_server/srv_eventlog_lib.c 2006-08-04 14:01:31.000000000 +0200
++++ samba-3.0.23a/source/rpc_server/srv_eventlog_lib.c 2006-08-04 14:01:39.000000000 +0200
@@ -67,7 +67,7 @@
{
fstring path;
@@ -607,8 +611,8 @@
Index: samba-3.0.23a/source/passdb/pdb_tdb.c
===================================================================
---- samba-3.0.23a.orig/source/passdb/pdb_tdb.c 2006-07-23 18:51:14.774422268 +0200
-+++ samba-3.0.23a/source/passdb/pdb_tdb.c 2006-07-23 18:52:13.362896834 +0200
+--- samba-3.0.23a.orig/source/passdb/pdb_tdb.c 2006-08-04 14:01:31.000000000 +0200
++++ samba-3.0.23a/source/passdb/pdb_tdb.c 2006-08-04 14:01:39.000000000 +0200
@@ -1608,7 +1608,7 @@
/* save the path for later */
Modified: trunk/swat.files
===================================================================
--- trunk/swat.files 2006-08-04 12:16:43 UTC (rev 1106)
+++ trunk/swat.files 2006-08-04 12:40:19 UTC (rev 1107)
@@ -1,5 +1,5 @@
usr/sbin/swat
-usr/lib/samba/*.msg
+usr/share/samba/*.msg
usr/share/samba/swat/help/welcome.html
usr/share/samba/swat/images
usr/share/samba/swat/include
More information about the Pkg-samba-maint
mailing list