[Pkg-samba-maint] r3126 - in branches/samba/experimental/debian: . patches
bubulle at alioth.debian.org
bubulle at alioth.debian.org
Sat Nov 28 17:44:55 UTC 2009
tags 555466 pending
thanks
Author: bubulle
Date: 2009-11-28 17:44:54 +0000 (Sat, 28 Nov 2009)
New Revision: 3126
Added:
branches/samba/experimental/debian/source/
Modified:
branches/samba/experimental/debian/changelog
branches/samba/experimental/debian/control
branches/samba/experimental/debian/patches/README_nosmbldap-tools.patch
branches/samba/experimental/debian/patches/VERSION.patch
branches/samba/experimental/debian/patches/adapt_machine_creation_script.patch
branches/samba/experimental/debian/patches/autoconf.patch
branches/samba/experimental/debian/patches/codepages-location.patch
branches/samba/experimental/debian/patches/documentation.patch
branches/samba/experimental/debian/patches/external-talloc-support.patch
branches/samba/experimental/debian/patches/fhs-filespaths.patch
branches/samba/experimental/debian/patches/fix-manpages-warnings.patch
branches/samba/experimental/debian/patches/installswat.sh.patch
branches/samba/experimental/debian/patches/no-unnecessary-cups.patch
branches/samba/experimental/debian/patches/pam-examples.patch
branches/samba/experimental/debian/patches/smbclient-pager.patch
branches/samba/experimental/debian/patches/smbtar-bashism.patch
branches/samba/experimental/debian/patches/undefined-symbols.patch
branches/samba/experimental/debian/patches/usershare.patch
branches/samba/experimental/debian/rules
Log:
Merge trunk
Modified: branches/samba/experimental/debian/changelog
===================================================================
--- branches/samba/experimental/debian/changelog 2009-11-28 11:06:16 UTC (rev 3125)
+++ branches/samba/experimental/debian/changelog 2009-11-28 17:44:54 UTC (rev 3126)
@@ -1,3 +1,13 @@
+samba (2:3.5.0~pre1-1) UNRELEASED-experimental; urgency=low
+
+ * New upstream pre-release
+ * Switch to source format 3.0 (quilt)
+ * Better adapt "add machine script" example to adduser
+ Thanks to Heiko Schlittermann for the suggestion
+ Closes: #555466
+
+ -- Christian Perrier <bubulle at debian.org> Sun, 08 Nov 2009 15:04:24 +0100
+
samba (2:3.4.3-1) unstable; urgency=low
* New upstream release. This fixes the following bugs:
Modified: branches/samba/experimental/debian/control
===================================================================
--- branches/samba/experimental/debian/control 2009-11-28 11:06:16 UTC (rev 3125)
+++ branches/samba/experimental/debian/control 2009-11-28 17:44:54 UTC (rev 3126)
@@ -6,7 +6,7 @@
Build-Depends: debhelper (>= 6.0.0), libpam0g-dev, libreadline-dev,
libcups2-dev | libcupsys2-dev,
libacl1-dev [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
- libkrb5-dev, libldap2-dev, po-debconf, libpopt-dev, quilt, uuid-dev,
+ libkrb5-dev, libldap2-dev, po-debconf, libpopt-dev, uuid-dev,
libtalloc-dev (>= 1.2.0~git20080616),
libcap2-dev [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
libkeyutils-dev [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
Modified: branches/samba/experimental/debian/patches/README_nosmbldap-tools.patch
===================================================================
--- branches/samba/experimental/debian/patches/README_nosmbldap-tools.patch 2009-11-28 11:06:16 UTC (rev 3125)
+++ branches/samba/experimental/debian/patches/README_nosmbldap-tools.patch 2009-11-28 17:44:54 UTC (rev 3126)
@@ -3,10 +3,10 @@
Bug-Debian: http://bugs.debian.org/341934
Forwarded: not-needed
-Index: samba-3.3.0rc2/examples/LDAP/README
+Index: b/examples/LDAP/README
===================================================================
---- samba-3.3.0rc2.orig/examples/LDAP/README
-+++ samba-3.3.0rc2/examples/LDAP/README
+--- a/examples/LDAP/README 2009-11-08 15:54:27.000000000 +0100
++++ b/examples/LDAP/README 2009-11-08 15:55:34.000000000 +0100
@@ -69,6 +69,9 @@
The smbldap-tools package can be downloaded individually from
https://gna.org/projects/smbldap-tools/
Modified: branches/samba/experimental/debian/patches/VERSION.patch
===================================================================
--- branches/samba/experimental/debian/patches/VERSION.patch 2009-11-28 11:06:16 UTC (rev 3125)
+++ branches/samba/experimental/debian/patches/VERSION.patch 2009-11-28 17:44:54 UTC (rev 3126)
@@ -2,10 +2,10 @@
Author: Eloy A. Paris <peloy at debian.org>
Forwarded: not-needed
-Index: samba-3.3.0rc2/source3/VERSION
+Index: b/source3/VERSION
===================================================================
---- samba-3.3.0rc2.orig/source3/VERSION
-+++ samba-3.3.0rc2/source3/VERSION
+--- a/source3/VERSION 2009-11-08 15:54:27.000000000 +0100
++++ b/source3/VERSION 2009-11-08 15:55:35.000000000 +0100
@@ -84,7 +84,7 @@
# SAMBA_VERSION_VENDOR_FUNCTION #
# #
Modified: branches/samba/experimental/debian/patches/adapt_machine_creation_script.patch
===================================================================
--- branches/samba/experimental/debian/patches/adapt_machine_creation_script.patch 2009-11-28 11:06:16 UTC (rev 3125)
+++ branches/samba/experimental/debian/patches/adapt_machine_creation_script.patch 2009-11-28 17:44:54 UTC (rev 3126)
@@ -3,18 +3,18 @@
Bug-Debian: http://bugs.debian.org/346234
Forwarded: not-needed
-Index: samba-3.3.0/docs/manpages/smb.conf.5
+Index: b/docs/manpages/smb.conf.5
===================================================================
---- samba-3.3.0.orig/docs/manpages/smb.conf.5
-+++ samba-3.3.0/docs/manpages/smb.conf.5
-@@ -1141,8 +1141,8 @@
+--- a/docs/manpages/smb.conf.5 2009-11-08 15:54:27.000000000 +0100
++++ b/docs/manpages/smb.conf.5 2009-11-08 15:55:35.000000000 +0100
+@@ -1153,8 +1153,8 @@
Default:
\fI\fIadd machine script\fR\fR\fI = \fR\fI\FC\F[]\fR\fI \fR
.sp
-Example:
-\fI\fIadd machine script\fR\fR\fI = \fR\fI\FC/usr/sbin/adduser \-n \-g machines \-c Machine \-d /var/lib/nobody \-s /bin/false %u\F[]\fR\fI \fR
+Example for Debian:
-+\fI\fIadd machine script\fR\fR\fI = \fR\fI\FC/usr/sbin/adduser \-n \-g machines \-c Machine \-d /var/lib/samba \-s /bin/false %u\F[]\fR\fI \fR
++\fI\fIadd machine script\fR\fR\fI = \fR\fI\FC/usr/sbin/adduser \-\-disabled-password \-\-ingroup machines \-\-gecos Machine \-\-home /var/lib/samba \-\-shell /bin/false %u\F[]\fR\fI \fR
.RE
add port command (G)
Modified: branches/samba/experimental/debian/patches/autoconf.patch
===================================================================
--- branches/samba/experimental/debian/patches/autoconf.patch 2009-11-28 11:06:16 UTC (rev 3125)
+++ branches/samba/experimental/debian/patches/autoconf.patch 2009-11-28 17:44:54 UTC (rev 3126)
@@ -25,10 +25,10 @@
quilt refresh
find . -name '*.rej' | xargs rm
-Index: samba/source3/configure
+Index: b/source3/configure
===================================================================
---- samba.orig/source3/configure 2009-10-30 20:09:29.000000000 +0100
-+++ samba/source3/configure 2009-10-31 11:20:56.000000000 +0100
+--- a/source3/configure 2009-11-08 15:54:25.000000000 +0100
++++ b/source3/configure 2009-11-08 15:55:39.000000000 +0100
@@ -1,20 +1,22 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
Modified: branches/samba/experimental/debian/patches/codepages-location.patch
===================================================================
--- branches/samba/experimental/debian/patches/codepages-location.patch 2009-11-28 11:06:16 UTC (rev 3125)
+++ branches/samba/experimental/debian/patches/codepages-location.patch 2009-11-28 17:44:54 UTC (rev 3126)
@@ -4,10 +4,10 @@
Bug: https://bugzilla.samba.org/show_bug.cgi?id=6444
Forwarded: yes
-Index: samba-3.4.0pre1/source3/Makefile.in
+Index: b/source3/Makefile.in
===================================================================
---- samba-3.4.0pre1.orig/source3/Makefile.in
-+++ samba-3.4.0pre1/source3/Makefile.in
+--- a/source3/Makefile.in 2009-11-08 15:55:34.000000000 +0100
++++ b/source3/Makefile.in 2009-11-08 15:55:38.000000000 +0100
@@ -156,7 +156,7 @@
STATEDIR = @statedir@
Modified: branches/samba/experimental/debian/patches/documentation.patch
===================================================================
--- branches/samba/experimental/debian/patches/documentation.patch 2009-11-28 11:06:16 UTC (rev 3125)
+++ branches/samba/experimental/debian/patches/documentation.patch 2009-11-28 17:44:54 UTC (rev 3126)
@@ -2,10 +2,10 @@
Author: Christian Perrier <bubulle at debian.org>
Forwarded: not-needed
-Index: samba-3.3.0/docs/manpages/swat.8
+Index: b/docs/manpages/swat.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/swat.8
-+++ samba-3.3.0/docs/manpages/swat.8
+--- a/docs/manpages/swat.8 2009-11-08 15:54:28.000000000 +0100
++++ b/docs/manpages/swat.8 2009-11-08 15:55:33.000000000 +0100
@@ -261,85 +261,6 @@
.RS 4
Print a summary of command line options\&.
@@ -109,10 +109,10 @@
.RE
.SH "WARNINGS"
.PP
-Index: samba-3.3.0/docs/manpages/nmbd.8
+Index: b/docs/manpages/nmbd.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/nmbd.8
-+++ samba-3.3.0/docs/manpages/nmbd.8
+--- a/docs/manpages/nmbd.8 2009-11-08 15:54:28.000000000 +0100
++++ b/docs/manpages/nmbd.8 2009-11-08 15:55:33.000000000 +0100
@@ -265,10 +265,7 @@
to answer any name queries\&. Adding a line to this file affects name NetBIOS resolution from this host
\fIONLY\fR\&.
@@ -155,10 +155,10 @@
\FCnmbd\F[]
to dump out its server database in the
\FClog\&.nmb\F[]
-Index: samba-3.3.0/docs/manpages/smbd.8
+Index: b/docs/manpages/smbd.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/smbd.8
-+++ samba-3.3.0/docs/manpages/smbd.8
+--- a/docs/manpages/smbd.8 2009-11-08 15:54:28.000000000 +0100
++++ b/docs/manpages/smbd.8 2009-11-08 15:55:33.000000000 +0100
@@ -319,14 +319,11 @@
\FCinetd\F[], this file must contain a mapping of service name (e\&.g\&., netbios\-ssn) to service port (e\&.g\&., 139) and protocol type (e\&.g\&., tcp)\&.
.RE
@@ -176,10 +176,10 @@
.sp
This file describes all the services the server is to make available to clients\&. See
\fBsmb.conf\fR(5)
-Index: samba-3.3.0/docs/manpages/lmhosts.5
+Index: b/docs/manpages/lmhosts.5
===================================================================
---- samba-3.3.0.orig/docs/manpages/lmhosts.5
-+++ samba-3.3.0/docs/manpages/lmhosts.5
+--- a/docs/manpages/lmhosts.5 2009-11-08 15:54:28.000000000 +0100
++++ b/docs/manpages/lmhosts.5 2009-11-08 15:55:33.000000000 +0100
@@ -257,10 +257,8 @@
file\&.
.SH "FILES"
@@ -193,10 +193,10 @@
.SH "VERSION"
.PP
This man page is correct for version 3 of the Samba suite\&.
-Index: samba-3.3.0/docs/manpages/ntlm_auth.1
+Index: b/docs/manpages/ntlm_auth.1
===================================================================
---- samba-3.3.0.orig/docs/manpages/ntlm_auth.1
-+++ samba-3.3.0/docs/manpages/ntlm_auth.1
+--- a/docs/manpages/ntlm_auth.1 2009-11-08 15:54:28.000000000 +0100
++++ b/docs/manpages/ntlm_auth.1 2009-11-08 15:55:33.000000000 +0100
@@ -193,7 +193,7 @@
Some of these commands also require access to the directory
\FCwinbindd_privileged\F[]
@@ -224,10 +224,10 @@
.RE
.PP
gss\-spnego\-client
-Index: samba-3.3.0/docs/manpages/tdbbackup.8
+Index: b/docs/manpages/tdbbackup.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/tdbbackup.8
-+++ samba-3.3.0/docs/manpages/tdbbackup.8
+--- a/docs/manpages/tdbbackup.8 2009-11-08 15:54:28.000000000 +0100
++++ b/docs/manpages/tdbbackup.8 2009-11-08 15:55:33.000000000 +0100
@@ -227,7 +227,7 @@
.\}
@@ -255,10 +255,10 @@
.SH "VERSION"
.PP
This man page is correct for version 3 of the Samba suite\&.
-Index: samba-3.3.0/docs/manpages/winbindd.8
+Index: b/docs/manpages/winbindd.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/winbindd.8
-+++ samba-3.3.0/docs/manpages/winbindd.8
+--- a/docs/manpages/winbindd.8 2009-11-08 15:54:28.000000000 +0100
++++ b/docs/manpages/winbindd.8 2009-11-08 15:55:33.000000000 +0100
@@ -771,16 +771,16 @@
file are owned by root\&.
.RE
Modified: branches/samba/experimental/debian/patches/external-talloc-support.patch
===================================================================
--- branches/samba/experimental/debian/patches/external-talloc-support.patch 2009-11-28 11:06:16 UTC (rev 3125)
+++ branches/samba/experimental/debian/patches/external-talloc-support.patch 2009-11-28 17:44:54 UTC (rev 3126)
@@ -3,10 +3,10 @@
make error when libtalloc is not being built.
Author: Steve Langasek <vorlon at debian.org>
-Index: samba-deb.clean/source3/configure.in
+Index: b/source3/configure.in
===================================================================
---- samba-deb.clean.orig/source3/configure.in
-+++ samba-deb.clean/source3/configure.in
+--- a/source3/configure.in 2009-11-08 15:54:25.000000000 +0100
++++ b/source3/configure.in 2009-11-08 15:55:38.000000000 +0100
@@ -42,6 +42,8 @@
if test "x$enable_external_libtalloc" != xyes
then
Modified: branches/samba/experimental/debian/patches/fhs-filespaths.patch
===================================================================
--- branches/samba/experimental/debian/patches/fhs-filespaths.patch 2009-11-28 11:06:16 UTC (rev 3125)
+++ branches/samba/experimental/debian/patches/fhs-filespaths.patch 2009-11-28 17:44:54 UTC (rev 3126)
@@ -13,11 +13,11 @@
Forwarded: not-needed
-Index: samba-3.3.0rc2/source3/passdb/pdb_tdb.c
+Index: b/source3/passdb/pdb_tdb.c
===================================================================
---- samba-3.3.0rc2.orig/source3/passdb/pdb_tdb.c
-+++ samba-3.3.0rc2/source3/passdb/pdb_tdb.c
-@@ -1613,7 +1613,7 @@
+--- a/source3/passdb/pdb_tdb.c 2009-11-08 15:54:27.000000000 +0100
++++ b/source3/passdb/pdb_tdb.c 2009-11-08 15:55:33.000000000 +0100
+@@ -1252,7 +1252,7 @@
/* save the path for later */
if (!location) {
@@ -26,10 +26,10 @@
PASSDB_FILE_NAME) < 0) {
return NT_STATUS_NO_MEMORY;
}
-Index: samba-3.3.0rc2/source3/passdb/secrets.c
+Index: b/source3/passdb/secrets.c
===================================================================
---- samba-3.3.0rc2.orig/source3/passdb/secrets.c
-+++ samba-3.3.0rc2/source3/passdb/secrets.c
+--- a/source3/passdb/secrets.c 2009-11-08 15:54:27.000000000 +0100
++++ b/source3/passdb/secrets.c 2009-11-08 15:55:33.000000000 +0100
@@ -59,7 +59,7 @@
return True;
@@ -39,7 +39,7 @@
if (fname == NULL) {
return false;
}
-@@ -1113,7 +1113,7 @@
+@@ -1138,7 +1138,7 @@
TDB_DATA vers;
uint32 ver;
TDB_CONTEXT *tdb_sc = NULL;
Modified: branches/samba/experimental/debian/patches/fix-manpages-warnings.patch
===================================================================
--- branches/samba/experimental/debian/patches/fix-manpages-warnings.patch 2009-11-28 11:06:16 UTC (rev 3125)
+++ branches/samba/experimental/debian/patches/fix-manpages-warnings.patch 2009-11-28 17:44:54 UTC (rev 3126)
@@ -2,10 +2,10 @@
Lintian report non-existing macros in manpages.
Author: Christian Perrier <bubulle at debian.org>
-Index: samba-3.3.0/docs/manpages/cifs.upcall.8
+Index: b/docs/manpages/cifs.upcall.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/cifs.upcall.8
-+++ samba-3.3.0/docs/manpages/cifs.upcall.8
+--- a/docs/manpages/cifs.upcall.8 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/cifs.upcall.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -30,10 +30,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/eventlogadm.8
+Index: b/docs/manpages/eventlogadm.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/eventlogadm.8
-+++ samba-3.3.0/docs/manpages/eventlogadm.8
+--- a/docs/manpages/eventlogadm.8 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/eventlogadm.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -58,10 +58,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/findsmb.1
+Index: b/docs/manpages/findsmb.1
===================================================================
---- samba-3.3.0.orig/docs/manpages/findsmb.1
-+++ samba-3.3.0/docs/manpages/findsmb.1
+--- a/docs/manpages/findsmb.1 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/findsmb.1 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -86,10 +86,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/idmap_ad.8
+Index: b/docs/manpages/idmap_ad.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/idmap_ad.8
-+++ samba-3.3.0/docs/manpages/idmap_ad.8
+--- a/docs/manpages/idmap_ad.8 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/idmap_ad.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -114,10 +114,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/idmap_adex.8
+Index: b/docs/manpages/idmap_adex.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/idmap_adex.8
-+++ samba-3.3.0/docs/manpages/idmap_adex.8
+--- a/docs/manpages/idmap_adex.8 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/idmap_adex.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -142,10 +142,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/idmap_hash.8
+Index: b/docs/manpages/idmap_hash.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/idmap_hash.8
-+++ samba-3.3.0/docs/manpages/idmap_hash.8
+--- a/docs/manpages/idmap_hash.8 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/idmap_hash.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -170,10 +170,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/idmap_ldap.8
+Index: b/docs/manpages/idmap_ldap.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/idmap_ldap.8
-+++ samba-3.3.0/docs/manpages/idmap_ldap.8
+--- a/docs/manpages/idmap_ldap.8 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/idmap_ldap.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -198,10 +198,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/idmap_nss.8
+Index: b/docs/manpages/idmap_nss.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/idmap_nss.8
-+++ samba-3.3.0/docs/manpages/idmap_nss.8
+--- a/docs/manpages/idmap_nss.8 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/idmap_nss.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -226,10 +226,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/idmap_rid.8
+Index: b/docs/manpages/idmap_rid.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/idmap_rid.8
-+++ samba-3.3.0/docs/manpages/idmap_rid.8
+--- a/docs/manpages/idmap_rid.8 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/idmap_rid.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -254,10 +254,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/idmap_tdb.8
+Index: b/docs/manpages/idmap_tdb.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/idmap_tdb.8
-+++ samba-3.3.0/docs/manpages/idmap_tdb.8
+--- a/docs/manpages/idmap_tdb.8 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/idmap_tdb.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -282,10 +282,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/idmap_tdb2.8
+Index: b/docs/manpages/idmap_tdb2.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/idmap_tdb2.8
-+++ samba-3.3.0/docs/manpages/idmap_tdb2.8
+--- a/docs/manpages/idmap_tdb2.8 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/idmap_tdb2.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -310,10 +310,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/ldb.3
+Index: b/docs/manpages/ldb.3
===================================================================
---- samba-3.3.0.orig/docs/manpages/ldb.3
-+++ samba-3.3.0/docs/manpages/ldb.3
+--- a/docs/manpages/ldb.3 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/ldb.3 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -338,10 +338,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/ldbadd.1
+Index: b/docs/manpages/ldbadd.1
===================================================================
---- samba-3.3.0.orig/docs/manpages/ldbadd.1
-+++ samba-3.3.0/docs/manpages/ldbadd.1
+--- a/docs/manpages/ldbadd.1 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/ldbadd.1 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -366,10 +366,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/ldbdel.1
+Index: b/docs/manpages/ldbdel.1
===================================================================
---- samba-3.3.0.orig/docs/manpages/ldbdel.1
-+++ samba-3.3.0/docs/manpages/ldbdel.1
+--- a/docs/manpages/ldbdel.1 2009-11-08 15:54:27.000000000 +0100
++++ b/docs/manpages/ldbdel.1 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -394,10 +394,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/ldbedit.1
+Index: b/docs/manpages/ldbedit.1
===================================================================
---- samba-3.3.0.orig/docs/manpages/ldbedit.1
-+++ samba-3.3.0/docs/manpages/ldbedit.1
+--- a/docs/manpages/ldbedit.1 2009-11-08 15:54:27.000000000 +0100
++++ b/docs/manpages/ldbedit.1 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -422,10 +422,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/ldbmodify.1
+Index: b/docs/manpages/ldbmodify.1
===================================================================
---- samba-3.3.0.orig/docs/manpages/ldbmodify.1
-+++ samba-3.3.0/docs/manpages/ldbmodify.1
+--- a/docs/manpages/ldbmodify.1 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/ldbmodify.1 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -450,10 +450,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/ldbsearch.1
+Index: b/docs/manpages/ldbsearch.1
===================================================================
---- samba-3.3.0.orig/docs/manpages/ldbsearch.1
-+++ samba-3.3.0/docs/manpages/ldbsearch.1
+--- a/docs/manpages/ldbsearch.1 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/ldbsearch.1 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -478,10 +478,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/libsmbclient.7
+Index: b/docs/manpages/libsmbclient.7
===================================================================
---- samba-3.3.0.orig/docs/manpages/libsmbclient.7
-+++ samba-3.3.0/docs/manpages/libsmbclient.7
+--- a/docs/manpages/libsmbclient.7 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/libsmbclient.7 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -506,10 +506,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/lmhosts.5
+Index: b/docs/manpages/lmhosts.5
===================================================================
---- samba-3.3.0.orig/docs/manpages/lmhosts.5
-+++ samba-3.3.0/docs/manpages/lmhosts.5
+--- a/docs/manpages/lmhosts.5 2009-11-08 15:55:33.000000000 +0100
++++ b/docs/manpages/lmhosts.5 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -534,10 +534,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/log2pcap.1
+Index: b/docs/manpages/log2pcap.1
===================================================================
---- samba-3.3.0.orig/docs/manpages/log2pcap.1
-+++ samba-3.3.0/docs/manpages/log2pcap.1
+--- a/docs/manpages/log2pcap.1 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/log2pcap.1 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -562,10 +562,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/mount.cifs.8
+Index: b/docs/manpages/mount.cifs.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/mount.cifs.8
-+++ samba-3.3.0/docs/manpages/mount.cifs.8
+--- a/docs/manpages/mount.cifs.8 2009-11-08 15:54:27.000000000 +0100
++++ b/docs/manpages/mount.cifs.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -590,10 +590,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/net.8
+Index: b/docs/manpages/net.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/net.8
-+++ samba-3.3.0/docs/manpages/net.8
+--- a/docs/manpages/net.8 2009-11-08 15:55:35.000000000 +0100
++++ b/docs/manpages/net.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -618,10 +618,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/nmbd.8
+Index: b/docs/manpages/nmbd.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/nmbd.8
-+++ samba-3.3.0/docs/manpages/nmbd.8
+--- a/docs/manpages/nmbd.8 2009-11-08 15:55:33.000000000 +0100
++++ b/docs/manpages/nmbd.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -646,10 +646,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/nmblookup.1
+Index: b/docs/manpages/nmblookup.1
===================================================================
---- samba-3.3.0.orig/docs/manpages/nmblookup.1
-+++ samba-3.3.0/docs/manpages/nmblookup.1
+--- a/docs/manpages/nmblookup.1 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/nmblookup.1 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -674,10 +674,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/ntlm_auth.1
+Index: b/docs/manpages/ntlm_auth.1
===================================================================
---- samba-3.3.0.orig/docs/manpages/ntlm_auth.1
-+++ samba-3.3.0/docs/manpages/ntlm_auth.1
+--- a/docs/manpages/ntlm_auth.1 2009-11-08 15:55:33.000000000 +0100
++++ b/docs/manpages/ntlm_auth.1 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -702,10 +702,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/pam_winbind.8
+Index: b/docs/manpages/pam_winbind.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/pam_winbind.8
-+++ samba-3.3.0/docs/manpages/pam_winbind.8
+--- a/docs/manpages/pam_winbind.8 2009-11-08 15:54:27.000000000 +0100
++++ b/docs/manpages/pam_winbind.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -730,10 +730,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/pdbedit.8
+Index: b/docs/manpages/pdbedit.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/pdbedit.8
-+++ samba-3.3.0/docs/manpages/pdbedit.8
+--- a/docs/manpages/pdbedit.8 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/pdbedit.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -758,10 +758,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/profiles.1
+Index: b/docs/manpages/profiles.1
===================================================================
---- samba-3.3.0.orig/docs/manpages/profiles.1
-+++ samba-3.3.0/docs/manpages/profiles.1
+--- a/docs/manpages/profiles.1 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/profiles.1 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -786,10 +786,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/rpcclient.1
+Index: b/docs/manpages/rpcclient.1
===================================================================
---- samba-3.3.0.orig/docs/manpages/rpcclient.1
-+++ samba-3.3.0/docs/manpages/rpcclient.1
+--- a/docs/manpages/rpcclient.1 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/rpcclient.1 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -814,10 +814,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/samba.7
+Index: b/docs/manpages/samba.7
===================================================================
---- samba-3.3.0.orig/docs/manpages/samba.7
-+++ samba-3.3.0/docs/manpages/samba.7
+--- a/docs/manpages/samba.7 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/samba.7 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -842,10 +842,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/smb.conf.5
+Index: b/docs/manpages/smb.conf.5
===================================================================
---- samba-3.3.0.orig/docs/manpages/smb.conf.5
-+++ samba-3.3.0/docs/manpages/smb.conf.5
+--- a/docs/manpages/smb.conf.5 2009-11-08 15:55:35.000000000 +0100
++++ b/docs/manpages/smb.conf.5 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -870,10 +870,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/smbcacls.1
+Index: b/docs/manpages/smbcacls.1
===================================================================
---- samba-3.3.0.orig/docs/manpages/smbcacls.1
-+++ samba-3.3.0/docs/manpages/smbcacls.1
+--- a/docs/manpages/smbcacls.1 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/smbcacls.1 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -898,10 +898,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/smbclient.1
+Index: b/docs/manpages/smbclient.1
===================================================================
---- samba-3.3.0.orig/docs/manpages/smbclient.1
-+++ samba-3.3.0/docs/manpages/smbclient.1
+--- a/docs/manpages/smbclient.1 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/smbclient.1 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -926,10 +926,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/smbcontrol.1
+Index: b/docs/manpages/smbcontrol.1
===================================================================
---- samba-3.3.0.orig/docs/manpages/smbcontrol.1
-+++ samba-3.3.0/docs/manpages/smbcontrol.1
+--- a/docs/manpages/smbcontrol.1 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/smbcontrol.1 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -954,10 +954,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/smbcquotas.1
+Index: b/docs/manpages/smbcquotas.1
===================================================================
---- samba-3.3.0.orig/docs/manpages/smbcquotas.1
-+++ samba-3.3.0/docs/manpages/smbcquotas.1
+--- a/docs/manpages/smbcquotas.1 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/smbcquotas.1 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -982,10 +982,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/smbd.8
+Index: b/docs/manpages/smbd.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/smbd.8
-+++ samba-3.3.0/docs/manpages/smbd.8
+--- a/docs/manpages/smbd.8 2009-11-08 15:55:33.000000000 +0100
++++ b/docs/manpages/smbd.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1010,10 +1010,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/smbget.1
+Index: b/docs/manpages/smbget.1
===================================================================
---- samba-3.3.0.orig/docs/manpages/smbget.1
-+++ samba-3.3.0/docs/manpages/smbget.1
+--- a/docs/manpages/smbget.1 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/smbget.1 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1038,10 +1038,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/smbgetrc.5
+Index: b/docs/manpages/smbgetrc.5
===================================================================
---- samba-3.3.0.orig/docs/manpages/smbgetrc.5
-+++ samba-3.3.0/docs/manpages/smbgetrc.5
+--- a/docs/manpages/smbgetrc.5 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/smbgetrc.5 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1066,10 +1066,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/smbpasswd.5
+Index: b/docs/manpages/smbpasswd.5
===================================================================
---- samba-3.3.0.orig/docs/manpages/smbpasswd.5
-+++ samba-3.3.0/docs/manpages/smbpasswd.5
+--- a/docs/manpages/smbpasswd.5 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/smbpasswd.5 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1094,10 +1094,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/smbpasswd.8
+Index: b/docs/manpages/smbpasswd.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/smbpasswd.8
-+++ samba-3.3.0/docs/manpages/smbpasswd.8
+--- a/docs/manpages/smbpasswd.8 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/smbpasswd.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1122,10 +1122,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/smbspool.8
+Index: b/docs/manpages/smbspool.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/smbspool.8
-+++ samba-3.3.0/docs/manpages/smbspool.8
+--- a/docs/manpages/smbspool.8 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/smbspool.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1150,10 +1150,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/smbstatus.1
+Index: b/docs/manpages/smbstatus.1
===================================================================
---- samba-3.3.0.orig/docs/manpages/smbstatus.1
-+++ samba-3.3.0/docs/manpages/smbstatus.1
+--- a/docs/manpages/smbstatus.1 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/smbstatus.1 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1178,10 +1178,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/smbtar.1
+Index: b/docs/manpages/smbtar.1
===================================================================
---- samba-3.3.0.orig/docs/manpages/smbtar.1
-+++ samba-3.3.0/docs/manpages/smbtar.1
+--- a/docs/manpages/smbtar.1 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/smbtar.1 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1206,10 +1206,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/smbtree.1
+Index: b/docs/manpages/smbtree.1
===================================================================
---- samba-3.3.0.orig/docs/manpages/smbtree.1
-+++ samba-3.3.0/docs/manpages/smbtree.1
+--- a/docs/manpages/smbtree.1 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/smbtree.1 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1234,10 +1234,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/swat.8
+Index: b/docs/manpages/swat.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/swat.8
-+++ samba-3.3.0/docs/manpages/swat.8
+--- a/docs/manpages/swat.8 2009-11-08 15:55:33.000000000 +0100
++++ b/docs/manpages/swat.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1262,10 +1262,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/tdbbackup.8
+Index: b/docs/manpages/tdbbackup.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/tdbbackup.8
-+++ samba-3.3.0/docs/manpages/tdbbackup.8
+--- a/docs/manpages/tdbbackup.8 2009-11-08 15:55:33.000000000 +0100
++++ b/docs/manpages/tdbbackup.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1290,10 +1290,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/tdbdump.8
+Index: b/docs/manpages/tdbdump.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/tdbdump.8
-+++ samba-3.3.0/docs/manpages/tdbdump.8
+--- a/docs/manpages/tdbdump.8 2009-11-08 15:54:27.000000000 +0100
++++ b/docs/manpages/tdbdump.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1318,10 +1318,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/tdbtool.8
+Index: b/docs/manpages/tdbtool.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/tdbtool.8
-+++ samba-3.3.0/docs/manpages/tdbtool.8
+--- a/docs/manpages/tdbtool.8 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/tdbtool.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1346,10 +1346,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/testparm.1
+Index: b/docs/manpages/testparm.1
===================================================================
---- samba-3.3.0.orig/docs/manpages/testparm.1
-+++ samba-3.3.0/docs/manpages/testparm.1
+--- a/docs/manpages/testparm.1 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/testparm.1 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1374,10 +1374,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/umount.cifs.8
+Index: b/docs/manpages/umount.cifs.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/umount.cifs.8
-+++ samba-3.3.0/docs/manpages/umount.cifs.8
+--- a/docs/manpages/umount.cifs.8 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/umount.cifs.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1402,10 +1402,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/vfs_audit.8
+Index: b/docs/manpages/vfs_audit.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/vfs_audit.8
-+++ samba-3.3.0/docs/manpages/vfs_audit.8
+--- a/docs/manpages/vfs_audit.8 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/vfs_audit.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1430,10 +1430,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/vfs_cacheprime.8
+Index: b/docs/manpages/vfs_cacheprime.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/vfs_cacheprime.8
-+++ samba-3.3.0/docs/manpages/vfs_cacheprime.8
+--- a/docs/manpages/vfs_cacheprime.8 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/vfs_cacheprime.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1458,10 +1458,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/vfs_cap.8
+Index: b/docs/manpages/vfs_cap.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/vfs_cap.8
-+++ samba-3.3.0/docs/manpages/vfs_cap.8
+--- a/docs/manpages/vfs_cap.8 2009-11-08 15:54:27.000000000 +0100
++++ b/docs/manpages/vfs_cap.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1486,10 +1486,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/vfs_catia.8
+Index: b/docs/manpages/vfs_catia.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/vfs_catia.8
-+++ samba-3.3.0/docs/manpages/vfs_catia.8
+--- a/docs/manpages/vfs_catia.8 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/vfs_catia.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1514,10 +1514,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/vfs_commit.8
+Index: b/docs/manpages/vfs_commit.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/vfs_commit.8
-+++ samba-3.3.0/docs/manpages/vfs_commit.8
+--- a/docs/manpages/vfs_commit.8 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/vfs_commit.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1542,10 +1542,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/vfs_default_quota.8
+Index: b/docs/manpages/vfs_default_quota.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/vfs_default_quota.8
-+++ samba-3.3.0/docs/manpages/vfs_default_quota.8
+--- a/docs/manpages/vfs_default_quota.8 2009-11-08 15:54:27.000000000 +0100
++++ b/docs/manpages/vfs_default_quota.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1570,10 +1570,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/vfs_extd_audit.8
+Index: b/docs/manpages/vfs_extd_audit.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/vfs_extd_audit.8
-+++ samba-3.3.0/docs/manpages/vfs_extd_audit.8
+--- a/docs/manpages/vfs_extd_audit.8 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/vfs_extd_audit.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1598,10 +1598,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/vfs_fake_perms.8
+Index: b/docs/manpages/vfs_fake_perms.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/vfs_fake_perms.8
-+++ samba-3.3.0/docs/manpages/vfs_fake_perms.8
+--- a/docs/manpages/vfs_fake_perms.8 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/vfs_fake_perms.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1626,10 +1626,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/vfs_fileid.8
+Index: b/docs/manpages/vfs_fileid.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/vfs_fileid.8
-+++ samba-3.3.0/docs/manpages/vfs_fileid.8
+--- a/docs/manpages/vfs_fileid.8 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/vfs_fileid.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1654,10 +1654,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/vfs_full_audit.8
+Index: b/docs/manpages/vfs_full_audit.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/vfs_full_audit.8
-+++ samba-3.3.0/docs/manpages/vfs_full_audit.8
+--- a/docs/manpages/vfs_full_audit.8 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/vfs_full_audit.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1682,10 +1682,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/vfs_gpfs.8
+Index: b/docs/manpages/vfs_gpfs.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/vfs_gpfs.8
-+++ samba-3.3.0/docs/manpages/vfs_gpfs.8
+--- a/docs/manpages/vfs_gpfs.8 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/vfs_gpfs.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1710,10 +1710,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/vfs_netatalk.8
+Index: b/docs/manpages/vfs_netatalk.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/vfs_netatalk.8
-+++ samba-3.3.0/docs/manpages/vfs_netatalk.8
+--- a/docs/manpages/vfs_netatalk.8 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/vfs_netatalk.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1738,10 +1738,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/vfs_notify_fam.8
+Index: b/docs/manpages/vfs_notify_fam.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/vfs_notify_fam.8
-+++ samba-3.3.0/docs/manpages/vfs_notify_fam.8
+--- a/docs/manpages/vfs_notify_fam.8 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/vfs_notify_fam.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1766,10 +1766,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/vfs_prealloc.8
+Index: b/docs/manpages/vfs_prealloc.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/vfs_prealloc.8
-+++ samba-3.3.0/docs/manpages/vfs_prealloc.8
+--- a/docs/manpages/vfs_prealloc.8 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/vfs_prealloc.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1794,10 +1794,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/vfs_readahead.8
+Index: b/docs/manpages/vfs_readahead.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/vfs_readahead.8
-+++ samba-3.3.0/docs/manpages/vfs_readahead.8
+--- a/docs/manpages/vfs_readahead.8 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/vfs_readahead.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1822,10 +1822,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/vfs_readonly.8
+Index: b/docs/manpages/vfs_readonly.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/vfs_readonly.8
-+++ samba-3.3.0/docs/manpages/vfs_readonly.8
+--- a/docs/manpages/vfs_readonly.8 2009-11-08 15:54:27.000000000 +0100
++++ b/docs/manpages/vfs_readonly.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1850,10 +1850,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/vfs_recycle.8
+Index: b/docs/manpages/vfs_recycle.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/vfs_recycle.8
-+++ samba-3.3.0/docs/manpages/vfs_recycle.8
+--- a/docs/manpages/vfs_recycle.8 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/vfs_recycle.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1878,10 +1878,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/vfs_shadow_copy.8
+Index: b/docs/manpages/vfs_shadow_copy.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/vfs_shadow_copy.8
-+++ samba-3.3.0/docs/manpages/vfs_shadow_copy.8
+--- a/docs/manpages/vfs_shadow_copy.8 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/vfs_shadow_copy.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1906,10 +1906,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/vfs_shadow_copy2.8
+Index: b/docs/manpages/vfs_shadow_copy2.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/vfs_shadow_copy2.8
-+++ samba-3.3.0/docs/manpages/vfs_shadow_copy2.8
+--- a/docs/manpages/vfs_shadow_copy2.8 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/vfs_shadow_copy2.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1934,10 +1934,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/vfs_smb_traffic_analyzer.8
+Index: b/docs/manpages/vfs_smb_traffic_analyzer.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/vfs_smb_traffic_analyzer.8
-+++ samba-3.3.0/docs/manpages/vfs_smb_traffic_analyzer.8
+--- a/docs/manpages/vfs_smb_traffic_analyzer.8 2009-11-08 15:54:27.000000000 +0100
++++ b/docs/manpages/vfs_smb_traffic_analyzer.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1962,10 +1962,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/vfs_streams_depot.8
+Index: b/docs/manpages/vfs_streams_depot.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/vfs_streams_depot.8
-+++ samba-3.3.0/docs/manpages/vfs_streams_depot.8
+--- a/docs/manpages/vfs_streams_depot.8 2009-11-08 15:54:27.000000000 +0100
++++ b/docs/manpages/vfs_streams_depot.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1990,10 +1990,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/vfs_streams_xattr.8
+Index: b/docs/manpages/vfs_streams_xattr.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/vfs_streams_xattr.8
-+++ samba-3.3.0/docs/manpages/vfs_streams_xattr.8
+--- a/docs/manpages/vfs_streams_xattr.8 2009-11-08 15:54:27.000000000 +0100
++++ b/docs/manpages/vfs_streams_xattr.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -2018,10 +2018,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/vfs_xattr_tdb.8
+Index: b/docs/manpages/vfs_xattr_tdb.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/vfs_xattr_tdb.8
-+++ samba-3.3.0/docs/manpages/vfs_xattr_tdb.8
+--- a/docs/manpages/vfs_xattr_tdb.8 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/vfs_xattr_tdb.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -2046,10 +2046,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/vfstest.1
+Index: b/docs/manpages/vfstest.1
===================================================================
---- samba-3.3.0.orig/docs/manpages/vfstest.1
-+++ samba-3.3.0/docs/manpages/vfstest.1
+--- a/docs/manpages/vfstest.1 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/vfstest.1 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -2074,10 +2074,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/wbinfo.1
+Index: b/docs/manpages/wbinfo.1
===================================================================
---- samba-3.3.0.orig/docs/manpages/wbinfo.1
-+++ samba-3.3.0/docs/manpages/wbinfo.1
+--- a/docs/manpages/wbinfo.1 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/wbinfo.1 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -2102,10 +2102,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/winbind_krb5_locator.7
+Index: b/docs/manpages/winbind_krb5_locator.7
===================================================================
---- samba-3.3.0.orig/docs/manpages/winbind_krb5_locator.7
-+++ samba-3.3.0/docs/manpages/winbind_krb5_locator.7
+--- a/docs/manpages/winbind_krb5_locator.7 2009-11-08 15:54:26.000000000 +0100
++++ b/docs/manpages/winbind_krb5_locator.7 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -2130,10 +2130,10 @@
.ps +2
.ft B
.ne (2v + 1u)
-Index: samba-3.3.0/docs/manpages/winbindd.8
+Index: b/docs/manpages/winbindd.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/winbindd.8
-+++ samba-3.3.0/docs/manpages/winbindd.8
+--- a/docs/manpages/winbindd.8 2009-11-08 15:55:33.000000000 +0100
++++ b/docs/manpages/winbindd.8 2009-11-08 15:55:36.000000000 +0100
@@ -33,7 +33,6 @@
.\" SH - level-one heading that works better for non-TTY output
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Modified: branches/samba/experimental/debian/patches/installswat.sh.patch
===================================================================
--- branches/samba/experimental/debian/patches/installswat.sh.patch 2009-11-28 11:06:16 UTC (rev 3125)
+++ branches/samba/experimental/debian/patches/installswat.sh.patch 2009-11-28 17:44:54 UTC (rev 3126)
@@ -4,10 +4,10 @@
Author: Christian Perrier <bubulle at debian.org>
Forwarded: not-needed
-Index: samba-3.3.0rc2/source3/script/installswat.sh
+Index: b/source3/script/installswat.sh
===================================================================
---- samba-3.3.0rc2.orig/source3/script/installswat.sh
-+++ samba-3.3.0rc2/source3/script/installswat.sh
+--- a/source3/script/installswat.sh 2009-11-08 15:54:27.000000000 +0100
++++ b/source3/script/installswat.sh 2009-11-08 15:55:33.000000000 +0100
@@ -198,7 +198,11 @@
# Install/ remove Using Samba book (but only if it is there)
Modified: branches/samba/experimental/debian/patches/no-unnecessary-cups.patch
===================================================================
--- branches/samba/experimental/debian/patches/no-unnecessary-cups.patch 2009-11-28 11:06:16 UTC (rev 3125)
+++ branches/samba/experimental/debian/patches/no-unnecessary-cups.patch 2009-11-28 17:44:54 UTC (rev 3126)
@@ -6,11 +6,11 @@
Bug: https://bugzilla.samba.org/show_bug.cgi?id=5525
Forwarded: yes
-Index: samba-3.3.0rc2/source3/smbd/server.c
+Index: b/source3/smbd/server.c
===================================================================
---- samba-3.3.0rc2.orig/source3/smbd/server.c
-+++ samba-3.3.0rc2/source3/smbd/server.c
-@@ -806,6 +806,10 @@
+--- a/source3/smbd/server.c 2009-11-08 15:54:27.000000000 +0100
++++ b/source3/smbd/server.c 2009-11-08 15:55:36.000000000 +0100
+@@ -699,6 +699,10 @@
int pnum = lp_servicenumber(PRINTERS_NAME);
const char *pname;
Modified: branches/samba/experimental/debian/patches/pam-examples.patch
===================================================================
--- branches/samba/experimental/debian/patches/pam-examples.patch 2009-11-28 11:06:16 UTC (rev 3125)
+++ branches/samba/experimental/debian/patches/pam-examples.patch 2009-11-28 17:44:54 UTC (rev 3126)
@@ -2,10 +2,10 @@
Author: Christian Perrier <bubulle at debian.org>
Forwarded: not-needed
-Index: samba-3.3.0rc2/source3/pam_smbpass/README
+Index: b/source3/pam_smbpass/README
===================================================================
---- samba-3.3.0rc2.orig/source3/pam_smbpass/README
-+++ samba-3.3.0rc2/source3/pam_smbpass/README
+--- a/source3/pam_smbpass/README 2009-11-08 15:54:27.000000000 +0100
++++ b/source3/pam_smbpass/README 2009-11-08 15:55:34.000000000 +0100
@@ -37,7 +37,7 @@
smbconf=<file> - specify an alternate path to the smb.conf
file.
Modified: branches/samba/experimental/debian/patches/smbclient-pager.patch
===================================================================
--- branches/samba/experimental/debian/patches/smbclient-pager.patch 2009-11-28 11:06:16 UTC (rev 3125)
+++ branches/samba/experimental/debian/patches/smbclient-pager.patch 2009-11-28 17:44:54 UTC (rev 3126)
@@ -3,10 +3,10 @@
Bug-Debian: http://bugs.debian.org/135603
Forwarded: not-needed
-Index: samba-3.3.0rc2/source3/include/local.h
+Index: b/source3/include/local.h
===================================================================
---- samba-3.3.0rc2.orig/source3/include/local.h
-+++ samba-3.3.0rc2/source3/include/local.h
+--- a/source3/include/local.h 2009-11-08 15:54:27.000000000 +0100
++++ b/source3/include/local.h 2009-11-08 15:55:34.000000000 +0100
@@ -109,7 +109,7 @@
/* the default pager to use for the client "more" command. Users can
override this with the PAGER environment variable */
Modified: branches/samba/experimental/debian/patches/smbtar-bashism.patch
===================================================================
--- branches/samba/experimental/debian/patches/smbtar-bashism.patch 2009-11-28 11:06:16 UTC (rev 3125)
+++ branches/samba/experimental/debian/patches/smbtar-bashism.patch 2009-11-28 17:44:54 UTC (rev 3126)
@@ -3,10 +3,10 @@
Bug-Debian: http://bugs.debian.org/486056
Forwarded: no
-Index: samba-3.3.0rc2/source3/script/smbtar
+Index: b/source3/script/smbtar
===================================================================
---- samba-3.3.0rc2.orig/source3/script/smbtar
-+++ samba-3.3.0rc2/source3/script/smbtar
+--- a/source3/script/smbtar 2009-11-08 15:54:27.000000000 +0100
++++ b/source3/script/smbtar 2009-11-08 15:55:36.000000000 +0100
@@ -151,7 +151,7 @@
if [ -z "$verbose" ]; then
echo "server is $server"
Modified: branches/samba/experimental/debian/patches/undefined-symbols.patch
===================================================================
--- branches/samba/experimental/debian/patches/undefined-symbols.patch 2009-11-28 11:06:16 UTC (rev 3125)
+++ branches/samba/experimental/debian/patches/undefined-symbols.patch 2009-11-28 17:44:54 UTC (rev 3126)
@@ -9,16 +9,16 @@
Bug-Debian: http://bugs.debian.org/281181
Forwarded: no
-Index: samba-3.4.0~pre1/source3/Makefile.in
+Index: b/source3/Makefile.in
===================================================================
---- samba-3.4.0~pre1.orig/source3/Makefile.in 2009-05-09 20:36:33.735433063 +0200
-+++ samba-3.4.0~pre1/source3/Makefile.in 2009-05-16 09:46:02.135574618 +0200
-@@ -2122,7 +2122,7 @@
+--- a/source3/Makefile.in 2009-11-08 15:54:27.000000000 +0100
++++ b/source3/Makefile.in 2009-11-08 15:55:34.000000000 +0100
+@@ -2128,7 +2128,7 @@
$(LIBSMBCLIENT_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBSMBCLIENT_OBJ) $(LIBSMBCLIENT_SYMS) @LIBTALLOC_TARGET@ @LIBTDB_TARGET@ @LIBWBCLIENT_TARGET@
@echo Linking shared library $@
- @$(SHLD_DSO) $(LIBSMBCLIENT_OBJ) \
+ @$(SHLD_DSO) -Wl,-z,defs $(LIBSMBCLIENT_OBJ) \
$(LIBTALLOC_LIBS) $(LIBTDB_LIBS) $(LIBWBCLIENT_LIBS) $(LIBS) \
- $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) \
+ $(KRB5LIBS) $(LDAP_LIBS) $(NSCD_LIBS) $(ZLIB_LIBS) \
@SONAMEFLAG@`basename $@`
Modified: branches/samba/experimental/debian/patches/usershare.patch
===================================================================
--- branches/samba/experimental/debian/patches/usershare.patch 2009-11-28 11:06:16 UTC (rev 3125)
+++ branches/samba/experimental/debian/patches/usershare.patch 2009-11-28 17:44:54 UTC (rev 3126)
@@ -7,11 +7,11 @@
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/samba/+bug/128548
Forwarded: not-needed
-Index: samba-3.3.0/docs/manpages/net.8
+Index: b/docs/manpages/net.8
===================================================================
---- samba-3.3.0.orig/docs/manpages/net.8
-+++ samba-3.3.0/docs/manpages/net.8
-@@ -903,9 +903,9 @@
+--- a/docs/manpages/net.8 2009-11-08 15:54:27.000000000 +0100
++++ b/docs/manpages/net.8 2009-11-08 15:55:35.000000000 +0100
+@@ -917,9 +917,9 @@
Store a secret for the specified domain, used primarily for domains that use idmap_ldap as a backend\&. In this case the secret is used as the password for the user DN used to bind to the ldap server\&.
.SS "USERSHARE"
.PP
@@ -23,11 +23,11 @@
.PP
The usershare commands are:
.RS 4
-Index: samba-3.3.0/source3/param/loadparm.c
+Index: b/source3/param/loadparm.c
===================================================================
---- samba-3.3.0.orig/source3/param/loadparm.c
-+++ samba-3.3.0/source3/param/loadparm.c
-@@ -4906,7 +4906,7 @@
+--- a/source3/param/loadparm.c 2009-11-08 15:54:27.000000000 +0100
++++ b/source3/param/loadparm.c 2009-11-08 15:55:35.000000000 +0100
+@@ -5098,7 +5098,7 @@
string_set(&Globals.szUsersharePath, s);
SAFE_FREE(s);
string_set(&Globals.szUsershareTemplateShare, "");
Modified: branches/samba/experimental/debian/rules
===================================================================
--- branches/samba/experimental/debian/rules 2009-11-28 11:06:16 UTC (rev 3125)
+++ branches/samba/experimental/debian/rules 2009-11-28 17:44:54 UTC (rev 3126)
@@ -21,8 +21,6 @@
CFLAGS += -O2
endif
-include /usr/share/quilt/quilt.make
-
DESTDIR=`pwd`/debian/tmp
conf_args = \
@@ -86,8 +84,7 @@
conf_args += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
endif
-configure: patch configure-stamp
-configure-stamp:
+configure:
dh_testdir
if [ -f debian/config.cache ]; then \
@@ -108,9 +105,7 @@
touch build-stamp
-clean: clean-patched unpatch
-
-clean-patched:
+clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
@@ -275,4 +270,4 @@
-e "s/libcap2-dev\( ([^)]\+)\)* \[[^]]\+\]/libcap2-dev \1 [`type-handling any linux-gnu`]/g" \
debian/control
-.PHONY: build clean binary-indep binary-arch binary install configure patch unpatch update-archs
+.PHONY: build clean binary-indep binary-arch binary install configure update-archs
More information about the Pkg-samba-maint
mailing list