[SCM] Samba Shared Repository - branch v3-0-stable updated - release-3-0-33-105-g4843a9d

[Karolin Seeger]

The branch, v3-0-stable has been updated
       via  4843a9dff1d9692a0bf49eb8879d5f04a4b7556e (commit)
       via  89fe122ac67ab763b8ffc90fe67abb6c93badde0 (commit)
      from  3c33ea39119e8e045ec99d18098b3d22ca5c5ee6 (commit)

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


- Log -----------------------------------------------------------------
commit 4843a9dff1d9692a0bf49eb8879d5f04a4b7556e
Author: Karolin Seeger <kseeger at samba.org>
Date:   Mon Nov 17 15:23:34 2008 +0100

    s3 create-tarball.sh: Remove dashes in git commands.
    
    Newer git versions (e.g. 1.6.0.2) do not provide the 'git-' commands
    any longer.
    
    Karolin
    (cherry picked from commit 0cba859f12177aaf3ef2d96663f0a51f61c24d56)
    (cherry picked from commit 3d64e67de2b50f7b781aa3f5ad13ec8e866d4333)
    (cherry picked from commit aa41a80969bd413d5922c602c7309bd8c05f3181)
    (cherry picked from commit 0b4dd0cb1f81126344a6fe3304b46f880089718d)
    (cherry picked from commit 4d988d0c9f22dda706ee1802985830ce4999f4d5)
    (cherry picked from commit b0f66f65e4d7cf0d70708783e5486fe3e1e5e8e8)

commit 89fe122ac67ab763b8ffc90fe67abb6c93badde0
Author: Karolin Seeger <kseeger at samba.org>
Date:   Wed Nov 19 13:16:38 2008 +0100

    build-docs: Use 'git clean' instead of 'git-clean'.
    
    Karolin
    (cherry picked from commit 12e72140b944f844e7f44f21a087ab4a4ecc51a7)
    (cherry picked from commit ab02316ced8b0dc0d577960d1bab02d239313ef5)
    (cherry picked from commit d70bd3eebfa8a8705db2bdf9a3fd0e037701a756)

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

Summary of changes:
 release-scripts/build-docs     |    2 +-
 release-scripts/create-tarball |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/release-scripts/build-docs b/release-scripts/build-docs
index fa38d8d..c138149 100755
--- a/release-scripts/build-docs
+++ b/release-scripts/build-docs
@@ -4,7 +4,7 @@ DOCSRCDIR=`dirname $0`/../docs-xml
 
 cd $DOCSRCDIR || exit 1
 
-git-clean -d -x -f
+git clean -d -x -f
 autoconf && \
 	./configure --with-papersize=letter && \
 	make smbdotconf/parameters.all.xml && \
diff --git a/release-scripts/create-tarball b/release-scripts/create-tarball
index 3463f01..da39d89 100755
--- a/release-scripts/create-tarball
+++ b/release-scripts/create-tarball
@@ -137,7 +137,7 @@ function createReleaseTag
 	return 0
     fi
 
-    if [ "x`git-tag -l ${OPT_TAG}`" != "x" ]; then
+    if [ "x`git tag -l ${OPT_TAG}`" != "x" ]; then
 	echo -n "Tag exists.  Do you wish to overwrite? (y/N): "
 	read answer
 
@@ -155,7 +155,7 @@ function createReleaseTag
 	fi
     fi
 
-    git-tag -u ${OPT_KEYID} ${OPT_TAG}
+    git tag -u ${OPT_KEYID} ${OPT_TAG}
     exitOnError $? "Failed to create tag"
 
     return 0
@@ -170,7 +170,7 @@ function main
     
     cd $TOPDIR
 
-    git-checkout ${OPT_BRANCH}
+    git checkout ${OPT_BRANCH}
     exitOnError $? "Invalid branch name \"${OPT_BRANCH}\""
 
     (cd source && ./script/mkversion.sh)
@@ -188,7 +188,7 @@ function main
     echo "Creating release tarball for Samba $version"
 
     /bin/rm -rf ../samba-${version}
-    git-archive --format=tar --prefix=samba-${version}/ HEAD | (cd .. && tar xf -)
+    git archive --format=tar --prefix=samba-${version}/ HEAD | (cd .. && tar xf -)
     exitOnError $? "Failed to create release directory tree"
 
     pushd ../samba-${version}


-- 
Samba Shared Repository