The branch, master has been updated
via 635b1adfc5c gpo: GPME doesn't permit nesting of admx categories in
builtin
via 1eb2f1cca4f gpo: Install the GNOME Settings admx templates
via 853a4ecd838 gp: Move GNOME admx templates
from f5d77cb627d s3:winbind: Avoid unnecessary locking in
wb_parent_idmap_setup_send()
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 635b1adfc5c8525634cfbc3f4d64fb9efa1c6f09
Author: David Mulder <dmul...@samba.org>
Date: Tue Oct 25 08:28:22 2022 -0600
gpo: GPME doesn't permit nesting of admx categories in builtin
The gnome settings were nested within a builtin
admx category, which GPME does not permit. This
was hiding the GNOME settings anytime windows
admx templates were present.
Signed-off-by: David Mulder <dmul...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
Autobuild-User(master): Jeremy Allison <j...@samba.org>
Autobuild-Date(master): Fri Nov 4 19:09:09 UTC 2022 on sn-devel-184
commit 1eb2f1cca4f2df0f0885bd9276427410c4241d7c
Author: David Mulder <dmul...@samba.org>
Date: Fri Oct 21 10:39:26 2022 -0600
gpo: Install the GNOME Settings admx templates
Signed-off-by: David Mulder <dmul...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
commit 853a4ecd838fcb441cbf654894a96ea728bc2efe
Author: David Mulder <dmul...@samba.org>
Date: Wed Nov 2 08:39:17 2022 -0600
gp: Move GNOME admx templates
waf fails to install the templates if there is a
space in the name.
Signed-off-by: David Mulder <dmul...@samba.org>
Reviewed-by: Jeremy Allison <j...@samba.org>
-----------------------------------------------------------------------
Summary of changes:
libgpo/admx/{GNOME Settings.admx => GNOME_Settings.admx} | 4 +---
libgpo/admx/en-US/{GNOME Settings.adml => GNOME_Settings.adml} | 0
libgpo/admx/ru-RU/{GNOME Settings.adml => GNOME_Settings.adml} | 0
libgpo/admx/wscript_build | 7 ++++++-
4 files changed, 7 insertions(+), 4 deletions(-)
rename libgpo/admx/{GNOME Settings.admx => GNOME_Settings.admx} (98%)
rename libgpo/admx/en-US/{GNOME Settings.adml => GNOME_Settings.adml} (100%)
rename libgpo/admx/ru-RU/{GNOME Settings.adml => GNOME_Settings.adml} (100%)
Changeset truncated at 500 lines:
diff --git a/libgpo/admx/GNOME Settings.admx b/libgpo/admx/GNOME_Settings.admx
similarity index 98%
rename from libgpo/admx/GNOME Settings.admx
rename to libgpo/admx/GNOME_Settings.admx
index 6e506b1377f..202960b2c34 100644
--- a/libgpo/admx/GNOME Settings.admx
+++ b/libgpo/admx/GNOME_Settings.admx
@@ -10,9 +10,7 @@
</definitions>
</supportedOn>
<categories>
- <category name="CAT_351B0FDF_55F3_4904_AC71_D3A6CF8DB323"
displayName="$(string.CAT_351B0FDF_55F3_4904_AC71_D3A6CF8DB323)">
- <parentCategory ref="windows:ControlPanel" />
- </category>
+ <category name="CAT_351B0FDF_55F3_4904_AC71_D3A6CF8DB323"
displayName="$(string.CAT_351B0FDF_55F3_4904_AC71_D3A6CF8DB323)" />
<category name="CAT_7E067B4B_2FE1_4AAD_8D76_54209466A491"
displayName="$(string.CAT_7E067B4B_2FE1_4AAD_8D76_54209466A491)">
<parentCategory ref="CAT_351B0FDF_55F3_4904_AC71_D3A6CF8DB323" />
</category>
diff --git a/libgpo/admx/en-US/GNOME Settings.adml
b/libgpo/admx/en-US/GNOME_Settings.adml
similarity index 100%
rename from libgpo/admx/en-US/GNOME Settings.adml
rename to libgpo/admx/en-US/GNOME_Settings.adml
diff --git a/libgpo/admx/ru-RU/GNOME Settings.adml
b/libgpo/admx/ru-RU/GNOME_Settings.adml
similarity index 100%
rename from libgpo/admx/ru-RU/GNOME Settings.adml
rename to libgpo/admx/ru-RU/GNOME_Settings.adml
diff --git a/libgpo/admx/wscript_build b/libgpo/admx/wscript_build
index cb1cadbf782..3d513363897 100644
--- a/libgpo/admx/wscript_build
+++ b/libgpo/admx/wscript_build
@@ -1,3 +1,8 @@
#!/usr/bin/env python
-bld.INSTALL_FILES('${DATADIR}/samba/admx', ['samba.admx', 'en-US/samba.adml'])
+bld.INSTALL_FILES('${DATADIR}/samba/admx', ['samba.admx',
+ 'en-US/samba.adml',
+ 'GNOME_Settings.admx',
+ 'en-US/GNOME_Settings.adml',
+ 'ru-RU/GNOME_Settings.adml'
+ ])
--
Samba Shared Repository
