--- GUI_SRC_3.2.6/doc/salome/gui/Makefile.in.org	2007-04-24 18:41:04.000000000 +0200
+++ GUI_SRC_3.2.6/doc/salome/gui/Makefile.in	2007-09-27 00:58:52.000000000 +0200
@@ -28,7 +28,7 @@
 @COMMENCE@
 
 usr_docs:
-	cp -fr $(srcdir)/GUI ./
+#	cp -fr $(srcdir)/GUI ./
 	-find $(PWD) -name CVS -prune -exec rm -rf {} \;
 
 docs: usr_docs
--- GUI_SRC_3.2.6/adm_local/Makefile.in.org	2007-04-24 18:41:04.000000000 +0200
+++ GUI_SRC_3.2.6/adm_local/Makefile.in	2007-09-26 23:23:59.000000000 +0200
@@ -26,12 +26,12 @@
 all: resources
 
 install:
-	cp -rf @top_srcdir@/adm_local @prefix@
+#	cp -rf @top_srcdir@/adm_local @prefix@
 
 bin:
 
 resources :
-	cp -rf @top_srcdir@/adm_local $(top_builddir)
+#	cp -rf @top_srcdir@/adm_local $(top_builddir)
 
 inc:
 
--- GUI_SRC_3.2.6/build_configure.org	2007-04-24 18:41:04.000000000 +0200
+++ GUI_SRC_3.2.6/build_configure	2007-05-26 12:29:53.000000000 +0200
@@ -109,7 +109,7 @@
 
 # make a link allowing AC_OUTPUT to find the salome_adm/.../*.in  files
 echo "" >> configure.in_tmp1
-echo 'ln -fs ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1
+echo 'cp -prf ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1
 
 echo  "" >> configure.in_tmp1
 echo "AC_OUTPUT([ \\" >> configure.in_tmp1
--- GUI_SRC_3.2.6/adm_local/unix/config_files/check_vtk.m4.org	2007-04-24 18:41:04.000000000 +0200
+++ GUI_SRC_3.2.6/adm_local/unix/config_files/check_vtk.m4	2007-05-26 12:32:50.000000000 +0200
@@ -76,7 +76,7 @@
 if test -z $VTKHOME
 then 
    AC_MSG_WARN(undefined VTKHOME variable which specify where vtk was compiled)
-   if test -f /usr/include/vtk/vtkPlane.h ; then
+   if test -f /usr/include/vtk-5.0/vtkPlane.h ; then
       AC_MSG_RESULT(trying /usr)
       VTKHOME="/usr"
    fi
@@ -84,9 +84,9 @@
 
 if test ! -z $VTKHOME
 then
-   LOCAL_INCLUDES="-I$VTKHOME/include/vtk $LOCAL_INCLUDES"
-   LOCAL_LIBS="-L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk -L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk/python $LOCAL_LIBS"
-   TRY_LINK_LIBS="-L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk -L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk/python $TRY_LINK_LIBS"
+   LOCAL_INCLUDES="-I$VTKHOME/include/vtk-5.0 $LOCAL_INCLUDES"
+   LOCAL_LIBS="-L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk-5.0 -L/usr/lib/python2.4/site-packages/vtk $LOCAL_LIBS"
+   TRY_LINK_LIBS="-L$VTKHOME/lib${LIB_LOCATION_SUFFIX}/vtk-5.0 -L/usr/lib/python2.4/site-packages/vtk/ $TRY_LINK_LIBS"
 fi
 
 dnl vtk headers
@@ -142,4 +142,4 @@
 # Save cache
 AC_CACHE_SAVE
 
-])dnl
\ No newline at end of file
+])dnl
--- GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in.org	2007-04-24 18:41:04.000000000 +0200
+++ GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in	2007-05-26 20:20:59.000000000 +0200
@@ -36,6 +36,10 @@
 QT_VERS = Qt_3_3_0
 endif
 
+ifeq ($(QT_VERS),Qt_3_3_5)
+QT_VERS = Qt_3_3_0
+endif
+
 ifeq ($(QT_VERS),Qt_3_3_6)
 QT_VERS = Qt_3_3_0
 endif
@@ -44,6 +48,14 @@
 QT_VERS = Qt_3_3_0
 endif
 
+ifeq ($(QT_VERS),Qt_3_3_8)
+QT_VERS = Qt_3_3_0
+endif
+
+ifeq ($(QT_VERS),Qt_3_3_9)
+QT_VERS = Qt_3_3_0
+endif
+
 # Sip flags
 SIP_FLAGS = -t WS_X11 -t $(QT_VERS) $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS)
 
--- GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/Makefile.in.org	2007-04-24 18:41:04.000000000 +0200
+++ GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/Makefile.in	2007-05-26 20:23:53.000000000 +0200
@@ -35,12 +35,21 @@
 ifeq ($(QT_VERS),Qt_3_3_4)
 QT_VERS = Qt_3_3_0
 endif
+ifeq ($(QT_VERS),Qt_3_3_5)
+QT_VERS = Qt_3_3_0
+endif
 ifeq ($(QT_VERS),Qt_3_3_6)
 QT_VERS = Qt_3_3_0
 endif
 ifeq ($(QT_VERS),Qt_3_3_7)
 QT_VERS = Qt_3_3_0
 endif
+ifeq ($(QT_VERS),Qt_3_3_8)
+QT_VERS = Qt_3_3_0
+endif
+ifeq ($(QT_VERS),Qt_3_3_9)
+QT_VERS = Qt_3_3_0
+endif
 
 # Sip flags
 SIP_FLAGS = -t WS_X11 -t $(QT_VERS) $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS)
--- GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_AppendFilter.cxx.org	2007-04-24 18:41:04.000000000 +0200
+++ GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_AppendFilter.cxx	2007-07-28 22:58:47.000000000 +0200
@@ -32,6 +32,7 @@
 #include <vtkCellData.h>
 #include <vtkDataSetAttributes.h>
 #include <vtkDataSetCollection.h>
+#include <vtkExecutive.h>
 #include <vtkObjectFactory.h>
 #include <vtkPointData.h>
 #include <vtkUnstructuredGrid.h>
@@ -119,8 +120,9 @@
   vtkIdType aPntStartId = 0;
   vtkIdType aCellStartId = 0;
 
-  for(vtkIdType aDataSetId = 0; aDataSetId < this->NumberOfInputs; ++aDataSetId){
-    vtkDataSet* aDataSet = (vtkDataSet *)(this->Inputs[aDataSetId]);
+  for(vtkIdType aDataSetId = 0; aDataSetId < this->GetNumberOfInputConnections(0); ++aDataSetId){
+    vtkDataSet* aDataSet = (vtkDataSet *)(this->GetExecutive()->GetInputData(0,aDataSetId));
+
     // Do mapping of the nodes
     if(!GetSharedPointsDataSet()){
       vtkIdType aNbPnts = aDataSet->GetNumberOfPoints();
@@ -265,11 +267,11 @@
 
   numCells = 0;
 
-  vtkDataSetAttributes::FieldList cellList(this->NumberOfInputs);
+  vtkDataSetAttributes::FieldList cellList(this->GetNumberOfInputConnections(0));
   int firstCD=1;
 
-  for (idx = 0; idx < this->NumberOfInputs; ++idx) {
-    ds = (vtkDataSet *)(this->Inputs[idx]);
+  for (idx = 0; idx < this->GetNumberOfInputConnections(0); ++idx) {
+    ds = (vtkDataSet *)(this->GetExecutive()->GetInputData(0,idx));
     if (ds != NULL)  {
       if ( ds->GetNumberOfPoints() <= 0 && ds->GetNumberOfCells() <= 0 )  {
         continue; //no input, just skip
@@ -308,8 +310,8 @@
   output->GetPointData()->PassData(GetSharedPointsDataSet()->GetPointData());
 
   // 2.cells
-  for (idx = 0; idx < this->NumberOfInputs; ++idx) {
-    ds = (vtkDataSet *)(this->Inputs[idx]);
+  for (idx = 0; idx < this->GetNumberOfInputConnections(0); ++idx) {
+    ds = (vtkDataSet *)(this->GetExecutive()->GetInputData(0,idx));
     if (ds != NULL) {
       numCells = ds->GetNumberOfCells(); 
       cd = ds->GetCellData();
--- GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_CellLocationsArray.h.org	2007-07-28 22:45:46.000000000 +0200
+++ GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_CellLocationsArray.h	2007-07-28 23:04:10.000000000 +0200
@@ -22,7 +22,7 @@
 
 #include "VTKViewer.h"
 
-#if (VTK_MAJOR_VERSION >= 4) &&  (VTK_MINOR_VERSION >= 4)
+#if ((VTK_MAJOR_VERSION == 5) || ((VTK_MAJOR_VERSION==4) && (VTK_MINOR_VERSION>=4) ))
 #  include <vtkIdTypeArray.h>
 #  define TCellLocationsArray vtkIdTypeArray
 #else