[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  a1849da upgradedns: Rename to less generic name samba_upgradedns.
      from  0cf7a36 on our way with Samba 4.0alpha19

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


- Log -----------------------------------------------------------------
commit a1849da7c2375c68f637fddc4c54835d9ece9378
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Fri Feb 24 13:31:47 2012 +0100

    upgradedns: Rename to less generic name samba_upgradedns.
    
    Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
    Autobuild-Date: Fri Feb 24 15:07:27 CET 2012 on sn-devel-104

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

Summary of changes:
 .../scripting/bin/{upgradedns => samba_upgradedns} |    0
 source4/scripting/bin/wscript_build                |    2 +-
 source4/scripting/wscript_build                    |    2 +-
 upgrading-samba4.txt                               |    2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename source4/scripting/bin/{upgradedns => samba_upgradedns} (100%)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/bin/upgradedns b/source4/scripting/bin/samba_upgradedns
similarity index 100%
rename from source4/scripting/bin/upgradedns
rename to source4/scripting/bin/samba_upgradedns
diff --git a/source4/scripting/bin/wscript_build b/source4/scripting/bin/wscript_build
index 65e9c58..71be328 100644
--- a/source4/scripting/bin/wscript_build
+++ b/source4/scripting/bin/wscript_build
@@ -5,4 +5,4 @@ bld.SAMBA_SCRIPT('samba_spnupdate', pattern='samba_spnupdate', installdir='.')
 bld.SAMBA_SCRIPT('samba_kcc', pattern='samba_kcc', installdir='.')
 bld.SAMBA_SCRIPT('upgradeprovision', pattern='upgradeprovision', installdir='.')
 bld.SAMBA_SCRIPT('samba-tool', pattern='samba-tool', installdir='.')
-bld.SAMBA_SCRIPT('upgradedns', pattern='upgradedns', installdir='.')
+bld.SAMBA_SCRIPT('samba_upgradedns', pattern='upgradedns', installdir='.')
diff --git a/source4/scripting/wscript_build b/source4/scripting/wscript_build
index e8d52d5..1cd0241 100644
--- a/source4/scripting/wscript_build
+++ b/source4/scripting/wscript_build
@@ -3,7 +3,7 @@
 from samba_utils import MODE_755
 
 bld.INSTALL_FILES('${SBINDIR}',
-                  'bin/upgradeprovision bin/samba_dnsupdate bin/samba_spnupdate bin/upgradedns',
+                  'bin/upgradeprovision bin/samba_dnsupdate bin/samba_spnupdate bin/samba_upgradedns',
                   chmod=MODE_755, python_fixup=True, flat=True)
 
 bld.INSTALL_FILES('${BINDIR}',
diff --git a/upgrading-samba4.txt b/upgrading-samba4.txt
index 4cd19d5..8c74f5a 100644
--- a/upgrading-samba4.txt
+++ b/upgrading-samba4.txt
@@ -24,5 +24,5 @@ or later, then it is better *NOT* to run upgradeprovision as the
 database format has not changed.
 
 To upgrade from BIND9 flat files to the internal database store for
-Bind 9 DLZ, use ./source4/scripting/bin/upgradedns
+Bind 9 DLZ, use ./source4/scripting/bin/samba_upgradedns
 


-- 
Samba Shared Repository