[SCM] Samba Shared Repository - branch master updated

Jelmer Vernooij jelmer at samba.org
Sat Apr 23 19:28:01 MDT 2011


The branch, master has been updated
       via  fb05e82 Fix license info for talloc in manpage.
       via  febc4a7 Fix release script to cope with moved Samba 4 build tools.
      from  0645c01 Fix case of libUTIL_LDB.

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


- Log -----------------------------------------------------------------
commit fb05e82c99f0779bd44371a2bdafdd7147448dd5
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Apr 24 02:39:14 2011 +0200

    Fix license info for talloc in manpage.
    
    Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
    Autobuild-Date: Sun Apr 24 03:27:54 CEST 2011 on sn-devel-104

commit febc4a730ad55b781b94fdc3a9f5ed6c5bc488ab
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sun Apr 24 02:14:17 2011 +0200

    Fix release script to cope with moved Samba 4 build tools.

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

Summary of changes:
 lib/talloc/talloc.3.xml     |    6 +++---
 source4/script/mkrelease.sh |    5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/talloc/talloc.3.xml b/lib/talloc/talloc.3.xml
index a327922..99e8bcd 100644
--- a/lib/talloc/talloc.3.xml
+++ b/lib/talloc/talloc.3.xml
@@ -783,9 +783,9 @@ if (ptr) memcpy(ptr, p, strlen(p)+1);</programlisting>
     </para>
     <para>
       This program is free software; you can redistribute it and/or modify
-      it under the terms of the GNU General Public License as published by
-      the Free Software Foundation; either version 3 of the License, or (at
-      your option) any later version.
+      it under the terms of the GNU Lesser General Public License as 
+      published by the Free Software Foundation; either version 3 of the
+      License, or (at your option) any later version.
     </para>
     <para>
       This program is distributed in the hope that it will be useful, but
diff --git a/source4/script/mkrelease.sh b/source4/script/mkrelease.sh
index 6ad927b..19a1ade 100755
--- a/source4/script/mkrelease.sh
+++ b/source4/script/mkrelease.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 if [ ! -d ".git" -o `dirname $0` != "./source4/script" ]; then
 	echo "Run this script from the top-level directory in the"
@@ -6,8 +6,7 @@ if [ ! -d ".git" -o `dirname $0` != "./source4/script" ]; then
 	exit 1
 fi
 
-cd source4
-../buildtools/bin/waf dist
+./buildtools/bin/waf dist
 TGZFILE="`echo *.tar.gz`"
 gunzip $TGZFILE
 TARFILE="`echo *.tar`"


-- 
Samba Shared Repository


More information about the samba-cvs mailing list