[Pkg-samba-maint] r2333 - branches/samba/experimental/debian/patches

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2009-01-13 22:08:37 +0000 (Tue, 13 Jan 2009)
New Revision: 2333

Removed:
   branches/samba/experimental/debian/patches/fhs-assignpaths.patch.old
Log:
Remove old stuff


Deleted: branches/samba/experimental/debian/patches/fhs-assignpaths.patch.old
===================================================================
--- branches/samba/experimental/debian/patches/fhs-assignpaths.patch.old	2009-01-12 01:29:11 UTC (rev 2332)
+++ branches/samba/experimental/debian/patches/fhs-assignpaths.patch.old	2009-01-13 22:08:37 UTC (rev 2333)
@@ -1,81 +0,0 @@
-Goal: Change install paths to better respect FHS. This needs fhs-newpaths.patch
-      to introduce new path variables and fhs-filespaths.patch to
-      associate files with these
-
-Fixes: #49011
-
-Status wrt upstream: Can remain Debian-specific if upstream doesn't want to
-                     change their default behaviour
-
-Index: samba-3.3.0pre2/source/param/loadparm.c
-===================================================================
---- samba-3.3.0pre2.orig/source/param/loadparm.c
-+++ samba-3.3.0pre2/source/param/loadparm.c
-@@ -120,6 +120,9 @@
- 	char *szAddPrinterCommand;
- 	char *szDeletePrinterCommand;
- 	char *szOs2DriverMap;
-+#ifdef FHS_COMPATIBLE
-+	char *szLockDirStub;
-+#endif
- 	char *szLockDir;
- 	char *szPidDir;
- 	char *szRootdir;
-@@ -3705,6 +3708,26 @@
- 		.enum_list	= NULL,
- 		.flags		= FLAG_ADVANCED,
- 	},
-+#ifdef FHS_COMPATIBLE
-+	{
-+		.label		= "lock directory",
-+		.type		= P_STRING,
-+		.p_class	= P_GLOBAL,
-+		.ptr		= &Globals.szLockDirStub,
-+		.special	= NULL,
-+		.enum_list	= NULL,
-+		.flags		= 0,
-+	},
-+	{
-+		.label		= "lock dir",
-+		.type		= P_STRING,
-+		.p_class	= P_GLOBAL,
-+		.ptr		= &Globals.szLockDirStub,
-+		.special	= NULL,
-+		.enum_list	= NULL,
-+		.flags		= 0,
-+	},
-+#else
- 	{
- 		.label		= "lock directory",
- 		.type		= P_STRING,
-@@ -3723,6 +3746,7 @@
- 		.enum_list	= NULL,
- 		.flags		= FLAG_HIDE,
- 	},
-+#endif
- 	{
- 		.label		= "pid directory",
- 		.type		= P_STRING,
-Index: samba-3.3.0pre2/source/m4/check_path.m4
-===================================================================
---- samba-3.3.0pre2.orig/source/m4/check_path.m4
-+++ samba-3.3.0pre2/source/m4/check_path.m4
-@@ -26,15 +26,15 @@
- pammodulesdir="${libdir}/security"
- configdir="${libdir}"
- swatdir="\${prefix}/swat"
--codepagedir="\${MODULESDIR}"
-+codepagedir="\${DATADIR}/samba"
- statedir="\${LOCKDIR}"
--cachedir="\${LOCKDIR}"
-+cachedir="\${VARDIR}/cache/samba"
- 
- AC_ARG_WITH(fhs,
- [AS_HELP_STRING([--with-fhs],[Use FHS-compliant paths (default=no)])],
- [ case "$withval" in
-   yes)
--    lockdir="\${VARDIR}/lib/samba"
-+    lockdir="\${VARDIR}/run/samba"
-     piddir="\${VARDIR}/run"
-     mandir="\${prefix}/share/man"
-     logfilebase="\${VARDIR}/log/samba"