svn commit: samba r24202 - in branches/4.0-regwrite: . source/build/smb_build

jelmer at samba.org jelmer at samba.org
Sat Aug 4 18:06:35 GMT 2007


Author: jelmer
Date: 2007-08-04 18:06:33 +0000 (Sat, 04 Aug 2007)
New Revision: 24202

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=24202

Log:
merge upstream
Modified:
   branches/4.0-regwrite/
   branches/4.0-regwrite/source/build/smb_build/summary.pm


Changeset:

Property changes on: branches/4.0-regwrite
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: Sun 2007-03-04 19:47:55.924000025 +0100
committer: Jelmer Vernooij <jelmer at samba.org>
properties: 
	branch-nick: 4.0-regwrite
	rebase-of: jelmer at samba.org-20070304184755-bgf26jhs49nt7s2u

   + timestamp: Sun 2007-03-04 19:49:03.551000118 +0100
committer: Jelmer Vernooij <jelmer at samba.org>
properties: 
	branch-nick: 4.0-regwrite
	rebase-of: jelmer at samba.org-20070304184903-gwgc00z1gtbmb01b

Name: bzr:ancestry:v3-trunk0
   - wilco at baanhofman.nl-20070114042308-36zf3bavc39xsjh7-svn3-upgrade
svn-v3-trunk0:0c0555d6-39d7-0310-84fc-f1cc0bd64818:branches%2FSAMBA_4_0:20758
svn-v3-trunk0:0c0555d6-39d7-0310-84fc-f1cc0bd64818:branches%2FSAMBA_4_0:20807
wilco at baanhofman.nl-20070116142220-zhlab62f0scnatqs-svn3-upgrade
wilco at baanhofman.nl-20070116232428-8wzccza7dpir021k-svn3-upgrade
svn-v3-trunk0:0c0555d6-39d7-0310-84fc-f1cc0bd64818:branches%2FSAMBA_4_0:20997
wilco at baanhofman.nl-20070121201738-vhdvelotuuz9mu8e-svn3-upgrade
svn-v3-trunk0:0c0555d6-39d7-0310-84fc-f1cc0bd64818:branches%2FSAMBA_4_0:21260
svn-v3-trunk0:0c0555d6-39d7-0310-84fc-f1cc0bd64818:branches%2FSAMBA_4_0:21302
svn-v3-trunk0:0c0555d6-39d7-0310-84fc-f1cc0bd64818:branches%2FSAMBA_4_0:21487
svn-v3-trunk0:0c0555d6-39d7-0310-84fc-f1cc0bd64818:branches%2FSAMBA_4_0:21545
svn-v3-trunk0:0c0555d6-39d7-0310-84fc-f1cc0bd64818:branches%2FSAMBA_4_0:21682

   + wilco at baanhofman.nl-20070114042308-36zf3bavc39xsjh7-svn3-upgrade
svn-v3-trunk0:0c0555d6-39d7-0310-84fc-f1cc0bd64818:branches%2FSAMBA_4_0:20758
svn-v3-trunk0:0c0555d6-39d7-0310-84fc-f1cc0bd64818:branches%2FSAMBA_4_0:20807
wilco at baanhofman.nl-20070116142220-zhlab62f0scnatqs-svn3-upgrade
wilco at baanhofman.nl-20070116232428-8wzccza7dpir021k-svn3-upgrade
svn-v3-trunk0:0c0555d6-39d7-0310-84fc-f1cc0bd64818:branches%2FSAMBA_4_0:20997
wilco at baanhofman.nl-20070121201738-vhdvelotuuz9mu8e-svn3-upgrade
svn-v3-trunk0:0c0555d6-39d7-0310-84fc-f1cc0bd64818:branches%2FSAMBA_4_0:21260
svn-v3-trunk0:0c0555d6-39d7-0310-84fc-f1cc0bd64818:branches%2FSAMBA_4_0:21302
svn-v3-trunk0:0c0555d6-39d7-0310-84fc-f1cc0bd64818:branches%2FSAMBA_4_0:21487
svn-v3-trunk0:0c0555d6-39d7-0310-84fc-f1cc0bd64818:branches%2FSAMBA_4_0:21545
svn-v3-trunk0:0c0555d6-39d7-0310-84fc-f1cc0bd64818:branches%2FSAMBA_4_0:21682
svn-v3-trunk0:0c0555d6-39d7-0310-84fc-f1cc0bd64818:branches%2FSAMBA_4_0:21684

Name: bzr:revision-id:v3-trunk0
   - 11140 jelmer at samba.org-20070113195019-yrx40nap220myng0-svn3-upgrade
11142 jelmer at samba.org-20070113195431-nshumfy5z00cpnaj-svn3-upgrade
11143 jelmer at samba.org-20070113195555-am0swaxzsoxp05p0-svn3-upgrade
11144 wilco at baanhofman.nl-20070114042604-b7pwqobkrbmlbp8p-svn3-upgrade
11145 wilco at baanhofman.nl-20070114042644-fa3gbnlhall7nkry-svn3-upgrade
11146 wilco at baanhofman.nl-20070114042712-7ueqyvk12ki1frc5-svn3-upgrade
11147 wilco at baanhofman.nl-20070114042737-pwu8etpcs7lmwsms-svn3-upgrade
11148 wilco at baanhofman.nl-20070114043501-7g3vsn55rrr643z6-svn3-upgrade
11149 wilco at baanhofman.nl-20070114061526-fpg1tdt07virwgdk-svn3-upgrade
11150 wilco at baanhofman.nl-20070114133602-npguwp5mbuki5qlp-svn3-upgrade
11151 wilco at baanhofman.nl-20070114134318-79ylyc0gzh43xhqi-svn3-upgrade
11152 wilco at baanhofman.nl-20070114151541-6adzkudwihn30k9j-svn3-upgrade
11153 wilco at baanhofman.nl-20070114152236-z6iel538oen6t8g5-svn3-upgrade
11154 jelmer at samba.org-20070115165838-maz3nw52ijbba8rk-svn3-upgrade
11155 jelmer at samba.org-20070115170435-ert8ib689dhntd4p-svn3-upgrade
11156 jelmer at samba.org-20070115235410-krfav3ng4in38pkx-svn3-upgrade
11157 jelmer at samba.org-20070116222757-087aafuwkwfw4267-svn3-upgrade
11158 jelmer at samba.org-20070117013853-mfuqd1o46k44pk2d-svn3-upgrade
11159 jelmer at samba.org-20070117022606-q54g08ss30u86c5c-svn3-upgrade
11160 jelmer at samba.org-20070124130019-zt6jr00m7df9ur0m-svn3-upgrade
11161 jelmer at samba.org-20070124131946-1yxj4h6b092i8fwd-svn3-upgrade
11162 jelmer at samba.org-20070207151808-znhiwyn0cbnuah7z-svn3-upgrade
11163 jelmer at samba.org-20070208155904-yfb5n63xvx2w0kzz-svn3-upgrade
11164 jelmer at samba.org-20070208161920-v3bjwnhfqy4f6j6y-svn3-upgrade
11165 jelmer at samba.org-20070208171835-589fvhzi1hilvnan-svn3-upgrade
11166 jelmer at samba.org-20070210150222-mpmii8ak5w25btqc-svn3-upgrade
11167 jelmer at samba.org-20070210150533-khwd9jnhx7sqsbo6-svn3-upgrade
11168 jelmer at samba.org-20070212210015-vfey1bupuo237gtc-svn3-upgrade
11169 jelmer at samba.org-20070212210746-y5062ss2jjup80c0-svn3-upgrade
11170 jelmer at samba.org-20070212235354-htyicol9aj4sbk5l-svn3-upgrade
11171 jelmer at samba.org-20070221113700-q1sittkxd3a14jwk-svn3-upgrade
11172 jelmer at samba.org-20070227013556-0w8d95jjxfp1dstd-svn3-upgrade
11173 jelmer at samba.org-20070304145613-pufes2hspszib9qv-svn3-upgrade
11174 jelmer at samba.org-20070304184755-bgf26jhs49nt7s2u-svn3-upgrade

   + 11140 jelmer at samba.org-20070113195019-yrx40nap220myng0-svn3-upgrade
11142 jelmer at samba.org-20070113195431-nshumfy5z00cpnaj-svn3-upgrade
11143 jelmer at samba.org-20070113195555-am0swaxzsoxp05p0-svn3-upgrade
11144 wilco at baanhofman.nl-20070114042604-b7pwqobkrbmlbp8p-svn3-upgrade
11145 wilco at baanhofman.nl-20070114042644-fa3gbnlhall7nkry-svn3-upgrade
11146 wilco at baanhofman.nl-20070114042712-7ueqyvk12ki1frc5-svn3-upgrade
11147 wilco at baanhofman.nl-20070114042737-pwu8etpcs7lmwsms-svn3-upgrade
11148 wilco at baanhofman.nl-20070114043501-7g3vsn55rrr643z6-svn3-upgrade
11149 wilco at baanhofman.nl-20070114061526-fpg1tdt07virwgdk-svn3-upgrade
11150 wilco at baanhofman.nl-20070114133602-npguwp5mbuki5qlp-svn3-upgrade
11151 wilco at baanhofman.nl-20070114134318-79ylyc0gzh43xhqi-svn3-upgrade
11152 wilco at baanhofman.nl-20070114151541-6adzkudwihn30k9j-svn3-upgrade
11153 wilco at baanhofman.nl-20070114152236-z6iel538oen6t8g5-svn3-upgrade
11154 jelmer at samba.org-20070115165838-maz3nw52ijbba8rk-svn3-upgrade
11155 jelmer at samba.org-20070115170435-ert8ib689dhntd4p-svn3-upgrade
11156 jelmer at samba.org-20070115235410-krfav3ng4in38pkx-svn3-upgrade
11157 jelmer at samba.org-20070116222757-087aafuwkwfw4267-svn3-upgrade
11158 jelmer at samba.org-20070117013853-mfuqd1o46k44pk2d-svn3-upgrade
11159 jelmer at samba.org-20070117022606-q54g08ss30u86c5c-svn3-upgrade
11160 jelmer at samba.org-20070124130019-zt6jr00m7df9ur0m-svn3-upgrade
11161 jelmer at samba.org-20070124131946-1yxj4h6b092i8fwd-svn3-upgrade
11162 jelmer at samba.org-20070207151808-znhiwyn0cbnuah7z-svn3-upgrade
11163 jelmer at samba.org-20070208155904-yfb5n63xvx2w0kzz-svn3-upgrade
11164 jelmer at samba.org-20070208161920-v3bjwnhfqy4f6j6y-svn3-upgrade
11165 jelmer at samba.org-20070208171835-589fvhzi1hilvnan-svn3-upgrade
11166 jelmer at samba.org-20070210150222-mpmii8ak5w25btqc-svn3-upgrade
11167 jelmer at samba.org-20070210150533-khwd9jnhx7sqsbo6-svn3-upgrade
11168 jelmer at samba.org-20070212210015-vfey1bupuo237gtc-svn3-upgrade
11169 jelmer at samba.org-20070212210746-y5062ss2jjup80c0-svn3-upgrade
11170 jelmer at samba.org-20070212235354-htyicol9aj4sbk5l-svn3-upgrade
11171 jelmer at samba.org-20070221113700-q1sittkxd3a14jwk-svn3-upgrade
11172 jelmer at samba.org-20070227013556-0w8d95jjxfp1dstd-svn3-upgrade
11173 jelmer at samba.org-20070304145613-pufes2hspszib9qv-svn3-upgrade
11174 jelmer at samba.org-20070304184755-bgf26jhs49nt7s2u-svn3-upgrade
11175 jelmer at samba.org-20070304184903-gwgc00z1gtbmb01b-svn3-upgrade

Name: svk:merge
...skipped...

Modified: branches/4.0-regwrite/source/build/smb_build/summary.pm
===================================================================
--- branches/4.0-regwrite/source/build/smb_build/summary.pm	2007-08-04 18:06:28 UTC (rev 24201)
+++ branches/4.0-regwrite/source/build/smb_build/summary.pm	2007-08-04 18:06:33 UTC (rev 24202)
@@ -39,7 +39,6 @@
 	my ($output,$config) = @_;
 
 	print "Summary:\n\n";
-	showitem($output, "GTK+ frontends", ["gtk","gconf"]);
 	showitem($output, "SSL in SWAT and LDAP", ["GNUTLS"]);
 	showitem($output, "threads in smbd (see --with-pthread)", ["PTHREAD"]);
 	showitem($output, "intelligent command line editing", ["READLINE"]);



More information about the samba-cvs mailing list