[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  183ea82... Merge commit 'origin/master' into abartlet-devel
       via  d58413d... On our way to Samba4 alpha10!
       via  ca2c645... Fix build of Samba4 from tarball generated by mkrelease.sh
       via  5c2db53... Improve upgrade instructions
       via  5203128... This is alpha9
      from  83c106e... s4-ldb: the '1' form of extended_dn search is easier to read

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 183ea8220a2832b2b12d92219f9bd040dbe82772
Merge: d58413d3314bc245c6be6499bea40cca0ab3d242 83c106e084876ee82c66a165a7b02c7702c752f4
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Dec 1 16:12:53 2009 +1100

    Merge commit 'origin/master' into abartlet-devel

commit d58413d3314bc245c6be6499bea40cca0ab3d242
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Dec 1 16:06:59 2009 +1100

    On our way to Samba4 alpha10!

-----------------------------------------------------------------------

Summary of changes:
 source4/VERSION             |    2 +-
 source4/script/mkrelease.sh |    3 ---
 upgrading-samba4.txt        |   20 ++++++--------------
 3 files changed, 7 insertions(+), 18 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/VERSION b/source4/VERSION
index 92a4f00..99fc68f 100644
--- a/source4/VERSION
+++ b/source4/VERSION
@@ -57,7 +57,7 @@ SAMBA_VERSION_TP_RELEASE=
 # e.g. SAMBA_VERSION_ALPHA_RELEASE=1                   #
 #  ->  "4.0.0alpha1"                                   #
 ########################################################
-SAMBA_VERSION_ALPHA_RELEASE=9
+SAMBA_VERSION_ALPHA_RELEASE=10
 
 ########################################################
 # For 'pre' releases the version will be               #
diff --git a/source4/script/mkrelease.sh b/source4/script/mkrelease.sh
index 69ddaa2..303dfe6 100755
--- a/source4/script/mkrelease.sh
+++ b/source4/script/mkrelease.sh
@@ -11,9 +11,6 @@ OUTDIR=`mktemp -d samba-XXXXX`
 
 echo SAMBA_VERSION_IS_GIT_SNAPSHOT=no >> $OUTDIR/source4/VERSION
 
-rm -f $OUTDIR/source4/ldap_server/devdocs/rfc????.txt \
-      $OUTDIR/source4/heimdal/lib/wind/rfc????.txt
-
 #Prepare the tarball for a Samba4 release, with some generated files,
 #but without Samba3 stuff (to avoid confusion)
 ( cd $OUTDIR/ || exit 1
diff --git a/upgrading-samba4.txt b/upgrading-samba4.txt
index b84bbab..85e4699 100644
--- a/upgrading-samba4.txt
+++ b/upgrading-samba4.txt
@@ -1,24 +1,16 @@
 Upgrading from an older samba4 installation.
 
-For users of samba4 alpha 8 and after
-=====================================
-
 * Stop any samba process
 * Backup your samba4 provision:
   go in the directory where your samba4 provision is stored (/usr/local/samba by default)
   do tar cf $HOME/backup.tar private (it's also recommended to save the etc/smb.conf and var/sysvol dir aswell)
 * Go in the source4 dir
-* run ./scripting/bin/upgradeprovision
+* run ./scripting/bin/upgradeprovision -s <path to smb.conf in samba4 install>
 * do make install
 
-For users of samba4 alpha 8 and after
-=====================================
-
-* Stop any samba/smbd process
-* Backup your samba4 provision:
-  go in the directory where your samba4 provision is stored (/usr/local/samba by default)
-  do tar cf $HOME/backup.tar private (it's also recommended to save the etc/smb.conf and var/sysvol dir aswell)
-* Go in the source4 dir
-* run ./scripting/bin/upgradeprovision --full
-* do make install
+This will do the minimum (safest) upgrade of the data.  
 
+Runing upgradeprovision with --full will do a more comprehensive
+upgrade of the data (including schema and display specifiers).  This
+attempts to do a new provision, and to then copy existing data into
+that database.


-- 
Samba Shared Repository