relocate the xsd's so they don't clash, and point to the right places

diff --git a/data/menu.xml b/data/menu.xml
index 3f070737447c9fae2259645dbf0d655becbb591f..50cabea9e96411202d5084f2935072d13a020a6d 100644 (file)
--- a/data/menu.xml
+++ b/data/menu.xml
@@ -2,7 +2,7 @@
 
 <openbox_menu xmlns="http://openbox.org/"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://openbox.org/">
+        xsi:schemaLocation="http://openbox.org/4.0/menu">
 
 <menu id="games-menu" label="Games">
   <item label="Crack-Attack">

diff --git a/data/menu.xsd b/data/menu.xsd
index 0342687dc8a28714c4ac1f71d248eb576079dc93..ebf236b6fc257ecbd16d50cd02b4bb54929a1002 100644 (file)
--- a/data/menu.xsd
+++ b/data/menu.xsd
@@ -15,8 +15,8 @@
          fix some capitalization
 -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://openbox.org/"
-    xmlns:ob="http://openbox.org/"
+    targetNamespace="http://openbox.org/4.0/menu"
+    xmlns:ob="http://openbox.org/4.0/menu"
     elementFormDefault="qualified">
     <!--
          root node

diff --git a/data/rc.xml b/data/rc.xml
index 515acffaf173f9a45db6461d970a53545dbf4564..333ac0a0901f179f0a6eb4b4c5d0fa24dc3d3c7e 100644 (file)
--- a/data/rc.xml
+++ b/data/rc.xml
@@ -5,7 +5,7 @@
 
 <openbox_config xmlns="http://openbox.org/"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://openbox.org/">
+        xsi:schemaLocation="http://openbox.org/4.0/rc">
 
 <resistance>
   <strength>10</strength>

diff --git a/data/rc.xsd b/data/rc.xsd
index a4397258d442a12e17dac42e9f26259d8553e755..95c32134f5a051563ead2192922436c8c55eaf19 100644 (file)
--- a/data/rc.xsd
+++ b/data/rc.xsd
@@ -55,8 +55,8 @@
          Add the place attribute for fonts
 -->
 <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://openbox.org/"
-    xmlns:ob="http://openbox.org/"
+    targetNamespace="http://openbox.org/4.0/rc"
+    xmlns:ob="http://openbox.org/4.0/rc"
     elementFormDefault="qualified">
     <!--
          root node

diff --git a/data/themerc.xsd b/data/themerc.xsd
index ae93ad9036874cc6b95b6ed1436cffb161fc0dc9..209d52ac92fbc3e770d46af6b0ff756efaa77129 100755 (executable)
--- a/data/themerc.xsd
+++ b/data/themerc.xsd
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    targetNamespace="http://openbox.org/themerc"
-    xmlns:obt="http://openbox.org/themerc"
+    targetNamespace="http://openbox.org/4.0/themerc"
+    xmlns:obt="http://openbox.org/4.0/themerc"
     elementFormDefault="qualified"
     version="1.0">
 

diff --git a/themes/Artwiz-boxed/openbox-3/themerc.xml b/themes/Artwiz-boxed/openbox-3/themerc.xml
index 2431706caa3548ef9e91beafe4926c9fcd0615f0..16903c31b86fb1b3ee871272478ff94012ca0531 100644 (file)
--- a/themes/Artwiz-boxed/openbox-3/themerc.xml
+++ b/themes/Artwiz-boxed/openbox-3/themerc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<openbox_theme engine="box" version="1" xmlns="http://openbox.org/themerc">
+<openbox_theme engine="box" version="1" xmlns="http://openbox.org/4.0/themerc">
   <about>
     <author></author>
     <email></email>

diff --git a/themes/Bear2/openbox-3/themerc.xml b/themes/Bear2/openbox-3/themerc.xml
index bca1b0b5770d22b6348b3549b6f05d14f2000941..7357cd377764f3c60ec8ed9bb8c0c1abf92feb9e 100644 (file)
--- a/themes/Bear2/openbox-3/themerc.xml
+++ b/themes/Bear2/openbox-3/themerc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<openbox_theme engine="box" version="1" xmlns="http://openbox.org/themerc">
+<openbox_theme engine="box" version="1" xmlns="http://openbox.org/4.0/themerc">
   <about>
     <author></author>
     <email></email>

diff --git a/themes/Clearlooks-Olive/openbox-3/themerc.xml b/themes/Clearlooks-Olive/openbox-3/themerc.xml
index 8f8abbbfaf403c0b29abbbf799de6443d9b30ede..c2a1f5f445e271fee487b48ea8d23028b892936b 100644 (file)
--- a/themes/Clearlooks-Olive/openbox-3/themerc.xml
+++ b/themes/Clearlooks-Olive/openbox-3/themerc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<openbox_theme engine="box" version="1" xmlns="http://openbox.org/themerc">
+<openbox_theme engine="box" version="1" xmlns="http://openbox.org/4.0/themerc">
   <about>
     <author></author>
     <email></email>

diff --git a/themes/Clearlooks/openbox-3/themerc.xml b/themes/Clearlooks/openbox-3/themerc.xml
index 057d5623de72069d048fafe0485ad023fc797d72..adfe4159e987ebc6ced877dbbb83953a49604fd6 100644 (file)
--- a/themes/Clearlooks/openbox-3/themerc.xml
+++ b/themes/Clearlooks/openbox-3/themerc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<openbox_theme engine="box" version="1" xmlns="http://openbox.org/themerc">
+<openbox_theme engine="box" version="1" xmlns="http://openbox.org/4.0/themerc">
   <about>
     <author></author>
     <email></email>

diff --git a/themes/Mikachu/openbox-3/themerc.xml b/themes/Mikachu/openbox-3/themerc.xml
index dbb45611a7e0c550923594ebe2b4affd654f55e6..1b9d52f044d4e49f0df47de4c34b7498ce0497d5 100644 (file)
--- a/themes/Mikachu/openbox-3/themerc.xml
+++ b/themes/Mikachu/openbox-3/themerc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<openbox_theme engine="box" version="1" xmlns="http://openbox.org/themerc">
+<openbox_theme engine="box" version="1" xmlns="http://openbox.org/4.0/themerc">
   <about>
     <author></author>
     <email></email>

diff --git a/themes/Natura/openbox-3/themerc.xml b/themes/Natura/openbox-3/themerc.xml
index 6ba88e16a5b89bf946cf22d0ee56556966f27107..3a13bd100a1d627592e4f5ba4cb48d40d3a98b5d 100644 (file)
--- a/themes/Natura/openbox-3/themerc.xml
+++ b/themes/Natura/openbox-3/themerc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<openbox_theme engine="box" version="1" xmlns="http://openbox.org/themerc">
+<openbox_theme engine="box" version="1" xmlns="http://openbox.org/4.0/themerc">
   <about>
     <author></author>
     <email></email>

diff --git a/themes/Orang/openbox-3/themerc.xml b/themes/Orang/openbox-3/themerc.xml
index 85254827e6fc7fbc268f2f22848f9d462846959a..4e312f62f31d0d84143c29e402895d376228b0c2 100644 (file)
--- a/themes/Orang/openbox-3/themerc.xml
+++ b/themes/Orang/openbox-3/themerc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<openbox_theme engine="box" version="1" xmlns="http://openbox.org/themerc">
+<openbox_theme engine="box" version="1" xmlns="http://openbox.org/4.0/themerc">
   <about>
     <author></author>
     <email></email>

diff --git a/themes/Syscrash/openbox-3/themerc.xml b/themes/Syscrash/openbox-3/themerc.xml
index 3df8a08075ef0c8e30b84c27dd99737cc671b4b0..e5dc59b6631c58bfdeeb4eb71420841256caa28b 100644 (file)
--- a/themes/Syscrash/openbox-3/themerc.xml
+++ b/themes/Syscrash/openbox-3/themerc.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<openbox_theme engine="box" version="1" xmlns="http://openbox.org/themerc">
+<openbox_theme engine="box" version="1" xmlns="http://openbox.org/4.0/themerc">
   <about>
     <author></author>
     <email></email>

diff --git a/tools/themetoxml/themetoxml.c b/tools/themetoxml/themetoxml.c
index d5fee29f7fb7ae54e440ac692b76eace6d9794df..bdb331b8ae77474a66e55dcf72359e22e85c4c6d 100644 (file)
--- a/tools/themetoxml/themetoxml.c
+++ b/tools/themetoxml/themetoxml.c
@@ -325,7 +325,7 @@ int main(int argc, char **argv)
     xmlSetProp(root, (const xmlChar*)"engine", (const xmlChar*)"box");
     xmlSetProp(root, (const xmlChar*)"version", (const xmlChar*)"1");
     xmlSetProp(root, (const xmlChar*)"xmlns",
-               (const xmlChar*)"http://openbox.org/themerc");
+               (const xmlChar*)"http://openbox.org/4.0/themerc");
     CONT2("about", "author", "");
     CONT2("about", "email", "");
     CONT2("about", "webpage", "");