sync from SAMBA_2_2

8 files changed, 24 insertions, 22 deletions

diff --git a/packaging/Debian/README b/packaging/Debian/README
index 8ffc7cdfc13..d6250c12095 100644
--- a/packaging/Debian/README
+++ b/packaging/Debian/README
@@ -4,9 +4,9 @@ Building Samba Packages for Debian GNU/Linux
 Building Debian packages is not as hard as some people might think. The
 following instructions will allow you to build your own Samba Debian
 packages. These instructions, and the files in packaging/Debian/, are
-current as of Samba 2.2.5, and should allow you to build Debian packages
+current as of Samba 2.2.6, and should allow you to build Debian packages
 for Debian Potato (2.2), Debian Woody (3.0), and Debian unstable as of
-the date Samba 2.2.5 was released.
+the date Samba 2.2.6 was released.
 
 Instructions
 ------------
@@ -34,7 +34,7 @@ devscripts, etc.):
   That's fine; the configure script won't detect CUPS support and the
   resulting binaries won't support CUPS.
 
-1) cd samba[-<version>]. For example, "cd samba-2.2.5".
+1) cd samba[-<version>]. For example, "cd samba-2.2.6".
 2) cp -a packaging/Debian/debian/ debian
   It's important that you copy instead of symlink because the build
   tools in Potato have a problem that prevents the build to work with
@@ -43,7 +43,7 @@ devscripts, etc.):
    Debian version numbers! Don't complain later if you can't upgrade
    to official versions of the Samba packages for Debian.)
   - Edit the changelog and make sure the version is right. For example,
-  for Samba 2.2.4, the version number should something like 2.2.4-0.1
+  for Samba 2.2.6, the version number should something like 2.2.6-0.1
   (use a number less than 1 like 0.1, 0.2, etc. so there is no conflict
   with future upgrades to the official Debian packages.)
 4) Run 'debian/rules binary'.
diff --git a/packaging/Debian/debian/README.build-upstream b/packaging/Debian/debian/README.build-upstream
index f555f52af5b..d6250c12095 100644
--- a/packaging/Debian/debian/README.build-upstream
+++ b/packaging/Debian/debian/README.build-upstream
@@ -4,9 +4,9 @@ Building Samba Packages for Debian GNU/Linux
 Building Debian packages is not as hard as some people might think. The
 following instructions will allow you to build your own Samba Debian
 packages. These instructions, and the files in packaging/Debian/, are
-current as of Samba 2.2.5, and should allow you to build Debian packages
+current as of Samba 2.2.6, and should allow you to build Debian packages
 for Debian Potato (2.2), Debian Woody (3.0), and Debian unstable as of
-the date Samba 2.2.5 was released.
+the date Samba 2.2.6 was released.
 
 Instructions
 ------------
@@ -34,7 +34,7 @@ devscripts, etc.):
   That's fine; the configure script won't detect CUPS support and the
   resulting binaries won't support CUPS.
 
-1) cd samba[-<version>]. For example, "cd samba-2.2.5".
+1) cd samba[-<version>]. For example, "cd samba-2.2.6".
 2) cp -a packaging/Debian/debian/ debian
   It's important that you copy instead of symlink because the build
   tools in Potato have a problem that prevents the build to work with
@@ -43,7 +43,7 @@ devscripts, etc.):
    Debian version numbers! Don't complain later if you can't upgrade
    to official versions of the Samba packages for Debian.)
   - Edit the changelog and make sure the version is right. For example,
-  for Samba 2.2.4, the version number should something like 2.2.4-0.1
+  for Samba 2.2.6, the version number should something like 2.2.6-0.1
   (use a number less than 1 like 0.1, 0.2, etc. so there is no conflict
   with future upgrades to the official Debian packages.)
 4) Run 'debian/rules binary'.
@@ -58,4 +58,3 @@ better things to do and know nothing about the Debian packaging system.
 Eloy A. Paris <peloy@debian.org>
 Steve Langasek <vorlon@debian.org>
 
-
diff --git a/packaging/Debian/debian/README.debian b/packaging/Debian/debian/README.debian
index 4eae2ded6b0..9547febd188 100644
--- a/packaging/Debian/debian/README.debian
+++ b/packaging/Debian/debian/README.debian
@@ -90,15 +90,19 @@ experimental.
 Samba 2.2 has experimental LDAP code. However, the official Debian
 packages have not been compiled with LDAP support for a good reason: if
 LDAP support is compiled in then the other authentication methods (PAM,
-smbpasswd, etc.) cannot be used, only LDAP will work. So, until LDAP
-can coexist peacefully with the other methods we will not provide
+smbpasswd, etc.) cannot be used, only LDAP will work. So, while LDAP
+cannot coexist peacefully with the other methods we will not provide
 LDAP-enabled packages. The workaround is, of course, to build your own
 packages. We can help with this if you don't know how to build packages.
 
 We follow Samba development, so please do not file bug reports asking
-for LDAP; we will add support for it when it doesn't break other
+for LDAP, we will add support for it when it doesn't break other
 things.
 
+update (2002/10/16): the Debian Samba packages in Debian unstable have
+been compiled with --ldapsam support. If you need LDAP support you can
+use those packages, or as we said, build your own 2.2.x packages.
+
 
 5. Reporting Bugs
 -----------------
@@ -137,3 +141,4 @@ doesn't mean that it doesn't work for others. So again: think _twice_.
 Eloy A. Paris <peloy@debian.org>
 Steve Langasek <vorlon@debian.org>
 
+$Id: README.debian,v 1.2.2.6 2002/10/17 01:45:11 jerry Exp $
diff --git a/packaging/Debian/debian/changelog b/packaging/Debian/debian/changelog
index bf9d516b186..6321c8e023d 100644
--- a/packaging/Debian/debian/changelog
+++ b/packaging/Debian/debian/changelog
@@ -1,8 +1,8 @@
-samba (2.2.6-1.woody) stable; urgency=low
+samba (2.2.6-0.1) unstable; urgency=low
 
-  * New upstream version.
+  * Local build.
 
- -- Eloy A. Paris <peloy@debian.org>  Sun, 13 Oct 2002 02:33:32 -0400
+ -- Debian User <user@somewhere.in.the.planet>  Sun, 13 Oct 2002 02:33:32 -0400
 
 samba (2.2.5-1.woody) stable; urgency=low
 
diff --git a/packaging/Debian/debian/libpam-smbpass.docs b/packaging/Debian/debian/libpam-smbpass.docs
index d84796d551b..89fbbf90425 100644
--- a/packaging/Debian/debian/libpam-smbpass.docs
+++ b/packaging/Debian/debian/libpam-smbpass.docs
@@ -1,4 +1,2 @@
-source/pam_smbpass/CHANGELOG
 source/pam_smbpass/README 
-source/pam_smbpass/INSTALL
 source/pam_smbpass/TODO
diff --git a/packaging/Debian/debian/patches/fhs.patch b/packaging/Debian/debian/patches/fhs.patch
index 17777d15f8c..d45599e36b6 100644
--- a/packaging/Debian/debian/patches/fhs.patch
+++ b/packaging/Debian/debian/patches/fhs.patch
@@ -192,7 +192,7 @@ diff -uNr samba-2.2.5pre1.orig/source/nsswitch/winbindd_idmap.c samba-2.2.5pre1/
  	char *szLockDir;
  	char *szPidDir;
  	char *szRootdir;
-@@ -1046,8 +1046,13 @@
+@@ -1043,8 +1043,13 @@
  	{"config file", P_STRING, P_GLOBAL, &Globals.szConfigFile, NULL, NULL, FLAG_HIDE},
  	{"preload", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_DOS_STRING},
  	{"auto services", P_STRING, P_GLOBAL, &Globals.szAutoServices, NULL, NULL, FLAG_DOS_STRING},
diff --git a/packaging/Debian/debian/patches/loadparm.patch b/packaging/Debian/debian/patches/loadparm.patch
index d8b7ab00c2f..3741f8c1e06 100644
--- a/packaging/Debian/debian/patches/loadparm.patch
+++ b/packaging/Debian/debian/patches/loadparm.patch
@@ -1,6 +1,6 @@
 --- samba-2.2.5/source/param/loadparm.c.orig	Tue Jun 18 23:15:07 2002
 +++ samba-2.2.5/source/param/loadparm.c	Tue Jun 18 23:15:07 2002
-@@ -1149,26 +1149,26 @@
+@@ -1146,26 +1146,26 @@
  		case PRINT_AIX:
  		case PRINT_LPRNT:
  		case PRINT_LPROS2:
@@ -37,7 +37,7 @@
  			break;
  
  		case PRINT_CUPS:
-@@ -1184,19 +1184,19 @@
+@@ -1181,19 +1181,19 @@
  			string_set(&Globals.szPrintcapname, "cups");
  #else
  			string_set(&sDefault.szLpqcommand,
@@ -64,7 +64,7 @@
  			string_set(&Globals.szPrintcapname, "lpstat");
  #endif /* HAVE_CUPS */
  			break;
-@@ -1515,7 +1515,10 @@
+@@ -1513,7 +1513,10 @@
  	else
  		StrnCpy(ret, s, len);
  
diff --git a/packaging/Debian/debian/patches/smbmount-nomtab.patch b/packaging/Debian/debian/patches/smbmount-nomtab.patch
index 1cc45b68187..e85ceaed32a 100644
--- a/packaging/Debian/debian/patches/smbmount-nomtab.patch
+++ b/packaging/Debian/debian/patches/smbmount-nomtab.patch
@@ -35,7 +35,7 @@
                  case 'r':
                          mount_ro = 1;
                          break;
-@@ -271,36 +276,38 @@
+@@ -274,36 +279,38 @@
  		return -1;
  	}