[SCM] Samba Shared Repository - branch v4-0-test updated

[Karolin Seeger]

The branch, v4-0-test has been updated
       via  d190b59 VERSION: Bump version up to 4.0.0rc3.
       via  cc9315a VERSION: Bump version number up to 4.0.0rc2.
       via  7eb1f6f librelease.sh: Move the GPG data to the library section.
       via  85289d8 WHATSNEW: Add kernel oplocks...
      from  fe880b5 WHATSNEW: Remove default values.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit d190b5965d21008b88d2a63c9265cb07b348efab
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Oct 2 09:55:44 2012 +0200

    VERSION: Bump version up to 4.0.0rc3.
    
    And enable GIT snapshots.
    
    Karolin

commit cc9315ac80d598f5325ba5d713bb1cb412c4a639
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Oct 2 09:54:10 2012 +0200

    VERSION: Bump version number up to 4.0.0rc2.
    
    Karolin

commit 7eb1f6ff178cb04a04dcaee88f15be850d239430
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Oct 2 10:29:16 2012 +0200

    librelease.sh: Move the GPG data to the library section.
    
    Don't use the Library key for the samba releases.
    
    Karolin
    
    Pair-Programmed-With: Stefan Metzmacher <metze at samba.org>

commit 85289d89b9b607c6c661cd49803a94b6c60918ed
Author: Karolin Seeger <kseeger at samba.org>
Date:   Tue Oct 2 10:52:21 2012 +0200

    WHATSNEW: Add kernel oplocks...
    
    to the list of changed defaults.
    
    Karolin

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

Summary of changes:
 VERSION              |    4 ++--
 WHATSNEW.txt         |    1 +
 script/librelease.sh |   34 ++++++++++++++++++++++++----------
 3 files changed, 27 insertions(+), 12 deletions(-)


Changeset truncated at 500 lines:

diff --git a/VERSION b/VERSION
index 642809e..75b8db5 100644
--- a/VERSION
+++ b/VERSION
@@ -87,7 +87,7 @@ SAMBA_VERSION_PRE_RELEASE=
 # e.g. SAMBA_VERSION_RC_RELEASE=1                      #
 #  ->  "3.0.0rc1"                                      #
 ########################################################
-SAMBA_VERSION_RC_RELEASE=1
+SAMBA_VERSION_RC_RELEASE=3
 
 ########################################################
 # To mark SVN snapshots this should be set to 'yes'    #
@@ -99,7 +99,7 @@ SAMBA_VERSION_RC_RELEASE=1
 # e.g. SAMBA_VERSION_IS_SVN_SNAPSHOT=yes               #
 #  ->  "3.0.0-SVN-build-199"                           #
 ########################################################
-SAMBA_VERSION_IS_GIT_SNAPSHOT=no
+SAMBA_VERSION_IS_GIT_SNAPSHOT=yes
 
 ########################################################
 # This is for specifying a release nickname            #
diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 02232c4..f214087 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -118,6 +118,7 @@ smb.conf changes
    dns forwarder			New
    dns update command			New
    homedir map				Changed default
+   kernel oplocks			Changed default
    kernel share modes			New
    kpasswd port				New
    krb5 port				New
diff --git a/script/librelease.sh b/script/librelease.sh
index ac82762..5119ca4 100755
--- a/script/librelease.sh
+++ b/script/librelease.sh
@@ -1,14 +1,6 @@
 #!/bin/bash
 # make a release of a Samba library
 
-[ -z "$GPG_USER" ] && {
-    GPG_USER='Samba Library Distribution Key <samba-bugs at samba.org>'
-}
-
-[ -z "$GPG_KEYID" ] && {
-    GPG_KEYID='13084025'
-}
-
 if [ ! -d ".git" ]; then
 	echo "Run this script from the top-level directory in the"
 	echo "repository"
@@ -67,6 +59,11 @@ release_lib() {
 	exit 1
     }
 
+    [ -z "$ftpdir" ] && {
+        popd
+        return 0
+    }
+
     echo "Push git tag $tagname"
     git push ssh://git.samba.org/data/git/samba.git refs/tags/$tagname:refs/tags/$tagname || {
 	exit 1
@@ -84,10 +81,27 @@ release_lib() {
 for lib in $*; do
     case $lib in
 	talloc | tdb | tevent | ldb)
+	    [ -z "$GPG_USER" ] && {
+	        GPG_USER='Samba Library Distribution Key <samba-bugs at samba.org>'
+	    }
+
+	    [ -z "$GPG_KEYID" ] && {
+	        GPG_KEYID='13084025'
+	    }
+
 	    release_lib $lib "lib/$lib" $lib
 	    ;;
-	samba4)
-	    release_lib $lib "." "samba/$lib"
+	samba)
+	    [ -z "$GPG_USER" ] && {
+	        GPG_USER='6568B7EA'
+	    }
+
+	    [ -z "$GPG_KEYID" ] && {
+	        GPG_KEYID='6568B7EA'
+	    }
+
+	    # for now we don't upload
+	    release_lib $lib "." ""
 	    ;;
 	*)
 	    echo "Unknown library $lib"


-- 
Samba Shared Repository