SALOME 6.5.0 preparation: fix problem with wrong check of pre-requisites dependencies...

diff --git a/config_CentOS_5.5_64bit.xml b/config_CentOS_5.5_64bit.xml
index 82adb01c0a29b366d27caa07f55d10671035b927..bfa13c1aa7f329737e2ed09472f54f7c7172403a 100755 (executable)
--- a/config_CentOS_5.5_64bit.xml
+++ b/config_CentOS_5.5_64bit.xml
@@ -1087,6 +1087,15 @@
     <product name="Python">
       <dep>tcltk</dep>
     </product>
+    <product name="Sip">
+      <dep>Python</dep>
+      <dep>Qt</dep>
+    </product>
+    <product name="PyQt">
+      <dep>Python</dep>
+      <dep>Qt</dep>
+      <dep>Sip</dep>
+    </product>
     <product name="QScintilla">
       <dep>Qt</dep>
       <dep>Python</dep>
@@ -1097,15 +1106,6 @@
       <dep>Python</dep>
       <dep>docutils</dep>
     </product>
-    <product name="Sip">
-      <dep>Python</dep>
-      <dep>Qt</dep>
-    </product>
-    <product name="PyQt">
-      <dep>Python</dep>
-      <dep>Qt</dep>
-      <dep>Sip</dep>
-    </product>
     <product name="boost">
       <dep>Python</dep>
     </product>

diff --git a/config_Debian_4.0.xml b/config_Debian_4.0.xml
index dac75ff546744aa8abaa8562cbbcb6371ee07e2a..b60bbb3ebca41042493be53dd489f1ddde9fdecb 100755 (executable)
--- a/config_Debian_4.0.xml
+++ b/config_Debian_4.0.xml
@@ -1087,6 +1087,15 @@
     <product name="Python">
       <dep>tcltk</dep>
     </product>
+    <product name="Sip">
+      <dep>Python</dep>
+      <dep>Qt</dep>
+    </product>
+    <product name="PyQt">
+      <dep>Python</dep>
+      <dep>Qt</dep>
+      <dep>Sip</dep>
+    </product>
     <product name="QScintilla">
       <dep>Qt</dep>
       <dep>Python</dep>
@@ -1097,15 +1106,6 @@
       <dep>Python</dep>
       <dep>docutils</dep>
     </product>
-    <product name="Sip">
-      <dep>Python</dep>
-      <dep>Qt</dep>
-    </product>
-    <product name="PyQt">
-      <dep>Python</dep>
-      <dep>Qt</dep>
-      <dep>Sip</dep>
-    </product>
     <product name="boost">
       <dep>Python</dep>
     </product>

diff --git a/config_Debian_4.0_64bit.xml b/config_Debian_4.0_64bit.xml
index e30b20f5f1c1dc6f818e84ea9fa73d727afc828f..cc0a8306b0db1fac82695d71ee3f4b64dda93b4e 100755 (executable)
--- a/config_Debian_4.0_64bit.xml
+++ b/config_Debian_4.0_64bit.xml
@@ -1087,6 +1087,15 @@
     <product name="Python"> 
       <dep>tcltk</dep>
     </product>
+    <product name="Sip">
+      <dep>Python</dep>
+      <dep>Qt</dep>
+    </product>
+    <product name="PyQt">
+      <dep>Python</dep>
+      <dep>Qt</dep>
+      <dep>Sip</dep>
+    </product>
     <product name="QScintilla">
       <dep>Qt</dep>
       <dep>Python</dep>
@@ -1097,15 +1106,6 @@
       <dep>Python</dep>
       <dep>docutils</dep>
     </product>
-    <product name="Sip">
-      <dep>Python</dep>
-      <dep>Qt</dep>
-    </product>
-    <product name="PyQt">
-      <dep>Python</dep>
-      <dep>Qt</dep>
-      <dep>Sip</dep>
-    </product>
     <product name="boost">
       <dep>Python</dep>
     </product>

diff --git a/config_Debian_5.0_64bit.xml b/config_Debian_5.0_64bit.xml
index 8c08bd9ea808c998b577103eeb60782d61fac953..3d75213044bc3ebe57bb085c69d8dbf50fa1c9fe 100755 (executable)
--- a/config_Debian_5.0_64bit.xml
+++ b/config_Debian_5.0_64bit.xml
@@ -1087,6 +1087,15 @@
     <product name="Python">
       <dep>tcltk</dep>
     </product>
+    <product name="Sip">
+      <dep>Python</dep>
+      <dep>Qt</dep>
+    </product>
+    <product name="PyQt">
+      <dep>Python</dep>
+      <dep>Qt</dep>
+      <dep>Sip</dep>
+    </product>
     <product name="QScintilla">
       <dep>Qt</dep>
       <dep>Python</dep>
@@ -1097,15 +1106,6 @@
       <dep>Python</dep>
       <dep>docutils</dep>
     </product>
-    <product name="Sip">
-      <dep>Python</dep>
-      <dep>Qt</dep>
-    </product>
-    <product name="PyQt">
-      <dep>Python</dep>
-      <dep>Qt</dep>
-      <dep>Sip</dep>
-    </product>
     <product name="boost">
       <dep>Python</dep>
     </product>

diff --git a/config_Debian_6.0_64bit.xml b/config_Debian_6.0_64bit.xml
index e1607327e12b222c76916d8d29b99bb469d0e431..918e0dad9450b5b071c1b6f02e8027abfa62019b 100755 (executable)
--- a/config_Debian_6.0_64bit.xml
+++ b/config_Debian_6.0_64bit.xml
@@ -1087,6 +1087,15 @@
     <product name="Python">
       <dep>tcltk</dep>
     </product>
+    <product name="Sip">
+      <dep>Python</dep>
+      <dep>Qt</dep>
+    </product>
+    <product name="PyQt">
+      <dep>Python</dep>
+      <dep>Qt</dep>
+      <dep>Sip</dep>
+    </product>
     <product name="QScintilla">
       <dep>Qt</dep>
       <dep>Python</dep>
@@ -1097,15 +1106,6 @@
       <dep>Python</dep>
       <dep>docutils</dep>
     </product>
-    <product name="Sip">
-      <dep>Python</dep>
-      <dep>Qt</dep>
-    </product>
-    <product name="PyQt">
-      <dep>Python</dep>
-      <dep>Qt</dep>
-      <dep>Sip</dep>
-    </product>
     <product name="boost">
       <dep>Python</dep>
     </product>

diff --git a/config_Mandriva_2008.0.xml b/config_Mandriva_2008.0.xml
index 5bea86b3b6d8c2512def4ee71e26d1aa5b6ac9d3..7c03d7e561bf2d7c6ec51e93164798771a6007b2 100755 (executable)
--- a/config_Mandriva_2008.0.xml
+++ b/config_Mandriva_2008.0.xml
@@ -1087,6 +1087,15 @@
     <product name="Python">
       <dep>tcltk</dep>
     </product>
+    <product name="Sip">
+      <dep>Python</dep>
+      <dep>Qt</dep>
+    </product>
+    <product name="PyQt">
+      <dep>Python</dep>
+      <dep>Qt</dep>
+      <dep>Sip</dep>
+    </product>
     <product name="QScintilla">
       <dep>Qt</dep>
       <dep>Python</dep>
@@ -1097,15 +1106,6 @@
       <dep>Python</dep>
       <dep>docutils</dep>
     </product>
-    <product name="Sip">
-      <dep>Python</dep>
-      <dep>Qt</dep>
-    </product>
-    <product name="PyQt">
-      <dep>Python</dep>
-      <dep>Qt</dep>
-      <dep>Sip</dep>
-    </product>
     <product name="boost">
       <dep>Python</dep>
     </product>

diff --git a/config_Mandriva_2008.0_64bit.xml b/config_Mandriva_2008.0_64bit.xml
index d93a1722229977efb2cc5213fe18abf5090d8b6a..634f06c6881767c5d7676cef3499498c4acdec77 100755 (executable)
--- a/config_Mandriva_2008.0_64bit.xml
+++ b/config_Mandriva_2008.0_64bit.xml
@@ -1087,6 +1087,15 @@
     <product name="Python">
       <dep>tcltk</dep>
     </product>
+    <product name="Sip">
+      <dep>Python</dep>
+      <dep>Qt</dep>
+    </product>
+    <product name="PyQt">
+      <dep>Python</dep>
+      <dep>Qt</dep>
+      <dep>Sip</dep>
+    </product>
     <product name="QScintilla">
       <dep>Qt</dep>
       <dep>Python</dep>
@@ -1097,15 +1106,6 @@
       <dep>Python</dep>
       <dep>docutils</dep>
     </product>
-    <product name="Sip">
-      <dep>Python</dep>
-      <dep>Qt</dep>
-    </product>
-    <product name="PyQt">
-      <dep>Python</dep>
-      <dep>Qt</dep>
-      <dep>Sip</dep>
-    </product>
     <product name="boost">
       <dep>Python</dep>
     </product>

diff --git a/config_Mandriva_2010.0.xml b/config_Mandriva_2010.0.xml
index 138ecd253e49aea5e8b18a5aea77108f88520a7b..2756ee963f2673f4edb274812a5a409a903a32b5 100755 (executable)
--- a/config_Mandriva_2010.0.xml
+++ b/config_Mandriva_2010.0.xml
@@ -1073,6 +1073,15 @@
     <product name="Python">
       <dep>tcltk</dep>
     </product>
+    <product name="Sip">
+      <dep>Python</dep>
+      <dep>Qt</dep>
+    </product>
+    <product name="PyQt">
+      <dep>Python</dep>
+      <dep>Qt</dep>
+      <dep>Sip</dep>
+    </product>
     <product name="QScintilla">
       <dep>Qt</dep>
       <dep>Python</dep>
@@ -1083,15 +1092,6 @@
       <dep>Python</dep>
       <dep>docutils</dep>
     </product>
-    <product name="Sip">
-      <dep>Python</dep>
-      <dep>Qt</dep>
-    </product>
-    <product name="PyQt">
-      <dep>Python</dep>
-      <dep>Qt</dep>
-      <dep>Sip</dep>
-    </product>
     <product name="boost">
       <dep>Python</dep>
     </product>

diff --git a/config_Mandriva_2010.0_64bit.xml b/config_Mandriva_2010.0_64bit.xml
index 3df43a6ac73dd5f54ffa04b92a7727507ac24fd7..a3fe970bb4c2d7a6b180d6dcbb694db9857c602e 100755 (executable)
--- a/config_Mandriva_2010.0_64bit.xml
+++ b/config_Mandriva_2010.0_64bit.xml
@@ -1073,6 +1073,15 @@
     <product name="Python">
       <dep>tcltk</dep>
     </product>
+    <product name="Sip">
+      <dep>Python</dep>
+      <dep>Qt</dep>
+    </product>
+    <product name="PyQt">
+      <dep>Python</dep>
+      <dep>Qt</dep>
+      <dep>Sip</dep>
+    </product>
     <product name="QScintilla">
       <dep>Qt</dep>
       <dep>Python</dep>
@@ -1083,15 +1092,6 @@
       <dep>Python</dep>
       <dep>docutils</dep>
     </product>
-    <product name="Sip">
-      <dep>Python</dep>
-      <dep>Qt</dep>
-    </product>
-    <product name="PyQt">
-      <dep>Python</dep>
-      <dep>Qt</dep>
-      <dep>Sip</dep>
-    </product>
     <product name="boost">
       <dep>Python</dep>
     </product>

diff --git a/config_Red_Hat_Enterprise_WS_4_64bit.xml b/config_Red_Hat_Enterprise_WS_4_64bit.xml
index 7c9b2c6ecf11cdf30a833bae945214e4d9887a53..d68e4ce21ed062d925c6fe20181c3a445c07196d 100755 (executable)
--- a/config_Red_Hat_Enterprise_WS_4_64bit.xml
+++ b/config_Red_Hat_Enterprise_WS_4_64bit.xml
@@ -1087,6 +1087,15 @@
     <product name="Python">
       <dep>tcltk</dep>
     </product>
+    <product name="Sip">
+      <dep>Python</dep>
+      <dep>Qt</dep>
+    </product>
+    <product name="PyQt">
+      <dep>Python</dep>
+      <dep>Qt</dep>
+      <dep>Sip</dep>
+    </product>
     <product name="QScintilla">
       <dep>Qt</dep>
       <dep>Python</dep>
@@ -1097,15 +1106,6 @@
       <dep>Python</dep>
       <dep>docutils</dep>
     </product>
-    <product name="Sip">
-      <dep>Python</dep>
-      <dep>Qt</dep>
-    </product>
-    <product name="PyQt">
-      <dep>Python</dep>
-      <dep>Qt</dep>
-      <dep>Sip</dep>
-    </product>
     <product name="boost">
       <dep>Python</dep>
     </product>

diff --git a/config_Scientific_SL_5.1_64bit.xml b/config_Scientific_SL_5.1_64bit.xml
index 4e8f4da267e6810e385c583926877e85779980f6..735f92fde24e95057e3f4414a811d5f873150865 100755 (executable)
--- a/config_Scientific_SL_5.1_64bit.xml
+++ b/config_Scientific_SL_5.1_64bit.xml
@@ -1087,6 +1087,15 @@
     <product name="Python">
       <dep>tcltk</dep>
     </product>
+    <product name="Sip">
+      <dep>Python</dep>
+      <dep>Qt</dep>
+    </product>
+    <product name="PyQt">
+      <dep>Python</dep>
+      <dep>Qt</dep>
+      <dep>Sip</dep>
+    </product>
     <product name="QScintilla">
       <dep>Qt</dep>
       <dep>Python</dep>
@@ -1097,15 +1106,6 @@
       <dep>Python</dep>
       <dep>docutils</dep>
     </product>
-    <product name="Sip">
-      <dep>Python</dep>
-      <dep>Qt</dep>
-    </product>
-    <product name="PyQt">
-      <dep>Python</dep>
-      <dep>Qt</dep>
-      <dep>Sip</dep>
-    </product>
     <product name="boost">
       <dep>Python</dep>
     </product>