[SCM] Samba Shared Repository - branch master updated

[Kai Blin]

The branch, master has been updated
       via  4eba4b0... s3-waf: Match the defines from the autotools build on PACKAGE_*
      from  93ac516... s3-auth: Added a function to get the server_info from the system user.

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


- Log -----------------------------------------------------------------
commit 4eba4b07c6645cf7748b827d7e37326383e91d7f
Author: Kai Blin <kai at samba.org>
Date:   Fri May 28 14:35:01 2010 +0200

    s3-waf: Match the defines from the autotools build on PACKAGE_*

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

Summary of changes:
 source3/wscript |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/wscript b/source3/wscript
index 7e39a60..73e00d1 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -53,12 +53,12 @@ def set_options(opt):
 def configure(conf):
     from samba_utils import TO_LIST
 
-    conf.DEFINE('PACKAGE_NAME', 'samba', quote=True)
-    conf.DEFINE('PACKAGE_STRING', 'Samba ' + version.STRING, quote=True)
+    conf.DEFINE('PACKAGE_NAME', 'Samba', quote=True)
+    conf.DEFINE('PACKAGE_STRING', 'Samba %s' % version.MAJOR, quote=True)
     conf.DEFINE('PACKAGE_TARNAME',  'samba', quote=True)
-    conf.DEFINE('PACKAGE_URL', "http://www.samba.org/", quote=True)
-    conf.DEFINE('PACKAGE_VERSION', version.STRING, quote=True)
-    conf.DEFINE('PACKAGE_BUGREPORT', 'http://bugzilla.samba.org/', quote=True)
+    conf.DEFINE('PACKAGE_URL', "", quote=True)
+    conf.DEFINE('PACKAGE_VERSION', "%s" % version.MAJOR, quote=True)
+    conf.DEFINE('PACKAGE_BUGREPORT', 'samba-technical at samba.org', quote=True)
 
     conf.DEFINE('CONFIG_H_IS_FROM_SAMBA', 1)
     conf.DEFINE('_SAMBA_BUILD_', version.MAJOR, add_to_cflags=True)


-- 
Samba Shared Repository