--- salome-3.2.6.orig/debian/killSalome +++ salome-3.2.6/debian/killSalome @@ -0,0 +1,7 @@ +#!/bin/sh + +export prefix=/usr +export SALOME_PYTHON_DIR=${prefix}/lib/python2.4/site-packages/salome +export PYTHONPATH=$PYTHONPATH:${prefix}/lib/python2.4/site-packages/omniORB:${SALOME_PYTHON_DIR} + +python ${SALOME_PYTHON_DIR}/killSalome.py --- salome-3.2.6.orig/debian/changelog +++ salome-3.2.6/debian/changelog @@ -0,0 +1,96 @@ +salome (3.2.6-7) unstable; urgency=low + + * Fixed sip by a QT_VERS change. + * Fixed netgen plugin link directory problem. + * Added automake to xdata configure target. + * Using python-central properly for python2.4-salome and salome-xdata. + * Lots of cleanups inspired by lintian. + + -- Adam C. Powell, IV Sun, 13 Apr 2008 23:05:38 -0400 + +salome (3.2.6-6) unstable; urgency=low + + * OmniORB 4.1.x port has no known build bugs now (thanks: Thomas Girard). + * Added build-deps python-qt-dev, sip4, python-sip4-dev, and libvtk5-qt3-dev. + * Created Build-Conflicts against other MPI implementations. + + -- Adam C. Powell, IV Fri, 07 Mar 2008 07:50:49 -0500 + +salome (3.2.6-5) unstable; urgency=low + + * New patch porting to omniORB 4.1.x (thanks: Thomas Girard). + + -- Adam C. Powell, IV Fri, 29 Feb 2008 10:47:13 -0500 + +salome (3.2.6-4) unstable; urgency=low + + * Added NETGENPLUGIN module (required considerable hacking). + * Changed libdev package to arch all because it is. + * Concatenated .m4 files into salome.m4 for libdev package. + * Moved IDL files to /usr/share/idl/salome. + * Added new salome-xdata package. + * Added examples package with content from SAMPLES directory. + * Added more inter-package dependencies. + * Added the CASROOT valiable and three derivatives to the runSalome script. + * A new README.Debian.html file explains the package and gives a TODO list. + * Added bindir=/usr/bin to avoid having stuff in /usr/bin/salome. + * Removed the $bindir/appliskel and $bindir/styles directories. + * Removed executable bit on xdata .png and .qm resources files. + * New docs generated by "make usr_docs" and "make dev_docs". + + -- Adam C. Powell, IV Fri, 25 Jan 2008 08:51:52 -0500 + +salome (3.2.6-3) unstable; urgency=low + + * Ported the VISU and SMESH modules to VTK 5. + * Completed packaging for the VISU and SMESH modules. + * Removed the GetPropagationSource() method from the StdMeshers_Propagation + class because it causes a link relocation error (why??). + * Added gfortran and libboost-signals-dev to Build-Depends. + * Completed building of packages conforming to FHS standard. + * Added _ROOT_DIR and PYTHONPATH variables to runSalome script. + * Made a link /usr/bin/runSalome to /usr/bin/salome/runSalome. + * Added a salome-common package for the resources. + + -- Adam C. Powell, IV Fri, 18 Jan 2008 16:11:23 -0500 + +salome (3.2.6-2) unstable; urgency=low + + * Patched KERNEL OpenCASCADE, MPI and HDF5 .m4 files for Debian. + * Fixed many C++ headers to include hdf5 without extern "C", and before med. + * Hacked KERNEL_SRC_3.2.6/src/Communication/SALOME_Comm_i.hxx to + include missing #defines needed by ios_base.h (is this a compiler bug?). + * Set libdir=/usr/lib. + * Added general packaging for all of the modules. + * Omitting NETGENPLUGIN for now because interface seems to have changed. + * Omitting GHS3DPLUGIN because it is non-free. + * Patched all modules' missing DESTDIR support. + * Fixed all modules' deprecated file references. + * Removed all modules' extraneous aclocal.m4 target dependencies. + * Fixed several modules' incorrect KERNEL IDL directory settings. + * Fixed all modules' erroneous creation of salome_adm directories, which + prevents the proper link from forming. + * Removed modules' copying adm_local to builddir because we build in place. + * Hacked GUI, GEOM and SMESH modules' check functions so configuring all + modules before building them all works. + * Fixed MED, RANDOMIZER and VISU modules' check functions. + * Patched modules so they can include headers and link to libs in place. + * Fixed executables' linking to properly use libtool --mode=link. + * Fixed modules' makefiles to install to proper libdir. + * Ported GUI module to VTK 5 and sip 4.7. + * Added missing sources explicitly to Makefile.in to get around a make bug. + * Fixed MED for Debian libmed-dev compatibility and header completeness. + * Added KERNEL variables to the PY* modules' makefiles. + + -- Adam C. Powell, IV Fri, 18 Jan 2008 00:27:05 -0500 + +salome (3.2.6-1) unstable; urgency=low + + * First Debianization of Salomé. + * Needs to use MPI prefix for HDF5 prefix because HDF5 test comes first + (i.e. upstream assumes that HDF5 is independent of MPI). + * Patches configure to include -lmpi++ in MPI_LIBS and properly specify + the Debian location of OpenCASCADE headers. + + -- Adam C. Powell, IV Tue, 08 Jan 2008 15:52:23 -0500 + --- salome-3.2.6.orig/debian/patch-omniorb41-port +++ salome-3.2.6/debian/patch-omniorb41-port @@ -0,0 +1,565 @@ +--- salome-3.2.6/KERNEL_SRC_3.2.6/src/Communication/SALOME_Comm_i.hxx~ 2007-04-24 11:34:19.000000000 -0400 ++++ salome-3.2.6/KERNEL_SRC_3.2.6/src/Communication/SALOME_Comm_i.hxx 2008-02-26 19:53:49.000000000 -0500 +@@ -34,8 +34,7 @@ + Generic servant class for senders that factorizes all the common methods and attributes necessary to senders. + All servant classes for senders have to inheritate from it. + */ +-class SALOME_Sender_i : public virtual POA_SALOME::Sender, +- public PortableServer::RefCountServantBase { ++class SALOME_Sender_i : public virtual POA_SALOME::Sender { + protected: + /*! Pointer to the generic array to transmit*/ + const void *_tabToSend; +--- salome-3.2.6/KERNEL_SRC_3.2.6/src/Communication/SALOME_Matrix_i.hxx~ 2007-04-24 11:34:19.000000000 -0400 ++++ salome-3.2.6/KERNEL_SRC_3.2.6/src/Communication/SALOME_Matrix_i.hxx 2008-02-26 19:55:50.000000000 -0500 +@@ -24,8 +24,7 @@ + #include CORBA_SERVER_HEADER(SALOME_Comm) + #include "SALOMEMultiComm.hxx" + +-class SALOME_Matrix_i : public virtual POA_SALOME::Matrix, +- public PortableServer::RefCountServantBase { ++class SALOME_Matrix_i : public virtual POA_SALOME::Matrix { + private: + const double *_tabToSend; + int _nbOfRow; +--- salome-3.2.6/KERNEL_SRC_3.2.6/src/Container/SALOME_Component_i.hxx~ 2007-04-24 11:34:16.000000000 -0400 ++++ salome-3.2.6/KERNEL_SRC_3.2.6/src/Container/SALOME_Component_i.hxx 2008-02-26 19:59:13.000000000 -0500 +@@ -60,8 +60,7 @@ + #endif + + class CONTAINER_EXPORT Engines_Component_i: +- public virtual POA_Engines::Component, +- public virtual PortableServer::RefCountServantBase ++ public virtual POA_Engines::Component + { + public: + Engines_Component_i(); +--- salome-3.2.6/KERNEL_SRC_3.2.6/src/Container/SALOME_Container_i.hxx~ 2007-04-24 11:34:16.000000000 -0400 ++++ salome-3.2.6/KERNEL_SRC_3.2.6/src/Container/SALOME_Container_i.hxx 2008-02-26 19:59:27.000000000 -0500 +@@ -61,8 +61,7 @@ + #endif + + class CONTAINER_EXPORT Engines_Container_i: +- public virtual POA_Engines::Container, +- public virtual PortableServer::RefCountServantBase ++ public virtual POA_Engines::Container + { + public: + Engines_Container_i(); +--- salome-3.2.6/KERNEL_SRC_3.2.6/src/Container/SALOME_ContainerManager.hxx~ 2007-04-24 11:34:16.000000000 -0400 ++++ salome-3.2.6/KERNEL_SRC_3.2.6/src/Container/SALOME_ContainerManager.hxx 2008-02-26 19:59:40.000000000 -0500 +@@ -45,8 +45,7 @@ + #endif + + class CONTAINER_EXPORT SALOME_ContainerManager: +- public POA_Engines::ContainerManager, +- public PortableServer::RefCountServantBase ++ public POA_Engines::ContainerManager + { + + public: +--- salome-3.2.6/KERNEL_SRC_3.2.6/src/Container/SALOME_FileRef_i.hxx~ 2007-04-24 11:34:16.000000000 -0400 ++++ salome-3.2.6/KERNEL_SRC_3.2.6/src/Container/SALOME_FileRef_i.hxx 2008-02-26 19:59:50.000000000 -0500 +@@ -33,8 +33,7 @@ + #include + + class fileRef_i: +- public virtual POA_Engines::fileRef, +- public virtual PortableServer::RefCountServantBase ++ public virtual POA_Engines::fileRef + { + public: + fileRef_i(); +--- salome-3.2.6/KERNEL_SRC_3.2.6/src/Container/SALOME_FileTransfer_i.hxx~ 2007-04-24 11:34:16.000000000 -0400 ++++ salome-3.2.6/KERNEL_SRC_3.2.6/src/Container/SALOME_FileTransfer_i.hxx 2008-02-26 20:00:02.000000000 -0500 +@@ -33,8 +33,7 @@ + #include + + class fileTransfer_i: +- public virtual POA_Engines::fileTransfer, +- public virtual PortableServer::RefCountServantBase ++ public virtual POA_Engines::fileTransfer + { + public: + fileTransfer_i(); +--- salome-3.2.6/KERNEL_SRC_3.2.6/src/GenericObj/SALOME_GenericObj_i.cc~ 2007-04-24 11:34:17.000000000 -0400 ++++ salome-3.2.6/KERNEL_SRC_3.2.6/src/GenericObj/SALOME_GenericObj_i.cc 2008-02-26 20:05:27.000000000 -0500 +@@ -42,9 +42,9 @@ + "; CORBA::is_nil(thePOA) = "< + +-class SALOMEDS_BasicAttribute_i: public POA_SALOMEDS::BasicAttribute, +- public PortableServer::RefCountServantBase { ++class SALOMEDS_BasicAttribute_i: public POA_SALOMEDS::BasicAttribute { + protected: + TDF_Label _Lab; + +--- salome-3.2.6/KERNEL_SRC_3.2.6/src/SALOMEDS/SALOMEDS_Callback_i.hxx~ 2007-04-24 11:34:18.000000000 -0400 ++++ salome-3.2.6/KERNEL_SRC_3.2.6/src/SALOMEDS/SALOMEDS_Callback_i.hxx 2008-02-26 20:19:42.000000000 -0500 +@@ -15,8 +15,7 @@ + #include + #include CORBA_SERVER_HEADER(SALOMEDS) + +-class SALOMEDS_Callback_i: public virtual POA_SALOMEDS::Callback, +- public virtual PortableServer::RefCountServantBase ++class SALOMEDS_Callback_i: public virtual POA_SALOMEDS::Callback + { + private: + SALOMEDS::UseCaseBuilder_var _builder; +--- salome-3.2.6/KERNEL_SRC_3.2.6/src/SALOMEDS/SALOMEDS_ChildIterator_i.hxx~ 2007-04-24 11:34:18.000000000 -0400 ++++ salome-3.2.6/KERNEL_SRC_3.2.6/src/SALOMEDS/SALOMEDS_ChildIterator_i.hxx 2008-02-26 20:20:00.000000000 -0500 +@@ -37,7 +37,6 @@ + #include + + class SALOMEDS_ChildIterator_i: public virtual POA_SALOMEDS::ChildIterator, +- public virtual PortableServer::RefCountServantBase, + public virtual SALOME::GenericObj_i + { + private: +--- salome-3.2.6/KERNEL_SRC_3.2.6/src/SALOMEDS/SALOMEDS_GenericAttribute_i.hxx~ 2007-04-24 11:34:18.000000000 -0400 ++++ salome-3.2.6/KERNEL_SRC_3.2.6/src/SALOMEDS/SALOMEDS_GenericAttribute_i.hxx 2008-02-26 20:20:38.000000000 -0500 +@@ -33,7 +33,6 @@ + #include "SALOMEDSImpl_GenericAttribute.hxx" + + class Standard_EXPORT SALOMEDS_GenericAttribute_i: public virtual POA_SALOMEDS::GenericAttribute, +- public virtual PortableServer::RefCountServantBase, + public virtual SALOME::GenericObj_i + { + +--- salome-3.2.6/KERNEL_SRC_3.2.6/src/SALOMEDS/SALOMEDS_SAttribute_i.hxx~ 2007-04-24 11:34:18.000000000 -0400 ++++ salome-3.2.6/KERNEL_SRC_3.2.6/src/SALOMEDS/SALOMEDS_SAttribute_i.hxx 2008-02-26 20:20:50.000000000 -0500 +@@ -42,8 +42,7 @@ + #include + #include + +-class SALOMEDS_SAttribute_i: public POA_IStudy::SAttribute, +- public PortableServer::RefCountServantBase { ++class SALOMEDS_SAttribute_i: public POA_IStudy::SAttribute + private: + CORBA::ORB_ptr _orb; + char* _Type; +--- salome-3.2.6/KERNEL_SRC_3.2.6/src/SALOMEDS/SALOMEDS_SComponentIterator_i.hxx~ 2007-04-24 11:34:18.000000000 -0400 ++++ salome-3.2.6/KERNEL_SRC_3.2.6/src/SALOMEDS/SALOMEDS_SComponentIterator_i.hxx 2008-02-26 20:21:18.000000000 -0500 +@@ -37,7 +37,6 @@ + #include "SALOMEDSImpl_SComponentIterator.hxx" + + class SALOMEDS_SComponentIterator_i:public virtual POA_SALOMEDS::SComponentIterator, +- public virtual PortableServer::RefCountServantBase, + public virtual SALOME::GenericObj_i + { + +--- salome-3.2.6/KERNEL_SRC_3.2.6/src/SALOMEDS/SALOMEDS_SObject_i.hxx~ 2007-04-24 11:34:18.000000000 -0400 ++++ salome-3.2.6/KERNEL_SRC_3.2.6/src/SALOMEDS/SALOMEDS_SObject_i.hxx 2008-02-26 20:21:30.000000000 -0500 +@@ -40,7 +40,6 @@ + #endif + + class Standard_EXPORT SALOMEDS_SObject_i: public virtual POA_SALOMEDS::SObject, +- public virtual PortableServer::RefCountServantBase, + public virtual SALOME::GenericObj_i + { + protected: +--- salome-3.2.6/KERNEL_SRC_3.2.6/src/SALOMEDS/SALOMEDS_StudyBuilder_i.hxx~ 2007-04-24 11:34:18.000000000 -0400 ++++ salome-3.2.6/KERNEL_SRC_3.2.6/src/SALOMEDS/SALOMEDS_StudyBuilder_i.hxx 2008-02-26 20:21:42.000000000 -0500 +@@ -37,8 +37,7 @@ + // Cascade header + #include + +-class SALOMEDS_StudyBuilder_i: public POA_SALOMEDS::StudyBuilder, +- public PortableServer::RefCountServantBase ++class SALOMEDS_StudyBuilder_i: public POA_SALOMEDS::StudyBuilder + { + private: + CORBA::ORB_ptr _orb; +--- salome-3.2.6/KERNEL_SRC_3.2.6/src/SALOMEDS/SALOMEDS_Study_i.hxx~ 2007-04-24 11:34:18.000000000 -0400 ++++ salome-3.2.6/KERNEL_SRC_3.2.6/src/SALOMEDS/SALOMEDS_Study_i.hxx 2008-02-26 20:22:12.000000000 -0500 +@@ -43,8 +43,7 @@ + #include "SALOMEDSImpl_Study.hxx" + #include "SALOMEDSImpl_AttributeIOR.hxx" + +-class Standard_EXPORT SALOMEDS_Study_i: public POA_SALOMEDS::Study, +- public PortableServer::RefCountServantBase ++class Standard_EXPORT SALOMEDS_Study_i: public POA_SALOMEDS::Study + { + private: + CORBA::ORB_ptr _orb; +--- salome-3.2.6/KERNEL_SRC_3.2.6/src/SALOMEDS/SALOMEDS_StudyManager_i.hxx~ 2007-04-24 11:34:18.000000000 -0400 ++++ salome-3.2.6/KERNEL_SRC_3.2.6/src/SALOMEDS/SALOMEDS_StudyManager_i.hxx 2008-02-26 20:22:30.000000000 -0500 +@@ -51,8 +51,7 @@ + + } + +-class Standard_EXPORT SALOMEDS_StudyManager_i: public POA_SALOMEDS::StudyManager, +- public PortableServer::RefCountServantBase { ++class Standard_EXPORT SALOMEDS_StudyManager_i: public POA_SALOMEDS::StudyManager { + private: + + CORBA::ORB_ptr _orb; +--- salome-3.2.6/KERNEL_SRC_3.2.6/src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.hxx~ 2007-04-24 11:34:18.000000000 -0400 ++++ salome-3.2.6/KERNEL_SRC_3.2.6/src/SALOMEDS/SALOMEDS_UseCaseBuilder_i.hxx 2008-02-26 20:22:57.000000000 -0500 +@@ -41,7 +41,6 @@ + #include "SALOMEDSImpl_UseCaseBuilder.hxx" + + class SALOMEDS_UseCaseBuilder_i: public virtual POA_SALOMEDS::UseCaseBuilder, +- public virtual PortableServer::RefCountServantBase, + public virtual SALOME::GenericObj_i + { + private: +--- salome-3.2.6/KERNEL_SRC_3.2.6/src/SALOMEDS/SALOMEDS_UseCaseIterator_i.hxx~ 2007-04-24 11:34:18.000000000 -0400 ++++ salome-3.2.6/KERNEL_SRC_3.2.6/src/SALOMEDS/SALOMEDS_UseCaseIterator_i.hxx 2008-02-26 20:23:07.000000000 -0500 +@@ -35,7 +35,6 @@ + #include "SALOMEDSImpl_UseCaseIterator.hxx" + + class SALOMEDS_UseCaseIterator_i: public virtual POA_SALOMEDS::UseCaseIterator, +- public virtual PortableServer::RefCountServantBase, + public virtual SALOME::GenericObj_i + { + private: +--- salome-3.2.6/KERNEL_SRC_3.2.6/src/NamingService/Test/NamingServiceTest.hxx~ 2007-04-24 11:34:17.000000000 -0400 ++++ salome-3.2.6/KERNEL_SRC_3.2.6/src/NamingService/Test/NamingServiceTest.hxx 2008-02-26 20:36:38.000000000 -0500 +@@ -27,8 +27,7 @@ + #include + #include CORBA_SERVER_HEADER(nstest) + +-class NSTEST_echo_i : public virtual POA_NSTEST::echo, +- public virtual PortableServer::RefCountServantBase ++class NSTEST_echo_i : public virtual POA_NSTEST::echo + { + public: + NSTEST_echo_i(); +@@ -39,8 +38,7 @@ + int _num; + }; + +-class NSTEST_aFactory_i : public virtual POA_NSTEST::aFactory, +- public virtual PortableServer::RefCountServantBase ++class NSTEST_aFactory_i : public virtual POA_NSTEST::aFactory + { + public: + NSTEST_aFactory_i(); +--- salome-3.2.6/GUI_SRC_3.2.6/src/Session/Session_Session_i.hxx~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/Session/Session_Session_i.hxx 2008-02-26 20:38:08.000000000 -0500 +@@ -36,8 +36,7 @@ + #include CORBA_SERVER_HEADER(SALOME_Session) + class SALOME_NamingService; + +-class SALOME_Session_i: public virtual POA_SALOME::Session, +- public virtual PortableServer::RefCountServantBase ++class SALOME_Session_i: public virtual POA_SALOME::Session + { + public: + SALOME_Session_i(int argc, +--- salome-3.2.6/GEOM_SRC_3.2.6/src/GEOM_I_Superv/GEOM_List_i.hh~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/GEOM_I_Superv/GEOM_List_i.hh 2008-02-26 23:55:52.000000000 -0500 +@@ -29,8 +29,7 @@ + + template + class GEOM_List_i : +- public virtual POA_GEOM::GEOM_List, +- public virtual PortableServer::RefCountServantBase ++ public virtual POA_GEOM::GEOM_List + { + public: + GEOM_List_i(); +--- salome-3.2.6/VISU_SRC_3.2.6/src/VISU_I/VISUConfig.hh~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/VISU_SRC_3.2.6/src/VISU_I/VISUConfig.hh 2008-02-27 00:00:41.000000000 -0500 +@@ -71,8 +71,7 @@ + + class VISU_Gen_i; + +- class Base_i : public virtual POA_VISU::Base, +- public virtual PortableServer::RefCountServantBase ++ class Base_i : public virtual POA_VISU::Base + { + public: + Base_i(); +--- salome-3.2.6/KERNEL_SRC_3.2.6/src/Notification/NOTIFICATION_Consumer.cxx~ ++++ salome-3.2.6/KERNEL_SRC_3.2.6/src/Notification/NOTIFICATION_Consumer.cxx +@@ -93,14 +93,14 @@ + }; + + if (status) { +- char* Asender; +- char* Agraph; +- char* Atype; ++ const char* Asender; ++ const char* Agraph; ++ const char* Atype; + CORBA::ULong Acounter; + CORBA::ULong Astamp; +- char* Adate; +- char* Anode; +- char* Amessage; ++ const char* Adate; ++ const char* Anode; ++ const char* Amessage; + event->filterable_data[0].value >>= Asender; + event->filterable_data[1].value >>= Agraph; + event->filterable_data[2].value >>= Atype; +--- salome-3.2.6/KERNEL_SRC_3.2.6/src/TestContainer/SALOME_TestComponent_i.cxx~ 2007-04-24 15:34:19.000000000 +0000 ++++ salome-3.2.6/KERNEL_SRC_3.2.6/src/TestContainer/SALOME_TestComponent_i.cxx 2008-03-06 02:53:41.000000000 +0000 +@@ -44,7 +44,7 @@ + MESSAGE("activate object"); + _thisObj = this ; + _id = _poa->activate_object(_thisObj); +- SCRUTE(pd_refCount); ++ SCRUTE(_pd_refCount); + } + + Engines_TestComponent_i::Engines_TestComponent_i() +@@ -60,7 +60,7 @@ + { + char s[100]; + sprintf(s, "TestComponent_i : L = %ld", (long) L); +- SCRUTE(pd_refCount); ++ SCRUTE(_pd_refCount); + + return CORBA::string_dup(s); + } +--- salome-3.2.6/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_Base.hxx~ 2007-04-24 16:41:04.000000000 +0000 ++++ salome-3.2.6/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_Base.hxx 2008-03-06 10:04:41.000000000 +0000 +@@ -199,7 +199,7 @@ + int * prof_debug , ofstream * fdebug ) ; + + char * ObjectToString( CORBA::Object_ptr obj ) const ; +- CORBA::Object_ptr StringToObject(char * obj ) const ; ++ CORBA::Object_ptr StringToObject(const char * obj ) const ; + + ostream & AnyValue( const CORBA::Any & anAny ); + +--- salome-3.2.6/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_Base.cxx~ 2008-03-06 09:27:39.000000000 +0000 ++++ salome-3.2.6/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_Base.cxx 2008-03-06 10:05:40.000000000 +0000 +@@ -67,14 +67,14 @@ + return _Orb->object_to_string( obj ); + } + +-CORBA::Object_ptr GraphBase::Base::StringToObject( char * obj ) const { ++CORBA::Object_ptr GraphBase::Base::StringToObject( const char * obj ) const { + return _Orb->string_to_object( obj ); + } + + ostream & GraphBase::Base::AnyValue( const CORBA::Any & anAny ) { + switch (anAny.type()->kind()) { + case CORBA::tk_string: { +- char * t; ++ const char * t; + anAny >>= t; + *_fdebug << " " << t << " (tk_string)" << endl ; + break; +--- salome-3.2.6/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_DataPort.cxx~ 2008-03-06 09:32:46.000000000 +0000 ++++ salome-3.2.6/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_DataPort.cxx 2008-03-06 09:39:06.000000000 +0000 +@@ -151,7 +151,7 @@ + #endif + switch (aDataValue->type()->kind()) { // Input Value + case CORBA::tk_string: { // Input string Value +- char * t; ++ const char * t; + *aDataValue >>= t; + #if ValueTrace + cdebug << t << " (string)" ; +@@ -242,7 +242,7 @@ + char t[40] ; + sprintf( t , "%ld" , ll ) ; + *theValue <<= t ; +- char *tt ; ++ const char *tt ; + *theValue >>= tt ; + #if ValueTrace + cdebug << " --> Value( " << t << ") (string) kind " << theValue->type()->kind() ; +@@ -311,7 +311,7 @@ + char t[40] ; + sprintf( t , "%lf" , d ) ; + *theValue <<= t ; +- char *tt ; ++ const char *tt ; + *theValue >>= tt ; + #if ValueTrace + cdebug << " --> Value( " << t << ") (string) kind " << theValue->type()->kind() ; +@@ -473,7 +473,7 @@ + //JR 30.03.2005 switch ( theValue->type()->kind() ) { + switch ( theValue.type()->kind() ) { + case CORBA::tk_string: { +- char * t; ++ const char * t; + //JR 30.03.2005 *theValue >>= t; + theValue >>= t; + // cdebug << "GraphBase::DataPort::Value() : " << t << " (string) " << endl ; +@@ -583,7 +583,7 @@ + const CORBA::Any * theValue = *_Value ; + switch (theValue->type()->kind()) { + case CORBA::tk_string: +- char * t; ++ const char * t; + *theValue >>= t; + f << t << " (string)" ; + break; +--- salome-3.2.6/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_XmlHandler.cxx~ 2007-04-24 16:41:04.000000000 +0000 ++++ salome-3.2.6/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_XmlHandler.cxx 2008-03-06 09:49:04.000000000 +0000 +@@ -718,7 +718,7 @@ + case CORBA::tk_string: { + //Mandrake 10.1/Salome 3 aLink.aLinkValue <<= (char *) NULL ; + aLink.aLinkValue <<= (char *) "" ; +- char * t; ++ const char * t; + aLink.aLinkValue >>= t; + #if TRACE + MESSAGE( t << " (string)" ); +@@ -778,7 +778,7 @@ + switch ( aLink.aLinkValue.type()->kind() ) { + case CORBA::tk_string: { + aLink.aLinkValue <<= fieldvalue[depth].c_str() ; +- char * t; ++ const char * t; + aLink.aLinkValue >>= t; + #if TRACE + MESSAGE( t << " (string)" ); +--- salome-3.2.6/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_Graph.cxx~ 2007-04-24 16:41:04.000000000 +0000 ++++ salome-3.2.6/SUPERV_SRC_3.2.6/src/GraphBase/DataFlowBase_Graph.cxx 2008-03-06 10:09:27.000000000 +0000 +@@ -1598,7 +1598,7 @@ + bool isUnknown = false; + switch (aValue.type()->kind()) { + case CORBA::tk_string: +- char * t; ++ const char * t; + aValue >>= t; + cdebug << t << " (string) " ; + if ( !strcmp( t, "Unknown CORBA::Any Type" ) ) +@@ -1688,7 +1688,7 @@ + << ToServiceParameterName << "' , Any " ; + switch (aValue.type()->kind()) { + case CORBA::tk_string: +- char * t; ++ const char * t; + aValue >>= t; + cdebug << t << " (string) " ; + break; +--- salome-3.2.6/SUPERV_SRC_3.2.6/src/GraphEditor/DataFlowEditor_OutNode.cxx~ 2007-04-24 16:41:04.000000000 +0000 ++++ salome-3.2.6/SUPERV_SRC_3.2.6/src/GraphEditor/DataFlowEditor_OutNode.cxx 2008-03-06 10:18:08.000000000 +0000 +@@ -1200,7 +1200,7 @@ + valuetype.appendChild( aField ) ; + switch (aLink.aLinkValue.type()->kind()) { + case CORBA::tk_string: { +- char* retstr ; ++ const char* retstr ; + aLink.aLinkValue >>= retstr; + // f << Tabs << " " << retstr << "" << endl ; + QDomElement value = Graph.createElement( "value" ) ; +@@ -1345,7 +1345,7 @@ + << ".Input( " ; + switch (aLink.aLinkValue.type()->kind()) { + case CORBA::tk_string: { +- char* retstr ; ++ const char* retstr ; + aLink.aLinkValue >>= retstr; + f << "'" << retstr << "'" ; + break ; +--- salome-3.2.6/SUPERV_SRC_3.2.6/src/GraphExecutor/DataFlowExecutor_PyDynInvoke.cxx~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/SUPERV_SRC_3.2.6/src/GraphExecutor/DataFlowExecutor_PyDynInvoke.cxx 2008-03-06 05:22:36.000000000 -0500 +@@ -320,7 +320,7 @@ + sname = InParametersList[i].Name.c_str() ; + switch ( data.type()->kind() ) { + case CORBA::tk_string : { +- char * t ; ++ const char * t ; + data >>= t ; + PyObject * ArgValue = Py_BuildValue( "s" , t ) ; + PyTuple_SetItem( ArgsList , i , ArgValue ) ; +--- salome-3.2.6/SUPERV_SRC_3.2.6/src/GraphExecutor/DataFlowExecutor_InNodeThreads.cxx~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/SUPERV_SRC_3.2.6/src/GraphExecutor/DataFlowExecutor_InNodeThreads.cxx 2008-03-06 05:26:01.000000000 -0500 +@@ -3277,7 +3277,7 @@ + const char * Type = anInPort->GetServicesParameter().Parametertype ; + switch ( D.Value.type()->kind() ) { // { string , long , double , objref } + case CORBA::tk_string: +- char * t; ++ const char * t; + D.Value >>= t; + #if InParametersSetTrace + cdebug << t << " (string)" ; +@@ -3675,7 +3675,7 @@ + #if InParametersSetTrace + switch (D.Value.type()->kind()) { // { string , long , double , objref } + case CORBA::tk_string: +- char * t; ++ const char * t; + D.Value >>= t; + cdebug << ThreadNo() << " " << t << "(string)" << endl ; + break; +@@ -3764,7 +3764,7 @@ + ServicesAnyData D = OutParametersList[i] ; + switch (D.Value.type()->kind()) { // { string , long , double , objref } + case CORBA::tk_string: { +- char * t; ++ const char * t; + D.Value >>= t; + #if OutParametersSetTrace + cdebug << ThreadNo() << " " << t << "(string)" << endl ; +@@ -3999,7 +3999,7 @@ + #if OutParametersSetTrace + switch ( anOutPort->Value().type()->kind() ) { + case CORBA::tk_string: +- char * t; ++ const char * t; + (anOutPort->Value()) >>= t; + cdebug << ThreadNo() << " Out" << i << " : " << t << "(string)" << endl ; + break; --- salome-3.2.6.orig/debian/README.Debian.html +++ salome-3.2.6/debian/README.Debian.html @@ -0,0 +1,55 @@ +Debian Salomé package +

Debian Salomé Package

By Adam Powell
+Last updated April 10, 2008 for version 3.2.6-7
+ +

Salomé is an amazing CAD program, mesher frontend, general simulation pre- + and post-processor, and simulation supervisor. It is made up of several + modules loaded by default at runtime called: KERNEL, GUI, GEOM, SUPERV, MED, + VISU, SMESH and NETGENPLUGIN. Others which might be useful are RANDOMIZER, + COMPONENT and SIERPINSKY. The HELLO, PYHELLO, CALCULATOR and PYCALCULATOR + modules are provided as examples of module development. And the HXX2SALOME + and xdata modules provide tools for module development.

+ +

Salomé components communicate using CORBA, and specifically, the omniORB + object request broker (ORB). This allows the different components to run on + different machines across a network when necessary.

+ +

To run Salomé, type runSalome --gui at the prompt. There are a lot + of command line options, such as specifying which modules to load, and + --killall kills processes left over from the previous run before + starting a new one. The command killSalome kills all Salomé and + related omniORB processes.

+ +

The package runs okay. But the following need to get done, at least the + first six before upload:

+
    +
  • Perform a license/copyright audit of the full source! For details, see: + http://www.opennovation.org/audits/ .
    • +
  • Identify documentation built beforehand (e.g. by latex2html).
    • +
  • Make runSalome work! (It can't find the modules now...)
    • +
  • Properly pythonize the salome-examples package.
    • +
  • Make man pages for the salome binaries.
    • +
  • Properly version the shared libraries.
    • +
  • Make runSalome.py ignore the -i argument to python in runSalome.
    • +
  • Bring tests out of the main salome package and put them into their own + salome-tests package.
    • +
  • Make a doc-base file pointing to the Salomé index (is there even a + complete Salomé index?), and a link from that index to this + README.Debian.html file.
    • +
  • Split salome-dev-doc out of enormous salome-doc package.
    • +
  • The .m4 files' check names like CHECK_KERNEL are a bit presumptuous. + They should change to CHECK_SALOME_KERNEL etc.
    • +
  • Split xdata documentation into a separate package (if there's + interest), and include a manpage.
    • +
  • Many of the libs need to link to additional libraries to get all of their + symbols, and many of them link to libraries they don't need (see + dh_shlibdeps warnings). +
  • Right now, the package only builds a python2.4 version. However, + rebuilding just the python parts of each module for each python version + will be very tricky, and rebuilding the entire thing for each python + version is unworkable -- the package takes long enough to build as it + is!
    • +
+ +Share and enjoy! + --- salome-3.2.6.orig/debian/patch-gui-sip47-port +++ salome-3.2.6/debian/patch-gui-sip47-port @@ -0,0 +1,84 @@ +--- salome-3.2.6/GUI_SRC_3.2.6/adm_local/unix/config_files/check_sip.m4~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/adm_local/unix/config_files/check_sip.m4 2008-01-15 22:42:40.000000000 -0500 +@@ -50,6 +50,14 @@ + SIP_VERS=v4_new ;; + 4.5*) + SIP_VERS=v4_new ;; ++ 4.6*) ++ SIP_VERS=v4_new ;; ++ 4.7*) ++ SIP_VERS=v4_new ;; ++ 4.8*) ++ SIP_VERS=v4_new ;; ++ 4.9*) ++ SIP_VERS=v4_new ;; + *) + AC_MSG_RESULT(sip version $version not supported) + SIP_VERS=unsupported ;; +--- salome-3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/SALOME_PYQT_Module.cxx 2008-01-15 22:28:01.000000000 -0500 +@@ -46,8 +46,8 @@ + #include "sipSalomePyQtGUIDeclSalomePyQtGUI.h" + #endif + +-#include +-#include ++//#include ++//#include + + #include + +--- salome-3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/Makefile.in~ 2008-01-16 00:49:20.000000000 -0500 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/Makefile.in 2008-01-16 07:28:48.000000000 -0500 +@@ -126,8 +126,9 @@ + + + # Custom build step: generate C++ wrapping according to $(SIP_FILES) +-$(SIP_SRC): $(SIP_FILES) ++$(SIP_SRC): $(SIP_FILES) addheader.patch + $(SIP) $(SIP_FLAGS) $< ++ patch -p0 < addheader.patch + + $(MOC_SRC): $(MOC_H) + $(MOC) $< -o $@ +--- salome-3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/addheader.patch.empty 2008-01-16 07:31:24.000000000 -0500 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/addheader.patch 2008-01-16 07:27:39.000000000 -0500 +@@ -0,0 +1,10 @@ ++--- sipSalomePyQtcmodule.cc~ 2008-01-16 07:23:02.000000000 -0500 +++++ sipSalomePyQtcmodule.cc 2008-01-16 07:24:50.000000000 -0500 ++@@ -9,6 +9,7 @@ ++ #line 66 "/usr/share/sip/qt/qt/qobject.sip" ++ #include ++ #include +++#include "SalomePyQt.h" ++ #line 13 "sipSalomePyQtcmodule.cc" ++ ++ /* Define the strings used by this module. */ +--- salome-3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in~ 2007-04-24 16:41:04.000000000 +0000 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in 2008-04-08 22:22:05.000000000 +0000 +@@ -44,6 +44,11 @@ + QT_VERS = Qt_3_3_0 + endif + ++# Debian lenny sets QT_VERSION_STR=3.3.8b but sip doesn't like that ++ifeq ($(QT_VERS),Qt_3_3_8b) ++QT_VERS = Qt_3_3_6 ++endif ++ + # Sip flags + SIP_FLAGS = -t WS_X11 -t $(QT_VERS) $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS) + +--- salome-3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/Makefile.in~ 2007-04-24 16:41:04.000000000 +0000 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/Makefile.in 2008-04-08 23:25:12.000000000 +0000 +@@ -42,6 +42,11 @@ + QT_VERS = Qt_3_3_0 + endif + ++# Debian lenny sets QT_VERSION_STR=3.3.8b but sip doesn't like that ++ifeq ($(QT_VERS),Qt_3_3_8b) ++QT_VERS = Qt_3_3_6 ++endif ++ + # Sip flags + SIP_FLAGS = -t WS_X11 -t $(QT_VERS) $(PYQT_SIPFLAGS) -s ".cc" -c . -I $(PYQT_SIPS) + --- salome-3.2.6.orig/debian/control +++ salome-3.2.6/debian/control @@ -0,0 +1,114 @@ +Source: salome +Section: contrib/science +Priority: extra +Maintainer: Adam C. Powell, IV +Standards-Version: 3.7.3.0 +Build-Depends: debhelper (>= 3.0), python2.4, swig, libhdf5-openmpi-dev | libhdf5-dev, libopencascade6.2-dev (>= 6.2.0-6) | libopencascade-dev, omniidl4, libomniorb4-dev (>= 4.1.0), libomnithread3-dev, python-omniorb, omniidl4-python, libgl1-mesa-dev | libgl-dev, libglu1-mesa-dev | libglu-dev, libqt3-mt-dev | libqt3-dev, python-qt-dev, sip4, python-sip4-dev, libboost-thread-dev, libcos4-dev, boost-build, libboost-signals-dev, libopenmpi-dev (>= 1.2.5), libcppunit-dev, autoconf, automake1.9 | automaken, qt3-dev-tools-compat, libvtk5-qt3-dev, libvtk5-dev, pyqt-tools, python-qt3, libqwt-dev, libmedc-dev, libmed-dev, libmed-tools, libgd2-xpm-dev | libgd2-dev, python-vtk, gfortran, libnetgen-dev (>= 4.4-9), python-central +Build-Depends-Indep: doxygen, graphviz, texlive-latex-base, python-docutils +Build-Conflicts: lam4-dev, libmpich1.0-dev, libmpich-mpd1.0-dev, libmpich-shmem1.0-dev +XS-Python-Version: 2.4 +Homepage: http://www.salome-platform.org/ + +Package: salome +Architecture: any +Section: contrib/science +Depends: salome-common (= ${source:Version}), python2.4-salome, ${shlibs:Depends} +Suggests: salome-doc, salome-examples +Description: Salomé numerical simulation pre- and post-processor + Salomé is a pre- and post-processor for numerical simulations. It can import + CAD files in IGES and STEP formats, facilitates component integration in + heterogeneous systems, and has a user-friendly GUI as well as a Python console + with all of the platform functionality. + . + This package contains the Salomé runtime binaries and scripts in + /usr/bin/salome and /usr/bin. + +Package: salome-common +Architecture: all +Section: contrib/science +Depends: salome +Description: Salomé numerical simulation pre- and post-processor + Salomé is a pre- and post-processor for numerical simulations. It can import + CAD files in IGES and STEP formats, facilitates component integration in + heterogeneous systems, and has a user-friendly GUI as well as a Python console + with all of the platform functionality. + . + This package contains the architecture-independent runtime resources needed to + run Salomé. + +Package: python2.4-salome +Architecture: any +Section: contrib/python +Depends: ${python:Depends}, python-omniorb, ${shlibs:Depends} +XB-Python-Version: 2.4 +Description: Salomé numerical simulation pre- and post-processor + Salomé is a pre- and post-processor for numerical simulations. It can import + CAD files in IGES and STEP formats, facilitates component integration in + heterogeneous systems, and has a user-friendly GUI as well as a Python console + with all of the platform functionality. + . + This package contains the Salomé Python site packages. + +Package: libsalome-dev +Architecture: all +Section: contrib/libdevel +Depends: libsalome3.2.6-0 (>= ${source:Version}) +Suggests: salome-doc, salome-xdata +Description: Salomé numerical simulation pre- and post-processor development files + Salomé is a pre- and post-processor for numerical simulations. It can import + CAD files in IGES and STEP formats, facilitates component integration in + heterogeneous systems, and has a user-friendly GUI as well as a Python console + with all of the platform functionality. + . + This package contains the Salomé headers, .so shared lib symlinks, IDL files, + and .m4 files. + +Package: libsalome3.2.6-0 +Architecture: any +Section: contrib/libs +Depends: ${shlibs:Depends} +Description: Salomé numerical simulation pre- and post-processor development files + Salomé is a pre- and post-processor for numerical simulations. It can import + CAD files in IGES and STEP formats, facilitates component integration in + heterogeneous systems, and has a user-friendly GUI as well as a Python console + with all of the platform functionality. + . + This package contains the Salomé shared libraries. + +Package: salome-doc +Architecture: all +Section: contrib/doc +Suggests: libsalome6.2-dev, salome +Description: Salomé numerical simulation pre- and post-processor documentation + Salomé is a pre- and post-processor for numerical simulations. It can import + CAD files in IGES and STEP formats, facilitates component integration in + heterogeneous systems, and has a user-friendly GUI as well as a Python console + with all of the platform functionality. + . + This package contains the documentation for Salomé. + +Package: salome-examples +Architecture: all +Section: contrib/doc +Suggests: salome +Description: Salomé numerical simulation pre- and post-processor documentation + Salomé is a pre- and post-processor for numerical simulations. It can import + CAD files in IGES and STEP formats, facilitates component integration in + heterogeneous systems, and has a user-friendly GUI as well as a Python console + with all of the platform functionality. + . + This package contains example files for Salomé. + +Package: salome-xdata +Architecture: all +Section: contrib/devel +Depends: ${python:Depends}, salome-common (= ${source:Version}) +Recommends: libsalome-dev +XB-Python-Version: 2.4 +Description: Salomé numerical simulation suite module development tool + Salomé is a pre- and post-processor for numerical simulations. It can import + CAD files in IGES and STEP formats, facilitates component integration in + heterogeneous systems, and has a user-friendly GUI as well as a Python console + with all of the platform functionality. + . + This package contains tools which are helpful for developing Salomé modules. --- salome-3.2.6.orig/debian/rules +++ salome-3.2.6/debian/rules @@ -0,0 +1,271 @@ +#!/usr/bin/make -f +# Made with the aid of debmake, by Christoph Lameter, +# based on the sample debian/rules file for GNU hello by Ian Jackson. + +package=salome + +# Support multiple makes at once +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +NJOBS := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +else +NJOBS := 1 +endif + +# These are the modules which require build_configure to build. They are +# organized by level in the hierarchy, e.g. KERNEL and HXX2SALOME at the +# bottom, GUI and PYCALCULATOR depend on KERNEL, MED through PYHELLO depend on +# GUI, VISU through SMESH depend on MED and GEOM, etc. +SALOME_MODULES = KERNEL_SRC_3.2.6 HXX2SALOME_3.2.6 \ + GUI_SRC_3.2.6 \ + GEOM_SRC_3.2.6 MED_SRC_3.2.6 RANDOMIZER_SRC_3.2.6 SUPERV_SRC_3.2.6 \ + HELLO_SRC_3.2.6 PYHELLO_SRC_3.2.6 \ + VISU_SRC_3.2.6 SMESH_SRC_3.2.6 COMPONENT_SRC_3.2.6 CALCULATOR_SRC_3.2.6 \ + PYCALCULATOR_SRC_3.2.6 \ + SIERPINSKY_SRC_3.2.6 NETGENPLUGIN_SRC_3.2.6 #GHS3DPLUGIN_SRC_3.2.6 + +unpatch: + dh_testdir +# if [ -e configure-stamp ]; then \ +# patch -p1 -R < debian/patch-fake-depend; \ +# fi + if [ -e patch-stamp ]; then \ + patch -p1 -R < debian/patch-netgen-needs-med; \ + patch -p1 -R < debian/patch-netgen-debian; \ + patch -p1 -R < debian/patch-netgen-missing-symbols; \ + patch -p1 -R < debian/patch-netgen-missing-sources; \ + patch -p1 -R < debian/patch-module-dir-vars; \ + patch -p1 -R < debian/patch-sier-add-visu-vars; \ + patch -p1 -R < debian/patch-sier-missing-sources; \ + patch -p1 -R < debian/patch-compo-mpi; \ + patch -p1 -R < debian/patch-compo-missing-sources; \ + patch -p1 -R < debian/patch-calc-missing-sources; \ + patch -p1 -R < debian/patch-fix-relocation-error; \ + patch -p1 -R < debian/patch-libtool-fortran-tag; \ + patch -p1 -R < debian/patch-smesh-vtk5-port; \ + patch -p1 -R < debian/patch-smesh-missing-sources; \ + patch -p1 -R < debian/patch-visu-vtk5-port; \ + patch -p1 -R < debian/patch-visu-missing-sources; \ + patch -p1 -R < debian/patch-hello-missing-sources; \ + patch -p1 -R < debian/patch-superv-missing-sources; \ + patch -p1 -R < debian/patch-med-missing-stuff; \ + patch -p1 -R < debian/patch-med-debian-compat; \ + patch -p1 -R < debian/patch-geom-missing-sources; \ + patch -p1 -R < debian/patch-gui-missing-sources; \ + patch -p1 -R < debian/patch-gui-sip47-port; \ + patch -p1 -R < debian/patch-gui-vtk5-port; \ + patch -p1 -R < debian/patch-lib-install-fix; \ + patch -p1 -R < debian/patch-libtool-exe-link-fix; \ + patch -p1 -R < debian/patch-build-in-tree; \ + patch -p1 -R < debian/patch-visu-check-fix; \ + patch -p1 -R < debian/patch-random-check-fix; \ + patch -p1 -R < debian/patch-med-check-fix; \ + patch -p1 -R < debian/patch-smesh-check-trick; \ + patch -p1 -R < debian/patch-geom-check-trick; \ + patch -p1 -R < debian/patch-gui-check-trick; \ + patch -p1 -R < debian/patch-bad-envproducts; \ + patch -p1 -R < debian/patch-no-stomp-adm-local; \ + patch -p1 -R < debian/patch-no-stomp-salome-adm; \ + patch -p1 -R < debian/patch-idl-dirs; \ + patch -p1 -R < debian/patch-missing-aclocal; \ + patch -p1 -R < debian/patch-deprecated-files; \ + patch -p1 -R < debian/patch-destdir; \ + patch -p1 -R < debian/patch-missing-ios-base-defs; \ + patch -p1 -R < debian/patch-hdf5-safe-include; \ + patch -p1 -R < debian/patch-configure-runsalome; \ + patch -p1 -R < debian/patch-hdf5-libs-with-mpi; \ + patch -p1 -R < debian/patch-mpi-libs; \ + patch -p1 -R < debian/patch-omniorb41-port; \ + patch -p1 -R < debian/patch-occ-includes; \ + rm -f KERNEL_SRC_3.2.6/bin/runSalome.in; \ + rm -f patch-stamp; \ + fi + +clean: + dh_testdir + dh_clean + for salomodule in $(SALOME_MODULES) xdata-0.5.49; do \ + if [ -e $$salomodule/Makefile ]; then \ + $(MAKE) -C $$salomodule clean; \ + fi \ + done + debian/rules unpatch + rm -f *-stamp + dh_clean + +patch-stamp: + dh_testdir + if [ ! -e patch-stamp ]; then \ + cp -p debian/runSalome.in KERNEL_SRC_3.2.6/bin/; \ + patch -p1 < debian/patch-occ-includes; \ + patch -p1 < debian/patch-omniorb41-port; \ + patch -p1 < debian/patch-mpi-libs; \ + patch -p1 < debian/patch-hdf5-libs-with-mpi; \ + patch -p1 < debian/patch-configure-runsalome; \ + patch -p1 < debian/patch-hdf5-safe-include; \ + patch -p1 < debian/patch-missing-ios-base-defs; \ + patch -p1 < debian/patch-destdir; \ + patch -p1 < debian/patch-deprecated-files; \ + patch -p1 < debian/patch-missing-aclocal; \ + patch -p1 < debian/patch-idl-dirs; \ + patch -p1 < debian/patch-no-stomp-salome-adm; \ + patch -p1 < debian/patch-no-stomp-adm-local; \ + patch -p1 < debian/patch-bad-envproducts; \ + patch -p1 < debian/patch-gui-check-trick; \ + patch -p1 < debian/patch-geom-check-trick; \ + patch -p1 < debian/patch-smesh-check-trick; \ + patch -p1 < debian/patch-med-check-fix; \ + patch -p1 < debian/patch-random-check-fix; \ + patch -p1 < debian/patch-visu-check-fix; \ + patch -p1 < debian/patch-build-in-tree; \ + patch -p1 < debian/patch-libtool-exe-link-fix; \ + patch -p1 < debian/patch-lib-install-fix; \ + patch -p1 < debian/patch-gui-vtk5-port; \ + patch -p1 < debian/patch-gui-sip47-port; \ + patch -p1 < debian/patch-gui-missing-sources; \ + patch -p1 < debian/patch-geom-missing-sources; \ + patch -p1 < debian/patch-med-debian-compat; \ + patch -p1 < debian/patch-med-missing-stuff; \ + patch -p1 < debian/patch-superv-missing-sources; \ + patch -p1 < debian/patch-hello-missing-sources; \ + patch -p1 < debian/patch-visu-missing-sources; \ + patch -p1 < debian/patch-visu-vtk5-port; \ + patch -p1 < debian/patch-smesh-missing-sources; \ + patch -p1 < debian/patch-smesh-vtk5-port; \ + patch -p1 < debian/patch-libtool-fortran-tag; \ + patch -p1 < debian/patch-fix-relocation-error; \ + patch -p1 < debian/patch-calc-missing-sources; \ + patch -p1 < debian/patch-compo-missing-sources; \ + patch -p1 < debian/patch-compo-mpi; \ + patch -p1 < debian/patch-sier-missing-sources; \ + patch -p1 < debian/patch-sier-add-visu-vars; \ + patch -p1 < debian/patch-module-dir-vars; \ + patch -p1 < debian/patch-netgen-missing-sources; \ + patch -p1 < debian/patch-netgen-missing-symbols; \ + patch -p1 < debian/patch-netgen-debian; \ + patch -p1 < debian/patch-netgen-needs-med; \ + touch patch-stamp; \ + fi + +# Hack alert! Because Salomé checks for HDF5 before MPI, we need to pass the +# MPI include prefix as the HDF5 include prefix. I've offered to patch this +# via the Salomé forum, but haven't heard back from them yet. +configure-stamp: patch-stamp + dh_testdir + for salomodule in $(SALOME_MODULES); do \ + echo; echo CONFIGURING SALOME MODULE $$salomodule; echo; \ + (cd $$salomodule && \ + KERNEL_ROOT_DIR=$(CURDIR)/KERNEL_SRC_3.2.6 \ + GUI_ROOT_DIR=$(CURDIR)/GUI_SRC_3.2.6 \ + MED_ROOT_DIR=$(CURDIR)/MED_SRC_3.2.6 \ + GEOM_ROOT_DIR=$(CURDIR)/GEOM_SRC_3.2.6 \ + RANDOMIZER_ROOT_DIR=$(CURDIR)/RANDOMIZER_SRC_3.2.6 \ + VISU_ROOT_DIR=$(CURDIR)/VISU_SRC_3.2.6 \ + SMESH_ROOT_DIR=$(CURDIR)/SMESH_SRC_3.2.6 \ + ./build_configure && \ + ./configure --prefix=/usr QTDIR=/usr CASROOT=/usr \ + --with-hdf5=/usr/lib/openmpi --with-mpi=/usr/lib/openmpi \ + --with-netgen=/usr PYQT_SIPS=/usr/share/sip/qt \ + KERNEL_ROOT_DIR=$(CURDIR)/KERNEL_SRC_3.2.6 \ + GUI_ROOT_DIR=$(CURDIR)/GUI_SRC_3.2.6 \ + MED_ROOT_DIR=$(CURDIR)/MED_SRC_3.2.6 \ + GEOM_ROOT_DIR=$(CURDIR)/GEOM_SRC_3.2.6 \ + RANDOMIZER_ROOT_DIR=$(CURDIR)/RANDOMIZER_SRC_3.2.6 \ + VISU_ROOT_DIR=$(CURDIR)/VISU_SRC_3.2.6 \ + SMESH_ROOT_DIR=$(CURDIR)/SMESH_SRC_3.2.6); \ + done + (cd xdata-0.5.49 && \ + automake && \ + ./configure --prefix=/usr KERNEL_ROOT_DIR=$(CURDIR)/KERNEL_SRC_3.2.6) +# patch -p1 < debian/patch-fake-depend + touch $@ + +build: build-stamp +build-stamp: configure-stamp + for salomodule in $(SALOME_MODULES) xdata-0.5.49; do \ + echo; echo COMPILING SALOME MODULE $$salomodule; echo; \ + $(MAKE) -C $$salomodule -j $(NJOBS) bindir=/usr/bin libdir=/usr/lib docdir=/usr/share/doc/salome-doc; \ + done + touch $@ + +build-indep: configure-stamp + echo; echo GENERATING DOCUMENTATION IN MODULES KERNEL, GUI, GEOM, MED, SUPERV, SMESH; echo + make -C KERNEL_SRC_3.2.6/doc usr_docs dev_docs -j $(NJOBS) DESTDIR=$(CURDIR)/debian/tmp bindir=/usr/bin libdir=/usr/lib docdir=/usr/share/doc/salome-doc + make -C GUI_SRC_3.2.6/doc dev_docs -j $(NJOBS) DESTDIR=$(CURDIR)/debian/tmp bindir=/usr/bin libdir=/usr/lib docdir=/usr/share/doc/salome-doc + make -C GEOM_SRC_3.2.6/doc dev_docs -j $(NJOBS) DESTDIR=$(CURDIR)/debian/tmp bindir=/usr/bin libdir=/usr/lib docdir=/usr/share/doc/salome-doc + make -C MED_SRC_3.2.6/doc dev_docs -j $(NJOBS) DESTDIR=$(CURDIR)/debian/tmp bindir=/usr/bin libdir=/usr/lib docdir=/usr/share/doc/salome-doc + make -C SUPERV_SRC_3.2.6/doc dev_docs -j $(NJOBS) DESTDIR=$(CURDIR)/debian/tmp bindir=/usr/bin libdir=/usr/lib docdir=/usr/share/doc/salome-doc + make -C SMESH_SRC_3.2.6/doc dev_docs -j $(NJOBS) DESTDIR=$(CURDIR)/debian/tmp bindir=/usr/bin libdir=/usr/lib docdir=/usr/share/doc/salome-doc + touch $@ + +install: install-stamp +install-stamp: build-stamp + dh_testdir + for salomodule in $(SALOME_MODULES); do \ + echo; echo INSTALLING SALOME MODULE $$salomodule; echo; \ + $(MAKE) -C $$salomodule install DESTDIR=$(CURDIR)/debian/tmp bindir=/usr/bin libdir=/usr/lib docdir=/usr/share/doc/salome-doc; \ + done + mv debian/tmp/usr/idl debian/tmp/usr/share/ + install -d debian/tmp/usr/share/aclocal + mv debian/tmp/usr/salome_adm/unix/config_files/check_Kernel.m4 debian/tmp/usr/share/aclocal/salome.m4 + for m4file in check_GUI.m4 check_GEOM.m4 check_Med.m4 check_RANDOMIZER.m4 check_SUPERV.m4 check_SMESH.m4 check_NETGENPLUGIN.m4; do \ + cat debian/tmp/usr/adm_local/unix/config_files/$$m4file >> debian/tmp/usr/share/aclocal/salome.m4; \ + done + cp debian/killSalome debian/tmp/usr/bin/ + chmod +x debian/tmp/usr/bin/killSalome + mv debian/tmp/usr/lib/SalomePyQt.so debian/tmp/usr/lib/SalomePyQt.so.0 + ln -s SalomePyQt.so.0 debian/tmp/usr/lib/SalomePyQt.so + mv debian/tmp/usr/Tests debian/tmp/usr/share/salome/ + rm -rf debian/tmp/usr/lib64 + rm -rf debian/tmp/usr/doc + rm -rf debian/tmp/usr/bin/appliskel + rm -rf debian/tmp/usr/bin/styles + rm -f debian/tmp/usr/bin/*.pyc + rm -f debian/tmp/usr/bin/*.csh + mv debian/tmp/usr/bin/*.py debian/tmp/usr/lib/python2.4/site-packages/salome/ + install -d debian/salome-examples/usr/share/salome/examples + cp -a SAMPLES_SRC_3.2.6/* debian/salome-examples/usr/share/salome/examples/ + + echo; echo INSTALLING SALOME MODULE xdata; echo; + make -C xdata-0.5.49 install DESTDIR=$(CURDIR)/debian/salome-xdata libdir=/usr/lib docdir=/usr/share/doc/salome-xdata + chmod -x debian/salome-xdata/usr/share/salome/resources/*.qm \ + debian/salome-xdata/usr/share/salome/resources/*.png + mv debian/salome-xdata/usr/share/doc/xdata-0.5.49 debian/salome-xdata/usr/share/doc/salome-xdata + rm -f `find debian/salome-xdata/usr/share/doc/salome-xdata -empty -print` + touch $@ + +binary-indep: build-indep install + dh_testdir -i + dh_testroot -i + dh_installdirs -i + dh_movefiles -i + dh_installdocs -i + dh_installchangelogs -i + dh_compress -i + dh_pycentral -psalome-xdata + dh_fixperms -i + dh_installdeb -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +binary-arch: install + dh_testdir -a + dh_testroot -a + dh_installdirs -a + dh_movefiles -a + dh_installdocs -a + dh_installchangelogs -a + dh_strip -a + dh_makeshlibs -a + dh_compress -a + dh_pycentral -ppython2.4-salome + dh_fixperms -a + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-indep binary-arch + +.PHONY: binary binary-arch binary-indep clean install build --- salome-3.2.6.orig/debian/libsalome3.2.6-0.files +++ salome-3.2.6/debian/libsalome3.2.6-0.files @@ -0,0 +1 @@ +usr/lib/*.so.* --- salome-3.2.6.orig/debian/salome.docs +++ salome-3.2.6/debian/salome.docs @@ -0,0 +1 @@ +debian/README.Debian.html --- salome-3.2.6.orig/debian/runSalome.in +++ salome-3.2.6/debian/runSalome.in @@ -0,0 +1,62 @@ +#!/bin/bash + +export prefix=@prefix@ +export KERNEL_ROOT_DIR=@prefix@ +export GUI_ROOT_DIR=@prefix@ +export GEOM_ROOT_DIR=@prefix@ +export MED_ROOT_DIR=@prefix@ +export RANDOMIZER_ROOT_DIR=@prefix@ +export SUPERV_ROOT_DIR=@prefix@ +export VISU_ROOT_DIR=@prefix@ +export SMESH_ROOT_DIR=@prefix@ +export COMPONENT_ROOT_DIR=@prefix@ +export CALCULATOR_ROOT_DIR=@prefix@ +export PYCALCULATOR_ROOT_DIR=@prefix@ +export SIERPINSKY_ROOT_DIR=@prefix@ +export NETGENPLUGIN_ROOT_DIR=@prefix@ + +export SALOME_PYTHON_DIR=@pythondir@/salome +export PYTHONPATH=$PYTHONPATH:@pythondir@/omniORB:${SALOME_PYTHON_DIR} +# This is a major kludge! But it's necessary for Salome to open with .py files +# in the right place... +export PATH=$PATH:${SALOME_PYTHON_DIR} +export CASROOT=@prefix@ +export CSF_GraphicShr=${CASROOT}/lib/libTKOpenGl.so +export CSF_UnitsLexicon=${CASROOT}/share/opencascade/UnitsAPI/Lexi_Expr.dat +export CSF_UnitsDefinition=${CASROOT}/share/opencascade/UnitsAPI/Units.dat + +if [ $# -ne 0 ] ; then + ${SALOME_PYTHON_DIR}/envSalome.py python -i ${SALOME_PYTHON_DIR}/runSalome.py $* +else + python ${SALOME_PYTHON_DIR}/runSalome.py +fi + +# ----------------------------------------------------------------------------- +# examples: +# --------- +# $: ${KERNEL_ROOT_DIR}/bin/salome/runSalome +# +# - parameters for launching are taken from SalomeApp.xml; +# - if the config file does not exist, it is created with default values. +# +# +# $: ${KERNEL_ROOT_DIR}/bin/salome/runSalome --modules=GEOM,SMESH,VISU,SUPERV,MED --embedded=registry,study,moduleCatalog,cppContainer --standalone=pyContainer,supervContainer --xterm --killall +# +# parameters from command line supersede those from SalomeApp.xml +# +# Some CORBA servers can be launched in the SALOME_Session_Server's process +# (embedded = same process) or in a separate process (standalone): +# --> registry,study,moduleCatalog,cppContainer +# Other CORBA servers could only be launched in separate process (standalone): +# --> pyContainer,supervContainer +# +# $: ${KERNEL_ROOT_DIR}/bin/salome/runSalome -h +# help +# ----------------------------------------------------------------------------- +# +# l'option -i permet de garder l'interpreteur python ouvert : +# par defaut, les differents serveurs ouvrent des fenêtres xterm +# (cf. runSalome.py) +# le serveur Logger n'est pas obligatoire (commenté dans runSalome.py) +# +# ----------------------------------------------------------------------------- --- salome-3.2.6.orig/debian/patch-gui-missing-sources +++ salome-3.2.6/debian/patch-gui-missing-sources @@ -0,0 +1,154 @@ +--- salome-3.2.6/GUI_SRC_3.2.6/src/RegistryDisplay/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/RegistryDisplay/Makefile.in 2008-01-15 17:52:30.000000000 -0500 +@@ -55,5 +55,10 @@ + CPPFLAGS+=$(QT_INCLUDES) $(KERNEL_CXXFLAGS) + LDFLAGS+=$(QT_MT_LIBS) $(KERNEL_LDFLAGS) -lSalomeNS -lOpUtil + ++SALOME_RegistrySK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_RegistrySK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ + + @CONCLUDE@ +--- salome-3.2.6/GUI_SRC_3.2.6/src/TOOLSGUI/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/TOOLSGUI/Makefile.in 2008-01-15 18:00:30.000000000 -0500 +@@ -62,5 +62,11 @@ + + LDFLAGS += $(QT_MT_LIBS) -L../SUIT -lsuit $(CAS_KERNEL) $(KERNEL_LDFLAGS) -lSalomeNS -lOpUtil + ++SALOME_RegistrySK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_RegistrySK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ + @CONCLUDE@ + +--- salome-3.2.6/GUI_SRC_3.2.6/src/Session/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/Session/Makefile.in 2008-01-15 18:53:12.000000000 -0500 +@@ -77,5 +77,32 @@ + + bin: $(MYPLUGINDIR) + ++SalomeApp_Engine.hh: ../../idl/SalomeApp_Engine.idl ++ $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< ++ ++SALOME_SessionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_SessionSK.cc ++ cp $< $@ ++ ++SALOMEDSSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDSSK.cc ++ cp $< $@ ++ ++SALOMEDS_AttributesSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDS_AttributesSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ ++SALOME_RegistrySK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_RegistrySK.cc ++ cp $< $@ ++ ++SALOME_ModuleCatalogSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ModuleCatalogSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ + @CONCLUDE@ + +--- salome-3.2.6/GUI_SRC_3.2.6/src/SalomeApp/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/SalomeApp/Makefile.in 2008-01-15 19:22:18.000000000 -0500 +@@ -89,6 +89,18 @@ + + LDFLAGS+=$(PYTHON_LIBS) $(QT_MT_LIBS) + LIBS+= -L../SUIT -lsuit -L../STD -lstd -L../CAM -lCAM -L../ObjBrowser -lObjBrowser -L../Prs -lSalomePrs $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSalomeDSClient $(CAS_KERNEL) -L../SPlot2d -lSPlot2d -L../GLViewer -lGLViewer -L../OCCViewer -lOCCViewer -L../VTKViewer -lVTKViewer -L../OBJECT -lSalomeObject -L../SVTK -lSVTK -L../SOCC -lSOCC -L../PyInterp -lPyInterp -L../PythonConsole -lPythonConsole -L../LogWindow -lLogWindow -L../LightApp -lLightApp -lSalomeContainer -L../TOOLSGUI -lToolsGUI -lTOOLSDS -L../Session -lSalomeSession ++ ++SalomeApp_Engine.hh: ../../idl/SalomeApp_Engine.idl ++ $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< ++ ++SALOMEDSSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDSSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ + + @CONCLUDE@ + +--- salome-3.2.6/GUI_SRC_3.2.6/src/SALOME_SWIG/Makefile.in~ 2008-01-15 21:29:17.000000000 -0500 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/SALOME_SWIG/Makefile.in 2008-01-15 21:27:09.000000000 -0500 +@@ -54,4 +54,13 @@ + LIBS+= $(PYTHON_LIBS) + LDFLAGS+= -L../SalomeApp -lSalomeApp + ++SALOMEDSSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDSSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ + @CONCLUDE@ +--- salome-3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in 2008-01-15 22:45:48.000000000 -0500 +@@ -106,4 +106,16 @@ + + ################################### + ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ ++SALOME_ContainerManagerSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ContainerManagerSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ + @CONCLUDE@ +--- salome-3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/Makefile.in 2008-01-15 23:27:13.000000000 -0500 +@@ -138,4 +138,10 @@ + $(MOC_SRC): $(MOC_H) + $(MOC) $< -o $@ + ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ + @CONCLUDE@ +--- salome-3.2.6/GUI_SRC_3.2.6/src/SALOME_PY/Makefile.in~ 2008-01-16 00:49:20.000000000 -0500 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/SALOME_PY/Makefile.in 2008-01-16 07:07:10.000000000 -0500 +@@ -45,8 +45,19 @@ + SALOME_GenericObj.idl + + CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(OCC_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) -DHAVE_CONFIG_H +-LDFLAGS+= $(PYTHON_LIBS) $(QT_MT_LIBS) $(VTK_LIBS) $(OGL_LIBS) -L../SalomeApp -lSalomeApp -lvtkCommonPython -lvtkGraphicsPython -lvtkImagingPython ++LDFLAGS+= $(PYTHON_LIBS) $(QT_MT_LIBS) $(VTK_LIBS) $(OGL_LIBS) -L../SalomeApp -L/usr/lib/python-support/python-vtk/python2.4/vtk -lSalomeApp -lvtkCommonPython -lvtkGraphicsPython -lvtkImagingPython + # -lVTKViewer + ++SALOMEDSSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDSSK.cc ++ cp $< $@ ++ ++SALOMEDS_AttributesSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDS_AttributesSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ + + @CONCLUDE@ --- salome-3.2.6.orig/debian/salome-common.files +++ salome-3.2.6/debian/salome-common.files @@ -0,0 +1 @@ +usr/share/salome/resources/* --- salome-3.2.6.orig/debian/patch-bad-envproducts +++ salome-3.2.6/debian/patch-bad-envproducts @@ -0,0 +1,22 @@ +--- salome-3.2.6/KERNEL_SRC_3.2.6/bin/appliskel/env.d/envProducts.sh~ 2007-04-24 11:34:11.000000000 -0400 ++++ salome-3.2.6/KERNEL_SRC_3.2.6/bin/appliskel/env.d/envProducts.sh 2008-01-23 13:50:33.000000000 -0500 +@@ -69,8 +69,8 @@ + export LD_LIBRARY_PATH=${CASROOT}/Linux/lib:${LD_LIBRARY_PATH} + export PATH=${CASROOT}/Linux/bin:${PATH} + # Variable for Foundation Classes : +-export CSF_UnitsLexicon=${CASROOT}/src/UnitsAPI/Lexi_Expr.dat +-export CSF_UnitsDefinition=${CASROOT}/src/UnitsAPI/Units.dat ++export CSF_UnitsLexicon=${CASROOT}/share/opencascade/UnitsAPI/Lexi_Expr.dat ++export CSF_UnitsDefinition=${CASROOT}/share/opencascade/UnitsAPI/Units.dat + # Variable for DataExchange : + export CSF_SHMessage=${CASROOT}/src/SHMessage + export CSF_XSMessage=${CASROOT}/src/XSMessage +@@ -84,7 +84,7 @@ + export CSF_StandardDefaults=${CASROOT}/src/StdResource + export CSF_PluginDefaults=${CASROOT}/src/StdResource + export CSF_XCAFDefaults=${CASROOT}/src/StdResource +-export CSF_GraphicShr=${CASROOT}/Linux/lib/libTKOpenGl.so ++export CSF_GraphicShr=${CASROOT}/lib/libTKOpenGl.so + export CSF_IGESDefaults=${CASROOT}/src/XSTEPResource + export CSF_STEPDefaults=${CASROOT}/src/XSTEPResource + ## --- salome-3.2.6.orig/debian/patch-netgen-missing-symbols +++ salome-3.2.6/debian/patch-netgen-missing-symbols @@ -0,0 +1,22 @@ +--- src3.2.6/NETGENPLUGIN_SRC_3.2.6/src/NETGENPlugin/NETGENPlugin_Mesher.cxx 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/NETGENPLUGIN_SRC_3.2.6/src/NETGENPlugin/NETGENPlugin_Mesher.cxx 2008-01-23 09:06:47.000000000 -0500 +@@ -53,10 +53,19 @@ + #define OCCGEOMETRY + #include + #include ++#include ++#include ++#include + //#include + namespace netgen { + extern int OCCGenerateMesh (OCCGeometry&, Mesh*&, int, int, char*); + extern MeshingParameters mparam; ++ int vssolution; ++ AutoPtr geometry2d (0); ++ AutoPtr geometry; ++ AutoPtr mesh; ++ AutoPtr stlgeometry; ++ int tcl_interp; + } + + //============================================================================= --- salome-3.2.6.orig/debian/patch-configure-runsalome +++ salome-3.2.6/debian/patch-configure-runsalome @@ -0,0 +1,10 @@ +--- salome-3.2.6/KERNEL_SRC_3.2.6/configure.ac~ 2007-04-24 11:34:20.000000000 -0400 ++++ salome-3.2.6/KERNEL_SRC_3.2.6/configure.ac 2008-01-18 11:16:42.000000000 -0500 +@@ -498,6 +498,7 @@ + ./bin/Makefile \ + ./bin/VERSION \ + ./bin/runIDLparser \ ++ ./bin/runSalome \ + ./doc/Makefile \ + ./doc/salome/Makefile \ + ./doc/salome/tui/Makefile \ --- salome-3.2.6.orig/debian/patch-netgen-missing-sources +++ salome-3.2.6/debian/patch-netgen-missing-sources @@ -0,0 +1,65 @@ +--- src3.2.6/NETGENPLUGIN_SRC_3.2.6/src/NETGENPlugin/Makefile.in 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/NETGENPLUGIN_SRC_3.2.6/src/NETGENPlugin/Makefile.in 2008-01-23 08:18:10.000000000 -0500 +@@ -62,8 +62,26 @@ + LIB = libNETGENEngine.la + + NETGEN_INCLUDES = @NETGEN_INCLUDES@ ++NETGEN_LIBS_DIR = @NETGEN_LIBS_DIR@ ++NETGEN_LIBS = @NETGEN_LIBS@ + CPPFLAGS += $(NETGEN_INCLUDES) +-CXXFLAGS += $(NETGEN_INCLUDES) +-LDFLAGS += -L${NETGENPLUGIN_ROOT_DIR}/lib@LIB_LOCATION_SUFFIX@/salome -lNETGEN ++CXXFLAGS += $(NETGEN_INCLUDES) $(KERNEL_CXXFLAGS) ++LDFLAGS += -L$(NETGEN_LIBS_DIR) $(NETGEN_LIBS) ++ ++NETGENPlugin_NETGEN_3D_i.lo: NETGENPlugin_Algorithm.hh SMESH_Hypothesis.hh ++ ++NETGENPlugin_Hypothesis_i.lo: SMESH_Mesh.hh GEOM_Gen.hh MED.hh ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ ++SALOME_CommSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_CommSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ + + @CONCLUDE@ +--- src3.2.6/NETGENPLUGIN_SRC_3.2.6/src/GUI/Makefile.in 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/NETGENPLUGIN_SRC_3.2.6/src/GUI/Makefile.in 2008-01-21 12:26:54.000000000 -0500 +@@ -60,14 +60,25 @@ + + # additionnal information to compil and link file + +-CPPFLAGS += $(QT_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) \ +- -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome \ +- -I${GEOM_ROOT_DIR}/include/salome -I${SMESH_ROOT_DIR}/include/salome \ +- $(BOOST_CPPFLAGS) +-CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome \ +- -I${GEOM_ROOT_DIR}/include/salome -I${SMESH_ROOT_DIR}/include/salome ++CPPFLAGS += $(QT_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) ++CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) $(GEOM_CXXFLAGS) $(SMESH_CXXFLAGS) + + LDFLAGS += $(OCC_KERNEL_LIBS) $(KERNEL_LDFLAGS) $(GUI_LDFLAGS) ${GEOM_LDFLAGS} ${SMESH_LDFLAGS} -lSMESH + ++NETGENPluginGUI.lo: SMESH_Hypothesis.hh ++ ++NETGENPluginGUI_HypothesisCreator.lo: SMESH_Mesh.hh NETGENPlugin_Algorithm.hh GEOM_Gen.hh MED.hh ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ ++SALOME_CommSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_CommSK.cc ++ cp $< $@ + + @CONCLUDE@ --- salome-3.2.6.orig/debian/patch-build-in-tree +++ salome-3.2.6/debian/patch-build-in-tree @@ -0,0 +1,1081 @@ +--- salome-3.2.6/KERNEL_SRC_3.2.6/salome_adm/unix/config_files/check_Kernel.m4~ 2007-04-24 11:34:20.000000000 -0400 ++++ salome-3.2.6/KERNEL_SRC_3.2.6/salome_adm/unix/config_files/check_Kernel.m4 2008-01-15 07:53:39.000000000 -0500 +@@ -50,8 +50,8 @@ + AC_SUBST(KERNEL_ROOT_DIR) + AC_SUBST(KERNEL_SITE_DIR) + +- KERNEL_LDFLAGS=-L${KERNEL_DIR}/lib${LIB_LOCATION_SUFFIX}/salome +- KERNEL_CXXFLAGS=-I${KERNEL_DIR}/include/salome ++ KERNEL_LDFLAGS="-L${KERNEL_DIR}/lib${LIB_LOCATION_SUFFIX}/salome -L${KERNEL_DIR}/src/SALOMELocalTrace -L${KERNEL_DIR}/src/Basics -L${KERNEL_DIR}/src/Utils -L${KERNEL_DIR}/src/NamingService -L${KERNEL_DIR}/src/LifeCycleCORBA -L${KERNEL_DIR}/src/Container -L${KERNEL_DIR}/src/ResourcesManager -L${KERNEL_DIR}/src/Registry -L${KERNEL_DIR}/src/Notification -L${KERNEL_DIR}/src/HDFPersist -L${KERNEL_DIR}/src/SALOMETraceCollector -L${KERNEL_DIR}/src/SALOMEDSClient -L${KERNEL_DIR}/src/ModuleCatalog -L${KERNEL_DIR}/src/TOOLSDS -L${KERNEL_DIR}/src/SALOMEDSImpl -L${KERNEL_DIR}/src/GenericObj -L${KERNEL_DIR}/src/Communication -L${KERNEL_DIR}/src/SALOMEDS -L${KERNEL_DIR}/idl" ++ KERNEL_CXXFLAGS="-I${KERNEL_DIR}/include/salome -I${KERNEL_DIR}/src/SALOMELocalTrace -I${KERNEL_DIR}/src/Basics -I${KERNEL_DIR}/src/Utils -I${KERNEL_DIR}/src/HDFPersist -I${KERNEL_DIR}/src/NamingService -I${KERNEL_DIR}/idl -I${KERNEL_DIR}/src/SALOMEDSClient -I${KERNEL_DIR}/src/Container -I${KERNEL_DIR}/src/ModuleCatalog -I${KERNEL_DIR}/src/Registry -I${KERNEL_DIR}/src/ResourcesManager -I${KERNEL_DIR}/src/Notification -I${KERNEL_DIR}/src/TOOLSDS -I${KERNEL_DIR}/src/SALOMETraceCollector -I${KERNEL_DIR}/src/LifeCycleCORBA -I${KERNEL_DIR}/src/Basics/Test -I${KERNEL_DIR}/src/Communication -I${KERNEL_DIR}/src/GenericObj -I${KERNEL_DIR}/src/SALOMEDS -I/home/hazelsct/salome-3.2.6/KERNEL_SRC_3.2.6/src/SALOMEDSImpl -I${KERNEL_DIR}/src/Utils" + + AC_SUBST(KERNEL_LDFLAGS) + AC_SUBST(KERNEL_CXXFLAGS) +--- salome-3.2.6/GUI_SRC_3.2.6/src/QDS/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/QDS/Makefile.in 2008-01-15 15:16:23.000000000 -0500 +@@ -62,7 +62,7 @@ + + CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES) + +-LDFLAGS+=$(QT_MT_LIBS) $(CAS_KERNEL) -lDDS -lqtx ++LDFLAGS+=$(QT_MT_LIBS) $(CAS_KERNEL) -L../DDS/ -lDDS -L../Qtx/ -lqtx + + @CONCLUDE@ + +--- salome-3.2.6/GUI_SRC_3.2.6/src/SUIT/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/SUIT/Makefile.in 2008-01-15 15:24:11.000000000 -0500 +@@ -121,6 +121,6 @@ + + CPPFLAGS+=$(QT_INCLUDES) + +-LDFLAGS+=$(QT_MT_LIBS) -lqtx ++LDFLAGS+=$(QT_MT_LIBS) -L../Qtx/ -lqtx + + @CONCLUDE@ +--- salome-3.2.6/GUI_SRC_3.2.6/src/STD/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/STD/Makefile.in 2008-01-15 15:26:26.000000000 -0500 +@@ -80,7 +80,7 @@ + + CPPFLAGS+=$(QT_INCLUDES) + +-LDFLAGS+=$(QT_MT_LIBS) ++LDFLAGS+=$(QT_MT_LIBS) -L../SUIT + LIBS+= -lsuit + + @CONCLUDE@ +--- salome-3.2.6/GUI_SRC_3.2.6/src/CAF/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/CAF/Makefile.in 2008-01-15 15:28:50.000000000 -0500 +@@ -60,7 +60,7 @@ + + CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES) -I${QTDIR}/src/kernel -I$(QTDIR)/mkspecs/linux-g++ + +-LDFLAGS+=$(QT_MT_LIBS) $(CAS_OCAF) $(CAS_OCAFVIS) ++LDFLAGS+=$(QT_MT_LIBS) $(CAS_OCAF) $(CAS_OCAFVIS) -L../STD -L../SUIT + LIBS+= -lstd -lsuit + + @CONCLUDE@ +--- salome-3.2.6/GUI_SRC_3.2.6/src/CAM/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/CAM/Makefile.in 2008-01-15 15:32:47.000000000 -0500 +@@ -55,7 +55,7 @@ + + CPPFLAGS+=$(QT_INCLUDES) + +-LDFLAGS+=$(QT_MT_LIBS) ++LDFLAGS+=$(QT_MT_LIBS) -L../SUIT -L../STD -L../SUITApp + + LIBS+= -lsuit -lstd + LDFLAGSFORBIN= -lSUITApp +--- salome-3.2.6/GUI_SRC_3.2.6/src/SUITApp/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/SUITApp/Makefile.in 2008-01-15 15:34:10.000000000 -0500 +@@ -49,7 +49,7 @@ + + CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) + +-LDFLAGS+=$(QT_MT_LIBS) ++LDFLAGS+=$(QT_MT_LIBS) -L../SUIT -L../Qtx + + ifneq ($(DISABLE_PYCONSOLE),yes) + LIBS+= -Xlinker -export-dynamic $(PYTHON_LIBS) +--- salome-3.2.6/GUI_SRC_3.2.6/src/ObjBrowser/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/ObjBrowser/Makefile.in 2008-01-15 15:35:19.000000000 -0500 +@@ -52,7 +52,7 @@ + + CPPFLAGS+=$(QT_INCLUDES) + +-LDFLAGS+=$(QT_MT_LIBS) ++LDFLAGS+=$(QT_MT_LIBS) -L../SUIT + LIBS+= -lsuit + + @CONCLUDE@ +--- salome-3.2.6/GUI_SRC_3.2.6/src/GLViewer/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/GLViewer/Makefile.in 2008-01-15 15:36:57.000000000 -0500 +@@ -114,7 +114,7 @@ + + CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES) + +-LDFLAGS+=$(QT_MT_LIBS) $(CAS_KERNEL) ++LDFLAGS+=$(QT_MT_LIBS) $(CAS_KERNEL) -L../SUIT + + LIBS+= -lsuit -L/usr/X11R6/lib@LIB_LOCATION_SUFFIX@ -lGLU + +--- salome-3.2.6/GUI_SRC_3.2.6/src/VTKViewer/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/VTKViewer/Makefile.in 2008-01-15 15:38:33.000000000 -0500 +@@ -95,7 +95,7 @@ + + CPPFLAGS+=$(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) + +-LDFLAGS+=$(VTK_LIBS) $(QT_MT_LIBS) $(CAS_KERNEL) -lqtx -lsuit ++LDFLAGS+=$(VTK_LIBS) $(QT_MT_LIBS) $(CAS_KERNEL) -L../Qtx -lqtx -L../SUIT -lsuit + + LDFLAGSFORBIN=$(LDFLAGS) + +--- salome-3.2.6/GUI_SRC_3.2.6/src/SVTK/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/SVTK/Makefile.in 2008-01-15 15:46:12.000000000 -0500 +@@ -121,7 +121,7 @@ + $(QWT_LIBS) \ + $(VTK_LIBS) + +-LIBS+= -lqtx -lsuit -lstd -lCAM -lSalomeObject -lSalomePrs -lVTKViewer ++LIBS+= -L../Qtx -lqtx -L../SUIT -lsuit -L../STD -lstd -L../CAM -lCAM -L../OBJECT -lSalomeObject -L../Prs -lSalomePrs -L../VTKViewer -lVTKViewer + + LDFLAGSFORBIN=$(LDFLAGS) $(LIBS) + +--- salome-3.2.6/GUI_SRC_3.2.6/src/OCCViewer/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/OCCViewer/Makefile.in 2008-01-15 15:48:12.000000000 -0500 +@@ -91,7 +91,7 @@ + + CPPFLAGS+=$(QT_INCLUDES) $(OGL_INCLUDES) $(OCC_INCLUDES) + +-LDFLAGS+=$(OGL_LIBS) $(QT_MT_LIBS) $(CAS_KERNEL) $(CAS_VIEWER) -lsuit ++LDFLAGS+=$(OGL_LIBS) $(QT_MT_LIBS) $(CAS_KERNEL) $(CAS_VIEWER) -L../SUIT -lsuit + + @CONCLUDE@ + +--- salome-3.2.6/GUI_SRC_3.2.6/src/SOCC/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/SOCC/Makefile.in 2008-01-15 15:49:42.000000000 -0500 +@@ -48,6 +48,6 @@ + CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES) $(BOOST_CPPFLAGS) + + LDFLAGS+=$(QT_MT_LIBS) +-LIBS+= -lsuit -lSalomeObject -lSalomePrs -lOCCViewer ++LIBS+= -L../SUIT -lsuit -L../OBJECT -lSalomeObject -L../Prs -lSalomePrs -L../OCCViewer -lOCCViewer + + @CONCLUDE@ +--- salome-3.2.6/GUI_SRC_3.2.6/src/Plot2d/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/Plot2d/Makefile.in 2008-01-15 15:51:08.000000000 -0500 +@@ -89,7 +89,7 @@ + + CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(QWT_INCLUDES) + +-LDFLAGS+=$(QWT_LIBS) $(QT_MT_LIBS) -lsuit ++LDFLAGS+=$(QWT_LIBS) $(QT_MT_LIBS) -L../SUIT -lsuit + + @CONCLUDE@ + +--- salome-3.2.6/GUI_SRC_3.2.6/src/SPlot2d/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/SPlot2d/Makefile.in 2008-01-15 15:52:31.000000000 -0500 +@@ -49,7 +49,7 @@ + SPlot2d_ViewWindow.h + + CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES) $(QWT_INCLUDES) $(BOOST_CPPFLAGS) +-LDFLAGS+=$(QT_MT_LIBS) $(QWT_LIBS) -lsuit -lPlot2d -lSalomePrs ++LDFLAGS+=$(QT_MT_LIBS) $(QWT_LIBS) -L../SUIT -lsuit -L../Plot2d -lPlot2d -L../Prs -lSalomePrs + + + @CONCLUDE@ +--- salome-3.2.6/GUI_SRC_3.2.6/src/SUPERVGraph/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/SUPERVGraph/Makefile.in 2008-01-15 15:53:37.000000000 -0500 +@@ -53,7 +53,7 @@ + LIB_CLIENT_IDL = + + CPPFLAGS+=$(QT_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) +-LDFLAGS+=$(QT_MT_LIBS) -lsuit ++LDFLAGS+=$(QT_MT_LIBS) -L../SUIT -lsuit + + + @CONCLUDE@ +--- salome-3.2.6/GUI_SRC_3.2.6/src/LightApp/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/LightApp/Makefile.in 2008-01-15 16:06:49.000000000 -0500 +@@ -190,38 +190,38 @@ + LDFLAGS+= $(PYTHON_LIBS) + endif + +-LIBS+= -lsuit -lstd -lCAM -lObjBrowser -lLogWindow $(CAS_KERNEL) -lSalomePrs \ +- $(HDF5_LIBS) $(KERNEL_LDFLAGS) -lSalomeHDFPersist ++LIBS+= -L../SUIT -lsuit -L../STD -lstd -L../CAM -lCAM -L../ObjBrowser -lObjBrowser -L../LogWindow -lLogWindow $(CAS_KERNEL) -L../Prs -lSalomePrs \ ++ $(HDF5_LIBS) $(KERNEL_LDFLAGS) -L$(KERNEL_ROOT_DIR)/src/HDFPersist -lSalomeHDFPersist + + ifneq ($(DISABLE_SALOMEOBJECT),yes) +- LIBS+= -lSalomeObject ++ LIBS+= -L../OBJECT -lSalomeObject + endif + ifneq ($(DISABLE_VTKVIEWER),yes) +- LIBS+= -lVTKViewer ++ LIBS+= -L../VTKViewer -lVTKViewer + ifneq ($(DISABLE_SALOMEOBJECT),yes) +- LIBS+= -lSVTK ++ LIBS+= -L../SVTK -lSVTK + endif + endif + ifneq ($(DISABLE_OCCVIEWER),yes) +- LIBS+= -lOCCViewer ++ LIBS+= -L../OCCViewer -lOCCViewer + ifneq ($(DISABLE_SALOMEOBJECT),yes) +- LIBS+= -lSOCC ++ LIBS+= -L../SOCC -lSOCC + endif + endif + ifneq ($(DISABLE_GLVIEWER),yes) +- LIBS+= -lGLViewer ++ LIBS+= -L../GLViewer -lGLViewer + endif + ifneq ($(DISABLE_PLOT2DVIEWER),yes) +- LIBS+= -lPlot2d ++ LIBS+= -L../Plot2d -lPlot2d + ifneq ($(DISABLE_SALOMEOBJECT),yes) +- LIBS+= -lSPlot2d ++ LIBS+= -L../SPlot2d -lSPlot2d + endif + endif + ifneq ($(DISABLE_PYCONSOLE),yes) +- LIBS+= -lPyInterp -lPythonConsole ++ LIBS+= -L../PyInterp -lPyInterp -L../PythonConsole -lPythonConsole + endif + ifneq ($(DISABLE_SUPERVGRAPHVIEWER),yes) +- LIBS+= -lSUPERVGraph ++ LIBS+= -L../SUPERVGraph -lSUPERVGraph + endif + + @CONCLUDE@ +--- salome-3.2.6/GUI_SRC_3.2.6/src/ResExporter/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/ResExporter/Makefile.in 2008-01-15 16:07:36.000000000 -0500 +@@ -36,7 +36,7 @@ + CPPFLAGS += $(QT_INCLUDES) + + LDFLAGS += $(QT_MT_LIBS) +-LIBS += -lsuit -lqtx ++LIBS += -L../SUIT -lsuit -L../Qtx -lqtx + + LDFLAGSFORBIN = ${LDFLAGS} + LIBSFORBIN = $(LIBS) +--- salome-3.2.6/GUI_SRC_3.2.6/src/TOOLSGUI/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/TOOLSGUI/Makefile.in 2008-01-15 17:59:52.000000000 -0500 +@@ -60,7 +60,7 @@ + CPPFLAGS += $(QT_INCLUDES) $(OCC_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) + CXXFLAGS += $(OCC_CXXFLAGS) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) + +-LDFLAGS += $(QT_MT_LIBS) -lsuit $(CAS_KERNEL) $(KERNEL_LDFLAGS) -lSalomeNS -lOpUtil ++LDFLAGS += $(QT_MT_LIBS) -L../SUIT -lsuit $(CAS_KERNEL) $(KERNEL_LDFLAGS) -lSalomeNS -lOpUtil + + @CONCLUDE@ + +--- salome-3.2.6/GUI_SRC_3.2.6/src/Session/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/Session/Makefile.in 2008-01-15 18:42:15.000000000 -0500 +@@ -61,9 +61,9 @@ + + CPPFLAGS += $(QT_MT_INCLUDES) $(PYTHON_INCLUDES) $(HDF5_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(OCC_INCLUDES) + CXXFLAGS += $(OCC_CXXFLAGS) $(BOOST_CPPFLAGS) +-LDFLAGS += $(QT_MT_LIBS) $(KERNEL_LDFLAGS) -lSalomeNS -lsuit -lSalomeLifeCycleCORBA -lOpUtil -lSALOMELocalTrace -lwith_loggerTraceCollector -lEvent -lSalomeCatalog -lSalomeDSClient $(CAS_KERNEL) ++LDFLAGS += $(QT_MT_LIBS) $(KERNEL_LDFLAGS) -lSalomeNS -L../SUIT -lsuit -lSalomeLifeCycleCORBA -lOpUtil -lSALOMELocalTrace -lwith_loggerTraceCollector -L../Event -lEvent -lSalomeCatalog -lSalomeDSClient $(CAS_KERNEL) + +-LDFLAGSFORBIN= $(LDFLAGS) $(OMNIORB_LIBS) $(HDF5_LIBS) -lqtx -lSalomeContainer -lSalomeResourcesManager -lTOOLSDS -lSalomeHDFPersist -lSalomeDSImpl -lSalomeGenericObj -lRegistry -lSalomeNotification -lSALOMEBasics ++LDFLAGSFORBIN= $(LDFLAGS) $(OMNIORB_LIBS) $(HDF5_LIBS) -L../Qtx -lqtx -lSalomeContainer -lSalomeResourcesManager -lTOOLSDS -lSalomeHDFPersist -lSalomeDSImpl -lSalomeGenericObj -lRegistry -lSalomeNotification -lSALOMEBasics + + PLUGINDIR = $(top_builddir)/bin/salome/styles + MYPLUGINDIR = styles +--- salome-3.2.6/GUI_SRC_3.2.6/src/SalomeApp/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/SalomeApp/Makefile.in 2008-01-15 19:11:06.000000000 -0500 +@@ -88,7 +88,7 @@ + CPPFLAGS+=$(PYTHON_INCLUDES) $(QT_INCLUDES) $(QWT_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) + + LDFLAGS+=$(PYTHON_LIBS) $(QT_MT_LIBS) +-LIBS+= -lsuit -lstd -lCAM -lObjBrowser -lSalomePrs $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSalomeDSClient $(CAS_KERNEL) -lSPlot2d -lGLViewer -lOCCViewer -lVTKViewer -lSalomeObject -lSVTK -lSOCC -lPyInterp -lPythonConsole -lLogWindow -lLightApp -lSalomeContainer -lToolsGUI -lTOOLSDS -lSalomeSession ++LIBS+= -L../SUIT -lsuit -L../STD -lstd -L../CAM -lCAM -L../ObjBrowser -lObjBrowser -L../Prs -lSalomePrs $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSalomeDSClient $(CAS_KERNEL) -L../SPlot2d -lSPlot2d -L../GLViewer -lGLViewer -L../OCCViewer -lOCCViewer -L../VTKViewer -lVTKViewer -L../OBJECT -lSalomeObject -L../SVTK -lSVTK -L../SOCC -lSOCC -L../PyInterp -lPyInterp -L../PythonConsole -lPythonConsole -L../LogWindow -lLogWindow -L../LightApp -lLightApp -lSalomeContainer -L../TOOLSGUI -lToolsGUI -lTOOLSDS -L../Session -lSalomeSession + + @CONCLUDE@ + +--- salome-3.2.6/GUI_SRC_3.2.6/src/SALOME_SWIG/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/SALOME_SWIG/Makefile.in 2008-01-15 21:00:09.000000000 -0500 +@@ -52,6 +52,6 @@ + + CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(BOOST_CPPFLAGS) -DHAVE_CONFIG_H $(KERNEL_CXXFLAGS) + LIBS+= $(PYTHON_LIBS) +-LDFLAGS+= -lSalomeApp ++LDFLAGS+= -L../SalomeApp -lSalomeApp + + @CONCLUDE@ +--- salome-3.2.6/GUI_SRC_3.2.6/src/SALOME_PY/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/SALOME_PY/Makefile.in 2008-01-15 21:47:31.000000000 -0500 +@@ -45,7 +45,7 @@ + SALOME_GenericObj.idl + + CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(OCC_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) -DHAVE_CONFIG_H +-LDFLAGS+= $(PYTHON_LIBS) $(QT_MT_LIBS) $(VTK_LIBS) $(OGL_LIBS) -lSalomeApp -lvtkCommonPython -lvtkGraphicsPython -lvtkImagingPython ++LDFLAGS+= $(PYTHON_LIBS) $(QT_MT_LIBS) $(VTK_LIBS) $(OGL_LIBS) -L../SalomeApp -lSalomeApp -lvtkCommonPython -lvtkGraphicsPython -lvtkImagingPython + # -lVTKViewer + + +--- salome-3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile.in 2008-01-15 22:45:48.000000000 -0500 +@@ -87,7 +87,7 @@ + CPPFLAGS += $(QT_INCLUDES) $(SIP_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(BOOST_CPPFLAGS) -DHAVE_CONFIG_H $(KERNEL_CXXFLAGS) -D__CALL_OLD_METHODS__ + + LIBS += $(PYTHON_LIBS) $(SIP_LIBS) $(PYQT_LIBS) $(VTK_LIBS) $(OGL_LIBS) +-LDFLAGS += -lPyInterp -lSalomeApp ++LDFLAGS += -L../../PyInterp -lPyInterp -L../../SalomeApp -lSalomeApp + + ################################## + +--- salome-3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/Makefile.in 2008-01-15 23:27:13.000000000 -0500 +@@ -122,7 +122,7 @@ + # Compilation/linkage flags + CPPFLAGS += $(QT_INCLUDES) $(SIP_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(BOOST_CPPFLAGS) -DHAVE_CONFIG_H $(KERNEL_CXXFLAGS) + LIBS += $(PYTHON_LIBS) $(SIP_LIBS) $(PYQT_LIBS) $(VTK_LIBS) $(OGL_LIBS) +-LDFLAGS += -lsuit -lCAM -lstd -lqtx -lSalomeApp -lSalomeSession -lEvent -lLogWindow -lVTKViewer -lToolsGUI -lSalomePyQtGUI ++LDFLAGS += -L../../SUIT -lsuit -L../../CAM -lCAM -L../../STD -lstd -L../../Qtx -lqtx -L../../SalomeApp -lSalomeApp -L../../Session -lSalomeSession -L../../Event -lEvent -L../../LogWindow -lLogWindow -L../../VTKViewer -lVTKViewer -L../../TOOLSGUI -lToolsGUI -L../SALOME_PYQT_GUI -lSalomePyQtGUI + + + # Custom build step: generate C++ wrapping according to $(SIP_FILES) +--- salome-3.2.6/GUI_SRC_3.2.6/adm_local/unix/config_files/check_GUI.m4~ 2008-01-15 19:59:11.000000000 -0500 ++++ salome-3.2.6/GUI_SRC_3.2.6/adm_local/unix/config_files/check_GUI.m4 2008-01-15 23:52:57.000000000 -0500 +@@ -44,8 +44,8 @@ + + AC_SUBST(GUI_ROOT_DIR) + +- GUI_LDFLAGS=-L${SALOME_GUI_DIR}/lib${LIB_LOCATION_SUFFIX}/salome +- GUI_CXXFLAGS=-I${SALOME_GUI_DIR}/include/salome ++ GUI_LDFLAGS="-L${SALOME_GUI_DIR}/lib${LIB_LOCATION_SUFFIX}/salome -L${SALOME_GUI_DIR}/src/OBJECT -L${SALOME_GUI_DIR}/src/Qtx -L${SALOME_GUI_DIR}/src/SUIT -L${SALOME_GUI_DIR}/src/SalomeApp -L${SALOME_GUI_DIR}/src/OCCViewer -L${SALOME_GUI_DIR}/src/VTKViewer -L${SALOME_GUI_DIR}/src/CAM -L${SALOME_GUI_DIR}/src/SOCC -L${SALOME_GUI_DIR}/src/SVTK -L${SALOME_GUI_DIR}/src/TOOLSGUI -L${SALOME_GUI_DIR}/src/Event -L${SALOME_GUI_DIR}/src/SUPERVGraph" ++ GUI_CXXFLAGS="-I${SALOME_GUI_DIR}/include/salome -I${SALOME_GUI_DIR}/src/Qtx" + + AC_SUBST(GUI_LDFLAGS) + AC_SUBST(GUI_CXXFLAGS) +--- salome-3.2.6/GEOM_SRC_3.2.6/src/NMTTools/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/NMTTools/Makefile.in 2008-01-16 07:37:12.000000000 -0500 +@@ -129,7 +129,7 @@ + + CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) + CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) +-LDFLAGS += $(CAS_LDPATH) -lTKBool -lTKBO -lNMTDS $(KERNEL_LDFLAGS) ++LDFLAGS += $(CAS_LDPATH) -lTKBool -lTKBO -L../NMTDS -lNMTDS $(KERNEL_LDFLAGS) + + %_moc.cxx: %.h + $(MOC) $< -o $@ +--- salome-3.2.6/GEOM_SRC_3.2.6/src/NMTAlgo/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/NMTAlgo/Makefile.in 2008-01-16 07:38:35.000000000 -0500 +@@ -62,7 +62,7 @@ + + CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) + CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) +-LDFLAGS += $(CAS_LDPATH) -lTKBool -lTKBO -lNMTTools $(KERNEL_LDFLAGS) ++LDFLAGS += $(CAS_LDPATH) -lTKBool -lTKBO -L../NMTTools -lNMTTools $(KERNEL_LDFLAGS) + + %_moc.cxx: %.h + $(MOC) $< -o $@ +--- salome-3.2.6/GEOM_SRC_3.2.6/src/GEOMImpl/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/GEOMImpl/Makefile.in 2008-01-16 07:51:25.000000000 -0500 +@@ -114,7 +114,7 @@ + # additionnal information to compil and link file + CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) $(BOOST_CPPFLAGS) + CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) +-LDFLAGS += $(KERNEL_LDFLAGS) $(CAS_LDPATH) -lTKCAF -lTKFillet -lTKOffset -lGEOMbasic -lNMTAlgo -lGEOMAlgo -lShHealOper ++LDFLAGS += $(KERNEL_LDFLAGS) $(CAS_LDPATH) -lTKCAF -lTKFillet -lTKOffset -L../GEOM -lGEOMbasic -L../NMTAlgo -lNMTAlgo -L../GEOMAlgo -lGEOMAlgo -L../ShHealOper -lShHealOper + + + # additional file to be cleaned +--- salome-3.2.6/GEOM_SRC_3.2.6/src/GEOM_I/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/GEOM_I/Makefile.in 2008-01-16 08:13:40.000000000 -0500 +@@ -86,7 +86,7 @@ + # additionnal information to compil and link file + CPPFLAGS += $(OCC_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) + CXXFLAGS += $(OCC_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) +-LDFLAGS += -lGEOMArchimede -lGEOMbasic -lGEOMimpl -lGEOMSketcher \ ++LDFLAGS += -L../ARCHIMEDE -lGEOMArchimede -L../GEOM -lGEOMbasic -L../GEOMImpl -lGEOMimpl -L../SKETCHER -lGEOMSketcher \ + $(CAS_DATAEXCHANGE) $(CAS_LDPATH) -lTKFillet -lTKOffset \ + $(KERNEL_LDFLAGS) -lSalomeNS -lSalomeContainer -lSalomeGenericObj -lTOOLSDS + +--- salome-3.2.6/GEOM_SRC_3.2.6/src/GEOMGUI/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/GEOMGUI/Makefile.in 2008-01-16 08:51:04.000000000 -0500 +@@ -74,6 +74,6 @@ + CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + CXXFLAGS += $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + +-LDFLAGS += -lGEOMFiltersSelection $(KERNEL_LDFLAGS) $(GUI_LDFLAGS) -lOCCViewer -lVTKViewer -lSalomeApp -lCAM -lGEOMClient -lSOCC -lSVTK -lGEOMObject -lToolsGUI -lEvent ++LDFLAGS += -L../GEOMFiltersSelection -lGEOMFiltersSelection $(KERNEL_LDFLAGS) $(GUI_LDFLAGS) -lOCCViewer -lVTKViewer -lSalomeApp -lCAM -L../GEOMClient -lGEOMClient -lSOCC -lSVTK -L../OBJECT -lGEOMObject -lToolsGUI -lEvent + + @CONCLUDE@ +--- salome-3.2.6/GEOM_SRC_3.2.6/src/GEOMBase/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/GEOMBase/Makefile.in 2008-01-16 09:00:18.000000000 -0500 +@@ -67,6 +67,6 @@ + CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + CXXFLAGS += $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + +-LDFLAGS += $(KERNEL_LDFLAGS) $(GUI_LDFLAGS) -lDlgRef -lGEOM -lsuit -lOCCViewer -lVTKViewer $(CAS_LDPATH) -lTKPrim ++LDFLAGS += $(KERNEL_LDFLAGS) $(GUI_LDFLAGS) -L../DlgRef -lDlgRef -L../GEOMGUI -lGEOM -lsuit -lOCCViewer -lVTKViewer $(CAS_LDPATH) -lTKPrim + + @CONCLUDE@ +--- salome-3.2.6/GEOM_SRC_3.2.6/src/GEOMToolsGUI/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/GEOMToolsGUI/Makefile.in 2008-01-16 09:06:21.000000000 -0500 +@@ -60,6 +60,6 @@ + CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + CXXFLAGS += $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + +-LDFLAGS += $(KERNEL_LDFLAGS) $(GUI_LDFLAGS) -lGEOMBase -lVTKViewer -lOCCViewer -lsuit -lSalomeApp ++LDFLAGS += $(KERNEL_LDFLAGS) $(GUI_LDFLAGS) -L../GEOMBase -lGEOMBase -lVTKViewer -lOCCViewer -lsuit -lSalomeApp + + @CONCLUDE@ +--- salome-3.2.6/GEOM_SRC_3.2.6/src/DisplayGUI/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/DisplayGUI/Makefile.in 2008-01-16 09:14:45.000000000 -0500 +@@ -53,6 +53,6 @@ + CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + +-LDFLAGS += -lGEOM ++LDFLAGS += -L../GEOMGUI -lGEOM + + @CONCLUDE@ +--- salome-3.2.6/GEOM_SRC_3.2.6/src/BasicGUI/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/BasicGUI/Makefile.in 2008-01-16 09:25:02.000000000 -0500 +@@ -73,6 +73,6 @@ + CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + +-LDFLAGS += -lGEOMFiltersSelection -lGEOMBase -lGEOM ++LDFLAGS += -L../GEOMFiltersSelection -lGEOMFiltersSelection -L../GEOMBase -lGEOMBase -L../GEOMGUI -lGEOM + + @CONCLUDE@ +--- salome-3.2.6/GEOM_SRC_3.2.6/src/PrimitiveGUI/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/PrimitiveGUI/Makefile.in 2008-01-16 09:34:48.000000000 -0500 +@@ -63,6 +63,6 @@ + CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + +-LDFLAGS += -lGEOMFiltersSelection -lGEOMBase ++LDFLAGS += -L../GEOMFiltersSelection -lGEOMFiltersSelection -L../GEOMBase -lGEOMBase + + @CONCLUDE@ +--- salome-3.2.6/GEOM_SRC_3.2.6/src/GenerationGUI/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/GenerationGUI/Makefile.in 2008-01-16 09:39:38.000000000 -0500 +@@ -61,6 +61,6 @@ + CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + +-LDFLAGS += -lGEOMFiltersSelection -lGEOMBase $(CAS_LDPATH) -lTKOffset ++LDFLAGS += -L../GEOMFiltersSelection -lGEOMFiltersSelection -L../GEOMBase -lGEOMBase $(CAS_LDPATH) -lTKOffset + + @CONCLUDE@ +--- salome-3.2.6/GEOM_SRC_3.2.6/src/EntityGUI/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/EntityGUI/Makefile.in 2008-01-16 09:44:39.000000000 -0500 +@@ -83,6 +83,6 @@ + CPPFLAGS += $(QT_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + +-LDFLAGS += -lGEOMFiltersSelection -lGEOMSketcher -lGEOMBase -lGEOM ++LDFLAGS += -L../GEOMFiltersSelection -lGEOMFiltersSelection -L../SKETCHER -lGEOMSketcher -L../GEOMBase -lGEOMBase -L../GEOMGUI -lGEOM + + @CONCLUDE@ +--- salome-3.2.6/GEOM_SRC_3.2.6/src/BuildGUI/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/BuildGUI/Makefile.in 2008-01-16 09:49:57.000000000 -0500 +@@ -65,6 +65,6 @@ + CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + +-LDFLAGS += -lGEOMFiltersSelection -lGEOMBase ++LDFLAGS += -L../GEOMFiltersSelection -lGEOMFiltersSelection -L../GEOMBase -lGEOMBase + + @CONCLUDE@ +--- salome-3.2.6/GEOM_SRC_3.2.6/src/BooleanGUI/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/BooleanGUI/Makefile.in 2008-01-16 09:53:58.000000000 -0500 +@@ -55,6 +55,6 @@ + CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + +-LDFLAGS += -lGEOMBase ++LDFLAGS += -L../GEOMBase -lGEOMBase + + @CONCLUDE@ +--- salome-3.2.6/GEOM_SRC_3.2.6/src/TransformationGUI/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/TransformationGUI/Makefile.in 2008-01-16 09:58:21.000000000 -0500 +@@ -69,6 +69,6 @@ + CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + +-LDFLAGS += -lGEOMFiltersSelection -lGEOMBase ++LDFLAGS += -L../GEOMFiltersSelection -lGEOMFiltersSelection -L../GEOMBase -lGEOMBase + + @CONCLUDE@ +--- salome-3.2.6/GEOM_SRC_3.2.6/src/OperationGUI/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/OperationGUI/Makefile.in 2008-01-16 10:04:15.000000000 -0500 +@@ -65,6 +65,6 @@ + CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + +-LDFLAGS += $(CAS_LDPATH) -lTKFillet -lGEOMBase ++LDFLAGS += $(CAS_LDPATH) -lTKFillet -L../GEOMBase -lGEOMBase + + @CONCLUDE@ +--- salome-3.2.6/GEOM_SRC_3.2.6/src/RepairGUI/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/RepairGUI/Makefile.in 2008-01-16 10:08:55.000000000 -0500 +@@ -75,6 +75,6 @@ + CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + +-LDFLAGS += -lGEOMBase ++LDFLAGS += -L../GEOMBase -lGEOMBase + + @CONCLUDE@ +--- salome-3.2.6/GEOM_SRC_3.2.6/src/MeasureGUI/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/MeasureGUI/Makefile.in 2008-01-16 10:16:02.000000000 -0500 +@@ -87,6 +87,6 @@ + CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + +-LDFLAGS += -lGEOMBase ++LDFLAGS += -L../GEOMBase -lGEOMBase + + @CONCLUDE@ +--- salome-3.2.6/GEOM_SRC_3.2.6/src/GroupGUI/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/GroupGUI/Makefile.in 2008-01-16 10:25:17.000000000 -0500 +@@ -55,6 +55,6 @@ + CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + +-LDFLAGS += -lGEOMFiltersSelection -lGEOMBase ++LDFLAGS += -L../GEOMFiltersSelection -lGEOMFiltersSelection -L../GEOMBase -lGEOMBase + + @CONCLUDE@ +--- salome-3.2.6/GEOM_SRC_3.2.6/src/BlocksGUI/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/BlocksGUI/Makefile.in 2008-01-16 10:43:41.000000000 -0500 +@@ -63,6 +63,6 @@ + CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + +-LDFLAGS += -lGEOMFiltersSelection -lGEOMBase ++LDFLAGS += -L../GEOMFiltersSelection -lGEOMFiltersSelection -L../GEOMBase -lGEOMBase + + @CONCLUDE@ +--- salome-3.2.6/GEOM_SRC_3.2.6/src/GEOM_I_Superv/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/GEOM_I_Superv/Makefile.in 2008-01-16 10:52:35.000000000 -0500 +@@ -53,7 +53,7 @@ + # additionnal information to compil and link file + CPPFLAGS += $(OCC_INCLUDES) $(QT_INCLUDES) $(KERNEL_CXXFLAGS) $(BOOST_CPPFLAGS) + CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) +-LDFLAGS += -lGEOMEngine -lSalomeNS -lSalomeLifeCycleCORBA -lSalomeContainer $(KERNEL_LDFLAGS) -lSalomeGenericObj ++LDFLAGS += -L../GEOM_I -lGEOMEngine -lSalomeNS -lSalomeLifeCycleCORBA -lSalomeContainer $(KERNEL_LDFLAGS) -lSalomeGenericObj + + # additional file to be cleaned + MOSTLYCLEAN = +--- salome-3.2.6/GEOM_SRC_3.2.6/src/GEOM_SWIG/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/GEOM_SWIG/Makefile.in 2008-01-16 11:07:49.000000000 -0500 +@@ -84,8 +84,8 @@ + EXPORT_SHAREDPYSCRIPTS=\ + GEOM_shared_modules.py + +-CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) -DHAVE_CONFIG_H ++CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(KERNEL_CXXFLAGS) -DHAVE_CONFIG_H + LIBS+= $(PYTHON_LIBS) +-LDFLAGS+= -lGEOM ++LDFLAGS+= -L../GEOMGUI -lGEOM + + @CONCLUDE@ +--- salome-3.2.6/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Wrapper/Makefile.in~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Wrapper/Makefile.in 2008-01-16 16:50:15.000000000 -0500 +@@ -49,7 +49,7 @@ + + CPPFLAGS+= -D@MACHINE@ $(BOOST_CPPFLAGS) $(HDF5_INCLUDES) + +-LDFLAGS+= $(HDF5_LIBS) -lMEDWrapperBase -lmed_V2_1 ++LDFLAGS+= $(HDF5_LIBS) -L../../Base -lMEDWrapperBase -L../Core -lmed_V2_1 + + LDFLAGSFORBIN=$(LDFLAGS) + +--- salome-3.2.6/MED_SRC_3.2.6/src/MEDWrapper/V2_2/Makefile.in~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/MED_SRC_3.2.6/src/MEDWrapper/V2_2/Makefile.in 2008-01-16 16:53:32.000000000 -0500 +@@ -49,6 +49,6 @@ + + CPPFLAGS+= $(BOOST_CPPFLAGS) $(MED2_INCLUDES) + +-LDFLAGS+= $(MED2_LIBS) $(HDF5_LIBS) -lMEDWrapperBase ++LDFLAGS+= $(MED2_LIBS) $(HDF5_LIBS) -L../Base -lMEDWrapperBase + + @CONCLUDE@ +--- salome-3.2.6/MED_SRC_3.2.6/src/MEDWrapper/Factory/Makefile.in~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/MED_SRC_3.2.6/src/MEDWrapper/Factory/Makefile.in 2008-01-16 17:28:42.000000000 -0500 +@@ -49,8 +49,8 @@ + + CPPFLAGS+= $(BOOST_CPPFLAGS) $(MED2_INCLUDES) + +-LDFLAGS+= -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 ++LDFLAGS+= -L../V2_2 -lMEDWrapper_V2_2 -L../V2_1/Wrapper -lMEDWrapper_V2_1 + +-LDFLAGSFORBIN=$(LDFLAGS) -lMEDWrapperBase $(BOOST_LIBS) -lboost_thread${BOOST_LIBSUFFIX} -lmed_V2_1 ++LDFLAGSFORBIN=$(LDFLAGS) -L../Base -lMEDWrapperBase $(BOOST_LIBS) -lboost_thread${BOOST_LIBSUFFIX} -L../V2_1/Core -lmed_V2_1 + + @CONCLUDE@ +--- salome-3.2.6/MED_SRC_3.2.6/src/MEDMEM/Makefile.in~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/MED_SRC_3.2.6/src/MEDMEM/Makefile.in 2008-01-16 17:37:22.000000000 -0500 +@@ -170,11 +170,11 @@ + CXXFLAGS+=@CXXTMPDPTHFLAGS@ + #LDFLAGS+=$(MED2_LIBS) $(HDF5_LIBS) + # change motivated by the bug KERNEL4778. +-LDFLAGS+=$(MED2_LIBS) $(HDF5_LIBS) -lmed_V2_1 $(STDLIB) ++LDFLAGS+=$(MED2_LIBS) $(HDF5_LIBS) -L../MEDWrapper/V2_1/Core -lmed_V2_1 $(STDLIB) + + #LDFLAGSFORBIN+=$(MED2_LIBS) $(HDF5_LIBS) + # change motivated by the bug KERNEL4778. +-LDFLAGSFORBIN+=-lm $(MED2_LIBS) $(HDF5_LIBS) -lmed_V2_1 ++LDFLAGSFORBIN+=-lm $(MED2_LIBS) $(HDF5_LIBS) -L../MEDWrapper/V2_1/Core -lmed_V2_1 + + ifeq ($(MED_WITH_KERNEL),yes) + CPPFLAGS+= ${KERNEL_CXXFLAGS} +--- salome-3.2.6/MED_SRC_3.2.6/src/INTERPOLATION/Makefile.in~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/MED_SRC_3.2.6/src/INTERPOLATION/Makefile.in 2008-01-16 17:43:00.000000000 -0500 +@@ -82,10 +82,10 @@ + CPPFLAGS+=-U_DEBUG_ $(MED2_INCLUDES) $(HDF5_INCLUDES) -I../ + CXXFLAGS+=-U_DEBUG_ @CXXTMPDPTHFLAGS@ + #LDFLAGS+=$(MED2_LIBS) $(HDF5_LIBS) +-LDFLAGS+=-lm $(MED2_LIBS) $(HDF5_LIBS) -lmed_V2_1 ++LDFLAGS+=-lm $(MED2_LIBS) $(HDF5_LIBS) -L../MEDWrapper/V2_1/Core -lmed_V2_1 + + #LDFLAGSFORBIN+=$(MED2_LIBS) $(HDF5_LIBS) -L../.libs -lmedmem +-LDFLAGSFORBIN+=-lm $(MED2_LIBS) $(HDF5_LIBS) -L../.libs -lmedmem -lmed_V2_1 ++LDFLAGSFORBIN+=-lm $(MED2_LIBS) $(HDF5_LIBS) -L../.libs -L../MEDMEM -lmedmem -L../MEDWrapper/V2_1/Core -lmed_V2_1 + + ifeq ($(MED_WITH_KERNEL),yes) + CPPFLAGS+= ${KERNEL_CXXFLAGS} +--- salome-3.2.6/MED_SRC_3.2.6/src/MEDMEM_SWIG/Makefile.in~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/MED_SRC_3.2.6/src/MEDMEM_SWIG/Makefile.in 2008-01-16 17:44:11.000000000 -0500 +@@ -96,7 +96,7 @@ + CPPFLAGS+= $(PYTHON_INCLUDES) $(MED2_INCLUDES) $(HDF5_INCLUDES) + CXXFLAGS+= @CXXTMPDPTHFLAGS@ + LIBS= $(PYTHON_LIBS) +-LDFLAGS+= -lmedmem $(MED2_LIBS) $(HDF5_LIBS) ++LDFLAGS+= -L../MEDMEM -lmedmem $(MED2_LIBS) $(HDF5_LIBS) + + ifeq ($(MED_WITH_KERNEL),yes) + CPPFLAGS+= ${KERNEL_CXXFLAGS} +--- salome-3.2.6/MED_SRC_3.2.6/src/MEDMEM_I/Makefile.in~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/MED_SRC_3.2.6/src/MEDMEM_I/Makefile.in 2008-01-16 18:12:10.000000000 -0500 +@@ -66,7 +66,7 @@ + + CPPFLAGS+= $(MED2_INCLUDES) $(HDF5_INCLUDES) ${KERNEL_CXXFLAGS} + CXXFLAGS+= ${KERNEL_CXXFLAGS} +-LDFLAGS+=$(MED2_LIBS) $(HDF5_LIBS) -lmedmem ${KERNEL_LDFLAGS} -lSALOMELocalTrace -lSalomeCommunication -lSalomeGenericObj ++LDFLAGS+=$(MED2_LIBS) $(HDF5_LIBS) -L../MEDMEM -lmedmem ${KERNEL_LDFLAGS} -lSALOMELocalTrace -lSalomeCommunication -lSalomeGenericObj + #LDFLAGS+=-lmedmem -L. -lSalomeContainer -lSalomeNS -lRegistry -lOpUtil -lSalomeNotification + # does we put only -lSalomeContainer and compiler retrieves -lSalomeNS -lRegistry -lOpUtil ???? + +--- salome-3.2.6/MED_SRC_3.2.6/src/MED/Makefile.in~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/MED_SRC_3.2.6/src/MED/Makefile.in 2008-01-16 18:31:32.000000000 -0500 +@@ -62,7 +62,7 @@ + CXXFLAGS += $(OCC_CXXFLAGS) ${KERNEL_CXXFLAGS} + + LDFLAGS+= $(OCC_LIBS) $(HDF5_LIBS) ${KERNEL_LDFLAGS} \ +- -lSalomeContainer -lSalomeHDFPersist -lSalomeDS -lSalomeNS -lRegistry -lOpUtil -lMEDMEMImpl ++ -lSalomeContainer -lSalomeHDFPersist -lSalomeDS -lSalomeNS -lRegistry -lOpUtil -L../MEDMEM_I -lMEDMEMImpl + + MED.hh MEDSK.cc: MED.idl + omniidl -bcxx -Wbtp -I$(top_builddir)/idl -I${KERNEL_ROOT_DIR}/idl/salome $^ +--- salome-3.2.6/MED_SRC_3.2.6/src/MedClient/src/Makefile.in~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/MED_SRC_3.2.6/src/MedClient/src/Makefile.in 2008-01-16 19:31:42.000000000 -0500 +@@ -98,7 +98,7 @@ + + CPPFLAGS+= $(MED2_INCLUDES) $(HDF5_INCLUDES) $(PYTHON_INCLUDES) ${KERNEL_CXXFLAGS} -I$(srcdir)/../../MEDMEM_I + CXXFLAGS+=${KERNEL_CXXFLAGS} +-LDFLAGS+=${KERNEL_LDFLAGS} -lOpUtil -lMedCorba_Swigcmodule -lmedmem ++LDFLAGS+=${KERNEL_LDFLAGS} -lOpUtil -L../../MedCorba_Swig -lMedCorba_Swigcmodule -L../../MEDMEM -lmedmem + + MED.hh MEDSK.cc: MED.idl + omniidl -bcxx -Wbtp -I$(top_builddir)/idl -I${KERNEL_ROOT_DIR}/idl/salome $^ +--- salome-3.2.6/MED_SRC_3.2.6/src/MedClient/test/test2/Makefile.in~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/MED_SRC_3.2.6/src/MedClient/test/test2/Makefile.in 2008-01-16 20:17:29.000000000 -0500 +@@ -46,7 +46,7 @@ + LDFLAGSFORBIN= -L$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/salome + + CPPFLAGS += ${MED2_INCLUDES} ${HDF5_INCLUDES} ${PYTHON_INCLUDES} ${KERNEL_CXXFLAGS} +-LIBS = ${KERNEL_LDFLAGS} -lMEDClientcmodule -lMEDMEM_Swigcmodule -lmedmem -lMEDMEMImpl ${MED2_LIBS} ${HDF5_LIBS} ++LIBS = ${KERNEL_LDFLAGS} -L../../src -lMEDClientcmodule -L../../../MEDMEM_SWIG -lMEDMEM_Swigcmodule -L../../../MEDMEM -lmedmem -L../../../MEDMEM_I -lMEDMEMImpl ${MED2_LIBS} ${HDF5_LIBS} + + # Executables targets + +--- salome-3.2.6/MED_SRC_3.2.6/src/MEDGUI/Makefile.in~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/MED_SRC_3.2.6/src/MEDGUI/Makefile.in 2008-01-16 20:32:15.000000000 -0500 +@@ -60,7 +60,7 @@ + + CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) ${KERNEL_CXXFLAGS} ${GUI_CXXFLAGS} ${BOOST_CPPFLAGS} + +-LDFLAGS += -lSalomeApp -lMEDMEMImpl -lmedmem -lMEDEngine ${KERNEL_LDFLAGS} ${GUI_LDFLAGS} ++LDFLAGS += -lSalomeApp -L../MEDMEM_I -lMEDMEMImpl -L../MEDMEM -lmedmem -L../MED -lMEDEngine ${KERNEL_LDFLAGS} ${GUI_LDFLAGS} + + MED.hh MEDSK.cc: MED.idl + omniidl -bcxx -Wbtp -I$(top_builddir)/idl -I${KERNEL_ROOT_DIR}/idl/salome $^ +--- salome-3.2.6/SUPERV_SRC_3.2.6/src/GraphEditor/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/SUPERV_SRC_3.2.6/src/GraphEditor/Makefile.in 2008-01-17 07:00:03.000000000 -0500 +@@ -62,7 +62,7 @@ + $(KERNEL_CXXFLAGS) + CXXFLAGS+= -g -D__x86__ -D__linux__ -ftemplate-depth-42 -Wall \ + $(KERNEL_CXXFLAGS) +-LDFLAGS+= -lSalomeNS -lSalomeLifeCycleCORBA -lSalomeSuperVisionBase -lOpUtil -lSALOMELocalTrace \ ++LDFLAGS+= -lSalomeNS -lSalomeLifeCycleCORBA -L../GraphBase -lSalomeSuperVisionBase -lOpUtil -lSALOMELocalTrace \ + -lc $(QT_MT_LIBS) $(OGL_LIBS) $(KERNEL_LDFLAGS) + #LIBS += -Xlinker -export-dynamic $(PYTHON_LIBS) + +--- salome-3.2.6/SUPERV_SRC_3.2.6/src/GraphExecutor/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/SUPERV_SRC_3.2.6/src/GraphExecutor/Makefile.in 2008-01-17 07:15:31.000000000 -0500 +@@ -72,7 +72,7 @@ + CXXFLAGS+= -DREDHAT + endif + +-LDFLAGS+= -export-dynamic -lSalomeNS -lSalomeLifeCycleCORBA -lSalomeSuperVisionBase -lSalomeSuperVisionEditor -lOpUtil -lSALOMELocalTrace\ ++LDFLAGS+= -export-dynamic -lSalomeNS -lSalomeLifeCycleCORBA -L../GraphBase -lSalomeSuperVisionBase -L../GraphEditor -lSalomeSuperVisionEditor -lOpUtil -lSALOMELocalTrace\ + -lc $(QT_MT_LIBS) $(OGL_LIBS) \ + $(KERNEL_LDFLAGS) + #LIBS += -Xlinker -export-dynamic $(PYTHON_LIBS) +--- salome-3.2.6/SUPERV_SRC_3.2.6/src/Supervision/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/SUPERV_SRC_3.2.6/src/Supervision/Makefile.in 2008-01-17 07:23:39.000000000 -0500 +@@ -92,7 +92,7 @@ + $(KERNEL_CXXFLAGS) + CXXFLAGS += -g -D__x86__ -D__linux__ -ftemplate-depth-42 -Wall \ + $(KERNEL_CXXFLAGS) $(SUPERV_LDFLAGS) +-LDFLAGS+= -lSalomeSuperVisionEditor -lSalomeSuperVisionExecutor -lSalomeSuperVisionBase \ ++LDFLAGS+= -L../GraphEditor -lSalomeSuperVisionEditor -L../GraphExecutor -lSalomeSuperVisionExecutor -L../GraphBase -lSalomeSuperVisionBase \ + -lSalomeContainer -lSalomeNotification -lSalomeNS -lSalomeLifeCycleCORBA \ + -lOpUtil -lRegistry -lTOOLSDS -lSALOMELocalTrace \ + $(QT_MT_LIBS) $(KERNEL_LDFLAGS) +--- salome-3.2.6/MED_SRC_3.2.6/src/MedCorba_Swig/Makefile.in~ 2008-01-17 07:35:01.000000000 -0500 ++++ salome-3.2.6/MED_SRC_3.2.6/src/MedCorba_Swig/Makefile.in 2008-01-17 07:41:24.000000000 -0500 +@@ -73,7 +73,7 @@ + LIBS= $(PYTHON_LIBS) + #LDFLAGS+=$(MED2_LIBS) $(HDF5_LIBS) -lMEDMEMImpl -lmedmem -lMEDMEM_Swigcmodule ${KERNEL_LDFLAGS} -lSalomeLoggerServer ${KERNEL_LDFLAGS} + # change motivated by the bug KERNEL4778. +-LDFLAGS+=$(MED2_LIBS) $(HDF5_LIBS) -lMEDMEMImpl -lmedmem -lMEDMEM_Swigcmodule ${KERNEL_LDFLAGS} -lSALOMELocalTrace -lMEDEngine ++LDFLAGS+=$(MED2_LIBS) $(HDF5_LIBS) -L../MEDMEM_I -lMEDMEMImpl -L../MEDMEM -lmedmem -L../MEDMEM_SWIG -lMEDMEM_Swigcmodule ${KERNEL_LDFLAGS} -lSALOMELocalTrace -L../MED -lMEDEngine + + ############################################################################# + +--- salome-3.2.6/HELLO_SRC_3.2.6/src/HELLOGUI/Makefile.in~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/HELLO_SRC_3.2.6/src/HELLOGUI/Makefile.in 2008-01-17 08:40:19.000000000 -0500 +@@ -44,7 +44,7 @@ + + CPPFLAGS += $(QT_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +-LDFLAGS += -lSalomeApp -lHELLOEngine $(KERNEL_LDFLAGS) $(GUI_LDFLAGS) ++LDFLAGS += -lSalomeApp -L../HELLO -lHELLOEngine $(KERNEL_LDFLAGS) $(GUI_LDFLAGS) + + + +--- salome-3.2.6/SMESH_SRC_3.2.6/src/SMESHDS/Makefile.in~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/SMESHDS/Makefile.in 2008-01-17 08:47:15.000000000 -0500 +@@ -72,7 +72,7 @@ + # additionnal information to compil and link file + CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) $(BOOST_CPPFLAGS) + CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) +-LDFLAGS += $(OCC_KERNEL_LIBS) -lSMDS ++LDFLAGS += $(OCC_KERNEL_LIBS) -L../SMDS -lSMDS + + + # additional file to be cleaned +--- salome-3.2.6/SMESH_SRC_3.2.6/src/Controls/Makefile.in~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/Controls/Makefile.in 2008-01-17 08:53:18.000000000 -0500 +@@ -45,7 +45,7 @@ + + CPPFLAGS+=$(OCC_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) + +-LDFLAGS+=$(OCC_KERNEL_LIBS) $(KERNEL_LDFLAGS) -lOpUtil -lSMDS -lTKBRep -lTKG3d -lTKGeomAlgo ++LDFLAGS+=$(OCC_KERNEL_LIBS) $(KERNEL_LDFLAGS) -lOpUtil -L../SMDS -lSMDS -lTKBRep -lTKG3d -lTKGeomAlgo + + LDFLAGSFORBIN += -lSMDS $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSALOMEBasics $(OCC_KERNEL_LIBS) -lTKBRep -lTKG3d -lTKGeomAlgo + +--- salome-3.2.6/SMESH_SRC_3.2.6/src/Driver/Makefile.in~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/Driver/Makefile.in 2008-01-17 08:59:57.000000000 -0500 +@@ -51,7 +51,7 @@ + CPPFLAGS += + CXXFLAGS += + +-LDFLAGS += $(OCC_KERNEL_LIBS) -lTKTopAlgo -lSMESHDS $(KERNEL_LDFLAGS) -lOpUtil ++LDFLAGS += $(OCC_KERNEL_LIBS) -lTKTopAlgo -L../SMESHDS -lSMESHDS $(KERNEL_LDFLAGS) -lOpUtil + + + @CONCLUDE@ +--- salome-3.2.6/SMESH_SRC_3.2.6/src/DriverMED/Makefile.in~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/DriverMED/Makefile.in 2008-01-17 09:14:29.000000000 -0500 +@@ -61,9 +61,9 @@ + # additionnal information to compil and link file + CPPFLAGS += $(OCC_INCLUDES) $(MED_CXXFLAGS) $(BOOST_CPPFLAGS) + CXXFLAGS += $(OCC_CXXFLAGS) $(HDF5_INCLUDES) $(KERNEL_CXXFLAGS) +-LDFLAGS += -lMeshDriver $(MED_LDFLAGS) -lMEDWrapper ++LDFLAGS += -L../Driver -lMeshDriver $(MED_LDFLAGS) -lMEDWrapper + +-LDFLAGSFORBIN += -lMeshDriver -lSMDS -lSMESHDS $(KERNEL_LDFLAGS) $(MED_LDFLAGS) -lMEDWrapper -lMEDWrapperBase -lMEDWrapper_V2_1 -lmed_V2_1 -lMEDWrapper_V2_2 -lOpUtil -lSALOMELocalTrace -lSALOMEBasics ++LDFLAGSFORBIN += -L../Driver -lMeshDriver -L../SMDS -lSMDS -L../SMESHDS -lSMESHDS $(KERNEL_LDFLAGS) $(MED_LDFLAGS) -lMEDWrapper -lMEDWrapperBase -lMEDWrapper_V2_1 -lmed_V2_1 -lMEDWrapper_V2_2 -lOpUtil -lSALOMELocalTrace -lSALOMEBasics + + @CONCLUDE@ + +--- salome-3.2.6/SMESH_SRC_3.2.6/src/DriverDAT/Makefile.in~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/DriverDAT/Makefile.in 2008-01-17 09:44:23.000000000 -0500 +@@ -51,9 +51,9 @@ + # additionnal information to compil and link file + CPPFLAGS += $(KERNEL_CXXFLAGS) $(OCC_INCLUDES) $(BOOST_CPPFLAGS) + CXXFLAGS += $(KERNEL_CXXFLAGS) +-LDFLAGS += -lMeshDriver $(OCC_KERNEL_LIBS) ++LDFLAGS += -L../Driver -lMeshDriver $(OCC_KERNEL_LIBS) + +-LDFLAGSFORBIN += -lMeshDriver -lSMDS $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSALOMEBasics ++LDFLAGSFORBIN += -L../Driver -lMeshDriver -L../SMDS -lSMDS $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSALOMEBasics + + @CONCLUDE@ + +--- salome-3.2.6/SMESH_SRC_3.2.6/src/DriverUNV/Makefile.in~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/DriverUNV/Makefile.in 2008-01-17 09:46:04.000000000 -0500 +@@ -63,9 +63,9 @@ + # additionnal information to compil and link file + CPPFLAGS += $(KERNEL_CXXFLAGS) $(OCC_INCLUDES) $(BOOST_CPPFLAGS) + CXXFLAGS += $(KERNEL_CXXFLAGS) +-LDFLAGS += -lMeshDriver $(OCC_KERNEL_LIBS) ++LDFLAGS += -L../Driver -lMeshDriver $(OCC_KERNEL_LIBS) + +-LDFLAGSFORBIN += -lMeshDriver -lSMDS $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSALOMEBasics ++LDFLAGSFORBIN += -L../Driver -lMeshDriver -L../SMDS -lSMDS $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSALOMEBasics + + @CONCLUDE@ + +--- salome-3.2.6/SMESH_SRC_3.2.6/src/DriverSTL/Makefile.in~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/DriverSTL/Makefile.in 2008-01-17 09:47:45.000000000 -0500 +@@ -51,9 +51,9 @@ + # additionnal information to compil and link file + CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) $(BOOST_CPPFLAGS) + CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) +-LDFLAGS += $(OCC_KERNEL_LIBS) -lMeshDriver -lTKSTL -lTKTopAlgo -lTKMesh ++LDFLAGS += $(OCC_KERNEL_LIBS) -L../Driver -lMeshDriver -lTKSTL -lTKTopAlgo -lTKMesh + +-LDFLAGSFORBIN += -lMeshDriver -lSMDS $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSALOMEBasics $(OCC_KERNEL_LIBS) -lTKSTL -lTKTopAlgo -lTKMesh -lTKBO ++LDFLAGSFORBIN += -L../Driver -lMeshDriver -L../SMDS -lSMDS $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSALOMEBasics $(OCC_KERNEL_LIBS) -lTKSTL -lTKTopAlgo -lTKMesh -lTKBO + + @CONCLUDE@ + +--- salome-3.2.6/SMESH_SRC_3.2.6/src/SMESH/Makefile.in~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/SMESH/Makefile.in 2008-01-17 09:50:50.000000000 -0500 +@@ -95,7 +95,7 @@ + $(MED_CXXFLAGS) $(GEOM_CXX_FLAGS) $(BOOST_CPPFLAGS) + CXXFLAGS+= $(OCC_CXXFLAGS) $(HDF5_INCLUDES) $(KERNEL_CXXFLAGS) \ + $(MED_CXXFLAGS) $(GEOM_CXX_FLAGS) +-LDFLAGS+= $(KERNEL_LDFLAGS) $(GEOM_LDFLAGS) $(MED_LDFLAGS) -lNMTTools -lSMESHDS -lMeshDriverDAT -lMeshDriverSTL -lMeshDriverMED -lMeshDriverUNV @CAS_LDPATH@ -lTKShHealing ++LDFLAGS+= $(KERNEL_LDFLAGS) $(GEOM_LDFLAGS) $(MED_LDFLAGS) -lNMTTools -L../SMESHDS -lSMESHDS -L../DriverDAT -lMeshDriverDAT -L../DriverSTL -lMeshDriverSTL -L../DriverMED -lMeshDriverMED -L../DriverUNV -lMeshDriverUNV @CAS_LDPATH@ -lTKShHealing + + @CONCLUDE@ + +--- salome-3.2.6/SMESH_SRC_3.2.6/src/SMESH_I/Makefile.in~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/SMESH_I/Makefile.in 2008-01-17 10:10:28.000000000 -0500 +@@ -127,8 +127,8 @@ + -lSalomeGenericObj \ + $(GEOM_LDFLAGS) \ + -lGEOMClient \ +- -lSMESHimpl \ +- -lSMESHControls \ ++ -L../SMESH -lSMESHimpl \ ++ -L../Controls -lSMESHControls \ + $(OCC_LDPATH) \ + -lTKCDF \ + -lTKBO \ +--- salome-3.2.6/SMESH_SRC_3.2.6/src/SMESHClient/Makefile.in~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/SMESHClient/Makefile.in 2008-01-17 10:19:17.000000000 -0500 +@@ -71,10 +71,10 @@ + $(KERNEL_LDFLAGS) \ + $(GEOM_LDFLAGS) \ + $(MED_LDFLAGS) \ +- -lSMDS \ +- -lSMESHimpl \ +- -lSMESHDS \ +- -lSMESHControls \ ++ -L../SMDS -lSMDS \ ++ -L../SMESH -lSMESHimpl \ ++ -L../SMESHDS -lSMESHDS \ ++ -L../Controls -lSMESHControls \ + -lNMTTools \ + -lNMTDS \ + -lmed_V2_1 \ +@@ -92,11 +92,11 @@ + -lSALOMEBasics \ + -lOpUtil \ + -lTKShHealing \ +- -lMeshDriverDAT \ +- -lMeshDriverSTL \ +- -lMeshDriverMED \ +- -lMeshDriverUNV \ +- -lMeshDriver ++ -L../DriverDAT -lMeshDriverDAT \ ++ -L../DriverSTL -lMeshDriverSTL \ ++ -L../DriverMED -lMeshDriverMED \ ++ -L../DriverUNV -lMeshDriverUNV \ ++ -L../Driver -lMeshDriver + + LDFLAGSFORBIN += $(LDFLAGS) + +--- salome-3.2.6/MED_SRC_3.2.6/adm_local/unix/config_files/check_Med.m4~ 2008-01-16 23:49:46.000000000 -0500 ++++ salome-3.2.6/MED_SRC_3.2.6/adm_local/unix/config_files/check_Med.m4 2008-01-17 09:39:56.000000000 -0500 +@@ -39,7 +39,7 @@ + + AC_SUBST(MED_ROOT_DIR) + +- MED_LDFLAGS=-L${MED_DIR}/lib${LIB_LOCATION_SUFFIX}/salome ++ MED_LDFLAGS="-L${MED_DIR}/lib${LIB_LOCATION_SUFFIX}/salome -L${MED_DIR}/src/MedClient/src -L${MED_DIR}/src/MEDWrapper/Factory -L${MED_DIR}/src/MEDWrapper/Base -L${MED_DIR}/src/MEDWrapper/V2_1/Wrapper -L${MED_DIR}/src/MEDWrapper/V2_1/Core -L${MED_DIR}/src/MEDWrapper/V2_2" + MED_CXXFLAGS=-I${MED_DIR}/include/salome + + AC_SUBST(MED_LDFLAGS) +--- salome-3.2.6/COMPONENT_SRC_3.2.6/src/SIGNALSComponent_Swig/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/COMPONENT_SRC_3.2.6/src/SIGNALSComponent_Swig/Makefile.in 2008-01-17 13:59:21.000000000 -0500 +@@ -52,7 +52,7 @@ + BIN_SERVER_IDL = + + CPPFLAGS+= $(PYTHON_INCLUDES) $(KERNEL_CXXFLAGS) +-LDFLAGS+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSIGNALSComponentEngine ++LDFLAGS+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -L../SIGNALSComponent -lSIGNALSComponentEngine + + LDFLAGSFORBIN+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace + +--- salome-3.2.6/SIERPINSKY_SRC_3.2.6/src/SierpinskyGUI/Makefile.in~ 2006-06-01 07:50:03.000000000 -0400 ++++ salome-3.2.6/SIERPINSKY_SRC_3.2.6/src/SierpinskyGUI/Makefile.in 2008-01-17 14:41:34.000000000 -0500 +@@ -37,6 +37,6 @@ + + CXXFLAGS+= $(QT_INCLUDES) $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) $(RANDOMIZER_CXXFLAGS) $(GUI_CXXFLAGS) + +-LDFLAGS+= $(KERNEL_LDFLAGS) $(QT_LIBS) $(GUI_LDFLAGS) -lSalomeApp -lSIERPINSKYEngine $(RANDOMIZER_LDFLAGS) -lSalomeLifeCycleCORBA ++LDFLAGS+= $(KERNEL_LDFLAGS) $(QT_LIBS) $(GUI_LDFLAGS) -lSalomeApp -L../Sierpinsky -lSIERPINSKYEngine $(RANDOMIZER_LDFLAGS) -lSalomeLifeCycleCORBA + + @CONCLUDE@ +--- salome-3.2.6/VISU_SRC_3.2.6/src/PIPELINE/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/VISU_SRC_3.2.6/src/PIPELINE/Makefile.in 2008-01-17 22:29:11.000000000 -0500 +@@ -104,7 +104,7 @@ + $(HDF5_INCLUDES) $(BOOST_CPPFLAGS) + + LDFLAGS+= \ +- $(VTK_LIBS) -lVTKViewer -lVisuConvertor \ ++ $(VTK_LIBS) -lVTKViewer -L../CONVERTOR -lVisuConvertor \ + $(KERNEL_LDFLAGS) -lSALOMELocalTrace \ + $(GUI_LDFLAGS) \ + $(MED_LDFLAGS) +--- salome-3.2.6/VISU_SRC_3.2.6/src/OBJECT/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/VISU_SRC_3.2.6/src/OBJECT/Makefile.in 2008-01-17 22:39:40.000000000 -0500 +@@ -79,7 +79,7 @@ + LIBS+= \ + -lboost_signals${BOOST_LIBSUFFIX} \ + -lSalomeObject \ +- -lVisuPipeLine \ ++ -L../PIPELINE -lVisuPipeLine \ + -lSVTK + + @CONCLUDE@ +--- salome-3.2.6/VISU_SRC_3.2.6/src/VISU_I/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/VISU_SRC_3.2.6/src/VISU_I/Makefile.in 2008-01-17 23:14:36.000000000 -0500 +@@ -143,11 +143,11 @@ + -lVTKViewer \ + -lSVTK \ + -lSPlot2d \ +- -lVisuConvertor \ +- -lVisuPipeLine \ +- -lVisuObject \ +- -lVVTK \ +- -lVISUGUITOOLS ++ -L../CONVERTOR -lVisuConvertor \ ++ -L../PIPELINE -lVisuPipeLine \ ++ -L../OBJECT -lVisuObject \ ++ -L../VVTK -lVVTK \ ++ -L../GUITOOLS -lVISUGUITOOLS + + LDFLAGSFORBIN=$(LDFLAGS) $(LIBS) \ + $(KERNEL_LDFLAGS) \ +--- salome-3.2.6/VISU_SRC_3.2.6/src/VISUGUI/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/VISU_SRC_3.2.6/src/VISUGUI/Makefile.in 2008-01-17 23:30:31.000000000 -0500 +@@ -127,7 +127,7 @@ + $(GUI_CXXFLAGS) + + LDFLAGS += $(QWT_LIBS) -lSalomeNS \ +- -lSVTK -lVVTK -lSPlot2d -lVisuObject -lVISUEngineImpl -lVISUGUITOOLS \ ++ -lSVTK -L../VVTK -lVVTK -lSPlot2d -L../OBJECT -lVisuObject -L../VISU_I -lVISUEngineImpl -L../GUITOOLS -lVISUGUITOOLS \ + $(KERNEL_LDFLAGS) \ + $(GUI_LDFLAGS) + +--- salome-3.2.6/VISU_SRC_3.2.6/src/VISU_SWIG/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/VISU_SRC_3.2.6/src/VISU_SWIG/Makefile.in 2008-01-17 23:33:07.000000000 -0500 +@@ -60,6 +60,6 @@ + $(MED_CXXFLAGS) \ + $(BOOST_CPPFLAGS) + +-LDFLAGS += $(PYTHON_LIBS) -lVisuConvertor -lVisuPipeLine ++LDFLAGS += $(PYTHON_LIBS) -L../CONVERTOR -lVisuConvertor -L../PIPELINE -lVisuPipeLine + + @CONCLUDE@ +--- salome-3.2.6/SMESH_SRC_3.2.6/src/OBJECT/Makefile.in~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/OBJECT/Makefile.in 2008-01-18 00:09:09.000000000 -0500 +@@ -79,11 +79,11 @@ + $(OCC_KERNEL_LIBS) \ + $(VTK_LIBS) \ + $(MED_LDFLAGS) \ +- -lSMDS \ +- -lSMESHClient \ ++ -L../SMDS -lSMDS \ ++ -L../SMESHClient -lSMESHClient \ + -lSalomeApp \ + -lSalomeObject \ +- -lSMESHControls ++ -L../Controls -lSMESHControls + + LDFLAGSFORBIN += \ + $(GEOM_LDFLAGS) \ +--- salome-3.2.6/GEOM_SRC_3.2.6/adm_local/unix/config_files/check_GEOM.m4~ 2008-01-18 00:28:03.000000000 -0500 ++++ salome-3.2.6/GEOM_SRC_3.2.6/adm_local/unix/config_files/check_GEOM.m4 2008-01-18 07:06:17.000000000 -0500 +@@ -47,7 +47,7 @@ + fi + AC_SUBST(GEOM_ROOT_DIR) + +- GEOM_LDFLAGS=-L${GEOM_DIR}/lib${LIB_LOCATION_SUFFIX}/salome ++ GEOM_LDFLAGS="-L${GEOM_DIR}/lib${LIB_LOCATION_SUFFIX}/salome -L/home/hazelsct/salome-3.2.6/GEOM_SRC_3.2.6/src/DlgRef -L/home/hazelsct/salome-3.2.6/GEOM_SRC_3.2.6/src/GEOMGUI -L/home/hazelsct/salome-3.2.6/GEOM_SRC_3.2.6/src/GEOMClient -L/home/hazelsct/salome-3.2.6/GEOM_SRC_3.2.6/src/GEOMBase -L/home/hazelsct/salome-3.2.6/GEOM_SRC_3.2.6/src/OBJECT -L/home/hazelsct/salome-3.2.6/GEOM_SRC_3.2.6/src/GEOMFiltersSelection" + GEOM_CXXFLAGS=-I${GEOM_DIR}/include/salome + + AC_SUBST(GEOM_LDFLAGS) +--- salome-3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/Makefile.in~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/Makefile.in 2008-01-18 07:05:15.000000000 -0500 +@@ -199,7 +199,7 @@ + CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) \ + $(GEOM_CXXFLAGS) + +-LDFLAGS += -lSMESHObject -lSMESHFiltersSelection -lSMDS -lSMESHControls -lDlgRef \ ++LDFLAGS += -L../OBJECT -lSMESHObject -L../SMESHFiltersSelection -lSMESHFiltersSelection -L../SMDS -lSMDS -L../Controls -lSMESHControls -lDlgRef \ + $(OCC_KERNEL_LIBS) -lTKBO -lTKAdvTools $(KERNEL_LDFLAGS) $(GUI_LDFLAGS) \ + -lVTKViewer -lSalomeDSClient -lSalomeDS -lSalomeApp -lSalomePrs -lSalomeNS -lSalomeLifeCycleCORBA -lOpUtil -lSalomeObject \ + -lEvent -lSALOMELocalTrace -lSVTK -lOCCViewer $(GEOM_LDFLAGS) -lGEOM -lGEOMClient \ +--- salome-3.2.6/SMESH_SRC_3.2.6/src/SMESH_SWIG/Makefile.in~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/SMESH_SWIG/Makefile.in 2008-01-18 07:16:08.000000000 -0500 +@@ -119,6 +119,6 @@ + + CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(KERNEL_CXXFLAGS) -DHAVE_CONFIG_H + LIBS+= $(PYTHON_LIBS) +-LDFLAGS+= -lSMESH $(KERNEL_LDFLAGS) -lSalomeGenericObj ++LDFLAGS+= -L../SMESHGUI -lSMESH $(KERNEL_LDFLAGS) -lSalomeGenericObj + + @CONCLUDE@ +--- salome-3.2.6/SMESH_SRC_3.2.6/src/StdMeshers/Makefile.in~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/StdMeshers/Makefile.in 2008-01-18 08:11:18.000000000 -0500 +@@ -131,8 +131,8 @@ + @PLATFORM_INCLUDES@ + + LDFLAGS+= \ +- -lSMESHimpl \ +- -lMEFISTO2D \ ++ -L../SMESH -lSMESHimpl \ ++ -L../MEFISTO2 -lMEFISTO2D \ + $(OCC_LDPATH) \ + -lTKAdvTools \ + $(KERNEL_LDFLAGS) \ +--- salome-3.2.6/SMESH_SRC_3.2.6/src/StdMeshers_I/Makefile.in~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/StdMeshers_I/Makefile.in 2008-01-18 08:23:33.000000000 -0500 +@@ -118,6 +118,6 @@ + + #IDLCXXFLAGS+= -Wbtp + +-LDFLAGS+= $(HDF5_LIBS) -lStdMeshers -lSMESHEngine $(KERNEL_LDFLAGS) ++LDFLAGS+= $(HDF5_LIBS) -L../StdMeshers -lStdMeshers -L../SMESH_I -lSMESHEngine $(KERNEL_LDFLAGS) + + @CONCLUDE@ +--- salome-3.2.6/SMESH_SRC_3.2.6/src/StdMeshersGUI/Makefile.in~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/StdMeshersGUI/Makefile.in 2008-01-18 08:58:23.000000000 -0500 +@@ -84,7 +84,7 @@ + + CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) $(GEOM_CXXFLAGS) + +-LDFLAGS += -lSMESH -lVTKViewer -lSalomeApp -lSMESHObject -lSMESHFiltersSelection $(OCC_KERNEL_LIBS) \ ++LDFLAGS += -L../SMESHGUI -lSMESH -lVTKViewer -lSalomeApp -L../OBJECT -lSMESHObject -L../SMESHFiltersSelection -lSMESHFiltersSelection $(OCC_KERNEL_LIBS) \ + -lTKBO $(KERNEL_LDFLAGS) $(GEOM_LDFLAGS) $(GUI_LDFLAGS) \ + $(QWT_LIBS) + +--- salome-3.2.6/NETGENPLUGIN_SRC_3.2.6/adm_local/unix/make_commence.in~ 2008-04-11 03:42:53.000000000 +0000 ++++ salome-3.2.6/NETGENPLUGIN_SRC_3.2.6/adm_local/unix/make_commence.in 2008-04-11 12:30:30.000000000 +0000 +@@ -184,7 +184,7 @@ + CPPFLAGS += -DSOLIDGEOM -DLINUX $(OCC_INCLUDES) $(SALOME_INCLUDES) $(BOOST_CPPFLAGS) + CXXFLAGS += -DSOLIDGEOM -DLINUX $(OCC_CXXFLAGS) $(SALOME_INCLUDES) + +-LDFLAGS += -lSMESHimpl -lSMESHEngine -lStdMeshers -lStdMeshersEngine -L${KERNEL_ROOT_DIR}/lib@LIB_LOCATION_SUFFIX@/salome -L${SMESH_ROOT_DIR}/lib@LIB_LOCATION_SUFFIX@/salome -L${GEOM_ROOT_DIR}/lib@LIB_LOCATION_SUFFIX@/salome -lSalomeGenericObj ++LDFLAGS += -lSMESHimpl -lSMESHEngine -lStdMeshers -lStdMeshersEngine $(KERNEL_LDFLAGS) -L${SMESH_ROOT_DIR}/lib@LIB_LOCATION_SUFFIX@/salome -L${GEOM_ROOT_DIR}/lib@LIB_LOCATION_SUFFIX@/salome -lSalomeGenericObj + + # add corba libs when link salome application ! + #LDFLAGS+= $(CORBA_LIBS) --- salome-3.2.6.orig/debian/patch-smesh-vtk5-port +++ salome-3.2.6/debian/patch-smesh-vtk5-port @@ -0,0 +1,191 @@ +--- salome-3.2.6/SMESH_SRC_3.2.6/src/OBJECT/SMESH_Object.cxx~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/OBJECT/SMESH_Object.cxx 2008-01-17 23:57:05.000000000 -0500 +@@ -428,9 +428,8 @@ + + // Insert cells in grid + +- VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocationsArray::New(); +- aCellLocationsArray->SetNumberOfComponents( 1 ); +- aCellLocationsArray->SetNumberOfTuples( aNbCells ); ++ vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New(); ++ aCellLocationsArray->SetNumberOfValues( aNbCells ); + + aConnectivity->InitTraversal(); + for( vtkIdType idType = 0, *pts, npts; aConnectivity->GetNextCell( npts, pts ); idType++ ) +--- salome-3.2.6/SMESH_SRC_3.2.6/src/OBJECT/SMESH_DeviceActor.cxx~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/OBJECT/SMESH_DeviceActor.cxx 2008-01-18 00:01:37.000000000 -0500 +@@ -366,9 +366,8 @@ + } + } + +- VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocationsArray::New(); +- aCellLocationsArray->SetNumberOfComponents( 1 ); +- aCellLocationsArray->SetNumberOfTuples( aNbCells ); ++ vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New(); ++ aCellLocationsArray->SetNumberOfValues( aNbCells ); + + aConnectivity->InitTraversal(); + for( vtkIdType idType = 0, *pts, npts; aConnectivity->GetNextCell( npts, pts ); idType++ ) +@@ -426,9 +425,8 @@ + } + } + +- VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocationsArray::New(); +- aCellLocationsArray->SetNumberOfComponents( 1 ); +- aCellLocationsArray->SetNumberOfTuples( aNbCells ); ++ vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New(); ++ aCellLocationsArray->SetNumberOfValues( aNbCells ); + + aConnectivity->InitTraversal(); + for( vtkIdType idType = 0, *pts, npts; aConnectivity->GetNextCell( npts, pts ); idType++ ) +@@ -508,9 +506,8 @@ + } + } + +- VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocationsArray::New(); +- aCellLocationsArray->SetNumberOfComponents( 1 ); +- aCellLocationsArray->SetNumberOfTuples( aNbCells ); ++ vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New(); ++ aCellLocationsArray->SetNumberOfValues( aNbCells ); + + aConnectivity->InitTraversal(); + for( vtkIdType idType = 0, *pts, npts; aConnectivity->GetNextCell( npts, pts ); idType++ ) +--- salome-3.2.6/SMESH_SRC_3.2.6/src/OBJECT/SMESH_Actor.cxx~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/OBJECT/SMESH_Actor.cxx 2008-01-18 00:04:09.000000000 -0500 +@@ -409,10 +409,10 @@ + myPtsLabeledDataMapper->RemoveAllInputs(); + myPtsLabeledDataMapper->Delete(); + +- myPtsSelectVisiblePoints->UnRegisterAllOutputs(); ++ //myPtsSelectVisiblePoints->UnRegisterAllOutputs(); + myPtsSelectVisiblePoints->Delete(); + +- myPtsMaskPoints->UnRegisterAllOutputs(); ++ //myPtsMaskPoints->UnRegisterAllOutputs(); + myPtsMaskPoints->Delete(); + + myPointLabels->Delete(); +@@ -425,13 +425,13 @@ + myClsLabeledDataMapper->RemoveAllInputs(); + myClsLabeledDataMapper->Delete(); + +- myClsSelectVisiblePoints->UnRegisterAllOutputs(); ++ //myClsSelectVisiblePoints->UnRegisterAllOutputs(); + myClsSelectVisiblePoints->Delete(); + +- myClsMaskPoints->UnRegisterAllOutputs(); ++ //myClsMaskPoints->UnRegisterAllOutputs(); + myClsMaskPoints->Delete(); + +- myCellCenters->UnRegisterAllOutputs(); ++ //myCellCenters->UnRegisterAllOutputs(); + myCellCenters->Delete(); + + myCellsLabels->Delete(); +--- salome-3.2.6/SMESH_SRC_3.2.6/src/OBJECT/SMESH_ExtractGeometry.cxx~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/OBJECT/SMESH_ExtractGeometry.cxx 2008-01-18 00:05:09.000000000 -0500 +@@ -84,7 +84,7 @@ + vtkFloatingPointType multiplier; + vtkPoints *newPts; + vtkIdList *newCellPts; +- vtkDataSet *input = this->GetInput(); ++ vtkDataSet *input = (vtkDataSet *)this->GetInput(); + vtkPointData *pd = input->GetPointData(); + vtkCellData *cd = input->GetCellData(); + vtkUnstructuredGrid *output = this->GetOutput(); +--- salome-3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MeshPatternDlg.cxx 2008-01-18 06:23:59.000000000 -0500 +@@ -1233,9 +1233,8 @@ + else aCellTypesArray->InsertNextValue(VTK_EMPTY_CELL); + } + +- VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocationsArray::New(); +- aCellLocationsArray->SetNumberOfComponents(1); +- aCellLocationsArray->SetNumberOfTuples(aNbCells); ++ vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New(); ++ aCellLocationsArray->SetNumberOfValues(aNbCells); + + aConnectivity->InitTraversal(); + for (vtkIdType idType = 0, *pts, npts; aConnectivity->GetNextCell(npts, pts); idType++) +--- salome-3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_NodesDlg.cxx~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_NodesDlg.cxx 2008-01-18 06:25:58.000000000 -0500 +@@ -150,9 +150,8 @@ + aCells->InsertNextCell(anIdList); + aCellTypesArray->InsertNextValue(VTK_VERTEX); + +- VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocationsArray::New(); +- aCellLocationsArray->SetNumberOfComponents(1); +- aCellLocationsArray->SetNumberOfTuples(1); ++ vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New(); ++ aCellLocationsArray->SetNumberOfValues(1); + + aCells->InitTraversal(); + vtkIdType npts; +--- salome-3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_ClippingDlg.cxx~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_ClippingDlg.cxx 2008-01-18 06:27:33.000000000 -0500 +@@ -182,7 +182,7 @@ + myMapper->RemoveAllInputs(); + myMapper->Delete(); + +- myPlaneSource->UnRegisterAllOutputs(); ++ //myPlaneSource->UnRegisterAllOutputs(); + myPlaneSource->Delete(); + }; + +--- salome-3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MoveNodesDlg.cxx 2008-01-18 06:30:02.000000000 -0500 +@@ -553,9 +553,8 @@ + aCellTypesArray->InsertNextValue(VTK_VERTEX); + anIdList->Delete(); + +- VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocationsArray::New(); +- aCellLocationsArray->SetNumberOfComponents(1); +- aCellLocationsArray->SetNumberOfTuples(1); ++ vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New(); ++ aCellLocationsArray->SetNumberOfValues(1); + + aCells->InitTraversal(); + vtkIdType npts; +--- salome-3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MultiEditDlg.cxx 2008-01-18 06:32:02.000000000 -0500 +@@ -1337,9 +1337,8 @@ + } + } + +- VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocationsArray::New(); +- aCellLocationsArray->SetNumberOfComponents(1); +- aCellLocationsArray->SetNumberOfTuples(aNbCells); ++ vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New(); ++ aCellLocationsArray->SetNumberOfValues(aNbCells); + + aConnectivity->InitTraversal(); + for(vtkIdType idType = 0, *pts, npts; aConnectivity->GetNextCell(npts, pts); idType++) +--- salome-3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_EditMeshDlg.cxx 2008-01-18 06:45:00.000000000 -0500 +@@ -261,10 +261,10 @@ + myPtsLabeledDataMapper->RemoveAllInputs(); + myPtsLabeledDataMapper->Delete(); + +- myPtsSelectVisiblePoints->UnRegisterAllOutputs(); ++ //myPtsSelectVisiblePoints->UnRegisterAllOutputs(); + myPtsSelectVisiblePoints->Delete(); + +- myPtsMaskPoints->UnRegisterAllOutputs(); ++ //myPtsMaskPoints->UnRegisterAllOutputs(); + myPtsMaskPoints->Delete(); + + myPointLabels->Delete(); +--- salome-3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/SMESHGUI_MeshEditPreview.cxx 2008-01-18 06:51:56.000000000 -0500 +@@ -202,9 +202,8 @@ + anIdList->Delete(); + + // Insert cells in grid +- VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocationsArray::New(); +- aCellLocationsArray->SetNumberOfComponents( 1 ); +- aCellLocationsArray->SetNumberOfTuples( aNbCells ); ++ vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New(); ++ aCellLocationsArray->SetNumberOfValues( aNbCells ); + + aConnectivity->InitTraversal(); + for( vtkIdType idType = 0, *pts, npts; aConnectivity->GetNextCell( npts, pts ); idType++ ) --- salome-3.2.6.orig/debian/patch-module-dir-vars +++ salome-3.2.6/debian/patch-module-dir-vars @@ -0,0 +1,61 @@ +--- salome-3.2.6/PYHELLO_SRC_3.2.6/adm_local/unix/make_commence.in~ 2008-01-15 07:15:59.000000000 -0500 ++++ salome-3.2.6/PYHELLO_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-15 09:05:30.000000000 -0500 +@@ -189,6 +189,11 @@ + # create a symbolic link (or a copie ?) + LN_S=@LN_S@ + ++KERNEL_ROOT_DIR=@KERNEL_ROOT_DIR@ ++KERNEL_SITE_DIR=@KERNEL_SITE_DIR@ ++KERNEL_LDFLAGS=@KERNEL_LDFLAGS@ ++KERNEL_CXXFLAGS=@KERNEL_CXXFLAGS@ ++ + ## Installation points + prefix=@prefix@ + exec_prefix=@exec_prefix@ +--- salome-3.2.6/PYCALCULATOR_SRC_3.2.6/adm_local/unix/make_commence.in~ 2008-01-15 07:15:59.000000000 -0500 ++++ salome-3.2.6/PYCALCULATOR_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-15 14:48:52.000000000 -0500 +@@ -123,6 +123,15 @@ + # create a symbolic link (or a copie ?) + LN_S=@LN_S@ + ++KERNEL_ROOT_DIR=@KERNEL_ROOT_DIR@ ++KERNEL_SITE_DIR=@KERNEL_SITE_DIR@ ++KERNEL_LDFLAGS=@KERNEL_LDFLAGS@ ++KERNEL_CXXFLAGS=@KERNEL_CXXFLAGS@ ++ ++MED_ROOT_DIR=@MED_ROOT_DIR@ ++MED_LDFLAGS=@MED_LDFLAGS@ ++MED_CXXFLAGS=@MED_CXXFLAGS@ ++ + ## Installation points + prefix=@prefix@ + exec_prefix=@exec_prefix@ +--- salome-3.2.6/NETGENPLUGIN_SRC_3.2.6/adm_local/unix/make_commence.in~ 2008-01-21 11:33:21.000000000 -0500 ++++ salome-3.2.6/NETGENPLUGIN_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-21 11:31:55.000000000 -0500 +@@ -210,6 +210,26 @@ + # create a symbolic link (or a copie ?) + LN_S=@LN_S@ + ++KERNEL_ROOT_DIR=@KERNEL_ROOT_DIR@ ++KERNEL_LDFLAGS=@KERNEL_LDFLAGS@ ++KERNEL_CXXFLAGS=@KERNEL_CXXFLAGS@ ++ ++GUI_ROOT_DIR=@GUI_ROOT_DIR@ ++GUI_LDFLAGS=@GUI_LDFLAGS@ ++GUI_CXXFLAGS=@GUI_CXXFLAGS@ ++ ++GEOM_ROOT_DIR=@GEOM_ROOT_DIR@ ++GEOM_LDFLAGS=@GEOM_LDFLAGS@ ++GEOM_CXXFLAGS=@GEOM_CXXFLAGS@ ++ ++MED_ROOT_DIR=@MED_ROOT_DIR@ ++MED_LDFLAGS=@MED_LDFLAGS@ ++MED_CXXFLAGS=@MED_CXXFLAGS@ ++ ++SMESH_ROOT_DIR=@SMESH_ROOT_DIR@ ++SMESH_LDFLAGS=@SMESH_LDFLAGS@ ++SMESH_CXXFLAGS=@SMESH_CXXFLAGS@ ++ + ## Installation points + prefix=@prefix@ + exec_prefix=@exec_prefix@ --- salome-3.2.6.orig/debian/patch-compo-mpi +++ salome-3.2.6/debian/patch-compo-mpi @@ -0,0 +1,36 @@ +--- salome-3.2.6/COMPONENT_SRC_3.2.6/adm_local/unix/make_commence.in~ 2008-01-17 10:48:08.000000000 -0500 ++++ salome-3.2.6/COMPONENT_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-17 13:16:30.000000000 -0500 +@@ -124,6 +124,11 @@ + CAS_DATAEXCHANGE=@CAS_DATAEXCHANGE@ + CAS_LDPATH=@CAS_LDPATH@ + ++# MPI ++ ++MPI_INCLUDES=@MPI_INCLUDES@ ++MPI_LIBS=@MPI_LIBS@ ++ + # MPICH + + MPICH_INCLUDES=@MPICH_INCLUDES@ +--- salome-3.2.6/COMPONENT_SRC_3.2.6/src/AddComponent/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/COMPONENT_SRC_3.2.6/src/AddComponent/Makefile.in 2008-01-17 13:14:09.000000000 -0500 +@@ -53,7 +53,7 @@ + BIN_SRC = HandleServerSideSignals.cxx + BIN_SERVER_IDL = + +-CPPFLAGS+= $(PYTHON_INCLUDES) $(KERNEL_CXXFLAGS) ++CPPFLAGS+= $(PYTHON_INCLUDES) $(KERNEL_CXXFLAGS) $(MPI_INCLUDES) + LDFLAGS+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry \ + -lSalomeNotification -lSALOMELocalTrace -lSalomeNS -lSalomeLifeCycleCORBA \ + -lSalomeResourcesManager -lSALOMEBasics -lSalomeIDLKernel +--- salome-3.2.6/COMPONENT_SRC_3.2.6/src/SIGNALSComponent/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/COMPONENT_SRC_3.2.6/src/SIGNALSComponent/Makefile.in 2008-01-17 13:54:29.000000000 -0500 +@@ -50,7 +50,7 @@ + BIN_SRC = HandleServerSideSignals.cxx + BIN_SERVER_IDL = + +-CPPFLAGS+= $(PYTHON_INCLUDES) $(KERNEL_CXXFLAGS) ++CPPFLAGS+= $(PYTHON_INCLUDES) $(KERNEL_CXXFLAGS) $(MPI_INCLUDES) + LDFLAGS+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification + + LIBSFORBIN= $(LIBS) --- salome-3.2.6.orig/debian/salome-doc.docs +++ salome-3.2.6/debian/salome-doc.docs @@ -0,0 +1,2 @@ +debian/tmp/usr/share/doc/salome-doc/* +debian/README.Debian.html --- salome-3.2.6.orig/debian/patch-netgen-debian +++ salome-3.2.6/debian/patch-netgen-debian @@ -0,0 +1,89 @@ +--- src3.2.6/NETGENPLUGIN_SRC_3.2.6/adm_local/unix/config_files/check_NETGEN.m4 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/NETGENPLUGIN_SRC_3.2.6/adm_local/unix/config_files/check_NETGEN.m4 2008-01-23 08:15:59.000000000 -0500 +@@ -52,7 +52,7 @@ + + + +- NETGEN_INCLUDES="-I${NETGEN_HOME}/include" ++ NETGEN_INCLUDES="-I${NETGEN_HOME}/include -I${NETGEN_HOME}/include/netgen -I${NETGEN_HOME}/include/netgen/interface -I${NETGEN_HOME}/include/netgen/occ" + + # check ${NETGEN_HOME}/lib/LINUX directory for libraries + if test -f ${NETGEN_HOME}/lib/LINUX/libcsg.a ; then +@@ -81,7 +81,10 @@ + AC_MSG_CHECKING(for Netgen libraries) + + LDFLAGS_old="$LDFLAGS" +- LDFLAGS="-L. -lNETGEN $CAS_LDPATH -lTKBRep -lTKShHealing -lTKSTEP -lTKXSBase -lTKIGES -lTKSTL -lTKTopAlgo $LDFLAGS" ++ LDFLAGS="$LDFLAGS $CAS_LDPATH" ++ NETGEN_LIBS="-lnetgen_interface -lnetgen_csg -lnetgen_stlgeom -lnetgen_geom2d -lnetgen_meshing -lnetgen_general -lnetgen_gprim -lnetgen_visualization -lnetgen_linalg -lnetgen_opti" ++ LIBS_OLD="$LIBS" ++ LIBS="-lTKBRep -lTKShHealing -lTKSTEP -lTKXSBase -lTKIGES -lTKSTL -lTKTopAlgo $NETGEN_LIBS -lGL -lGLU" + + AC_TRY_COMPILE(#include + #include +@@ -92,18 +95,7 @@ + #include + ,nglib::Ng_Init(); + netgen::OCCGeometry occgeo; +- nglib::Ng_Exit();,Netgen_ok=yes;ar x "$NETGEN_LIBS_DIR/libnginterface.a"; +- ar x "$NETGEN_LIBS_DIR/libocc.a"; +- ar x "$NETGEN_LIBS_DIR/libcsg.a"; +- ar x "$NETGEN_LIBS_DIR/libgprim.a"; +- ar x "$NETGEN_LIBS_DIR/libmesh.a"; +- ar x "$NETGEN_LIBS_DIR/libopti.a"; +- ar x "$NETGEN_LIBS_DIR/libgen.a"; +- ar x "$NETGEN_LIBS_DIR/libla.a"; +- ar x "$NETGEN_LIBS_DIR/libstlgeom.a"; +- ar x "$NETGEN_LIBS_DIR/libgeom2d.a"; +- $CXX -shared linopt.o bfgs.o linsearch.o global.o bisect.o meshtool.o refine.o ruler3.o improve3.o adfront3.o tetrarls.o prism2rls.o profiler.o pyramidrls.o pyramid2rls.o netrule3.o ruler2.o meshclass.o improve2.o adfront2.o netrule2.o triarls.o geomsearch.o secondorder.o meshtype.o parser3.o quadrls.o specials.o parser2.o meshing2.o meshing3.o meshfunc.o localh.o improve2gen.o delaunay.o boundarylayer.o msghandler.o meshfunc2d.o smoothing2.o smoothing3.o topology.o curvedelems_new.o clusters.o zrefine.o ngexception.o geomtest3d.o geom2d.o geom2dmesh.o geom3d.o adtree.o transform3d.o geomfuncs.o polynomial.o densemat.o vector.o basemat.o sparsmat.o algprim.o brick.o manifold.o bspline2d.o meshsurf.o csgeom.o polyhedra.o curve2d.o singularref.o edgeflw.o solid.o explicitcurve2d.o specpoin.o gencyl.o revolution.o genmesh.o genmesh2d.o spline3d.o surface.o identify.o triapprox.o meshstlsurface.o stlline.o stltopology.o stltool.o stlgeom.o stlgeomchart.o stlgeommesh.o table.o optmem.o spbita2d.o hashtabl.o sort.o flags.o seti.o bitarray.o array.o symbolta.o mystring.o moveablemem.o spline.o splinegeometry.o ngnewdelete.o nglib.o hprefinement.o Partition_Inter2d.o Partition_Loop.o Partition_Loop3d.o Partition_Inter3d.o Partition_Loop2d.o Partition_Spliter.o occgeom.o occgenmesh.o occmeshsurf.o -o libNETGEN.so; +- rm -rf linopt.o bfgs.o linsearch.o global.o bisect.o meshtool.o refine.o ruler3.o improve3.o adfront3.o tetrarls.o prism2rls.o profiler.o pyramidrls.o pyramid2rls.o netrule3.o ruler2.o meshclass.o improve2.o adfront2.o netrule2.o triarls.o geomsearch.o secondorder.o meshtype.o parser3.o quadrls.o specials.o parser2.o meshing2.o meshing3.o meshfunc.o localh.o improve2gen.o delaunay.o boundarylayer.o msghandler.o meshfunc2d.o smoothing2.o smoothing3.o topology.o curvedelems_new.o clusters.o zrefine.o ngexception.o geomtest3d.o geom2d.o geom2dmesh.o geom3d.o adtree.o transform3d.o geomfuncs.o polynomial.o densemat.o vector.o basemat.o sparsmat.o algprim.o brick.o manifold.o bspline2d.o meshsurf.o csgeom.o polyhedra.o curve2d.o singularref.o edgeflw.o solid.o explicitcurve2d.o specpoin.o gencyl.o revolution.o genmesh.o genmesh2d.o spline3d.o surface.o identify.o triapprox.o meshstlsurface.o stlline.o stltopology.o stltool.o stlgeom.o stlgeomchart.o stlgeommesh.o table.o optmem.o spbita2d.o hashtabl.o sort.o flags.o seti.o bitarray.o array.o symbolta.o mystring.o moveablemem.o spline.o splinegeometry.o ngnewdelete.o nglib.o hprefinement.o Partition_Inter2d.o Partition_Loop.o Partition_Loop3d.o Partition_Inter3d.o Partition_Loop2d.o Partition_Spliter.o occgeom.o occgenmesh.o occmeshsurf.o csgparser.o dynamicmem.o extrusion.o occconstruction.o parthreads.o readuser.o writeabaqus.o writediffpack.o writeelmer.o writefeap.o writefluent.o writegmsh.o writejcm.o writepermas.o writetecplot.o writetochnog.o writeuser.o wuchemnitz.o, ++ nglib::Ng_Exit();,Netgen_ok=yes, + Netgen_ok=no) + + AC_CACHE_VAL(salome_netgen_lib,[ +@@ -115,15 +107,26 @@ + } + #define OCCGEOMETRY + #include ++#include ++#include ++#include ++namespace netgen { ++AutoPtr mesh; ++AutoPtr geometry; ++AutoPtr stlgeometry; ++AutoPtr geometry2d (0); ++ARRAY specpoints; ++} + ,nglib::Ng_Init(); + netgen::OCCGeometry occgeo; + nglib::Ng_Exit();, +- eval "salome_netgen_lib=yes";rm -rf libNETGEN.so,eval "salome_netgen_lib=no";rm -rf libNETGEN.so) ++ eval "salome_netgen_lib=yes",eval "salome_netgen_lib=no") + ]) + Netgen_ok="$salome_netgen_lib" + + + LDFLAGS="$LDFLAGS_old" ++ LIBS="$LIBS_old" + fi + + CPPFLAGS="$CPPFLAGS_old" +@@ -139,6 +142,7 @@ + + AC_SUBST(NETGEN_INCLUDES) + AC_SUBST(NETGEN_LIBS_DIR) ++AC_SUBST(NETGEN_LIBS) + + AC_LANG_RESTORE + +--- src3.2.6/NETGENPLUGIN_SRC_3.2.6/src/Makefile.in 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/NETGENPLUGIN_SRC_3.2.6/src/Makefile.in 2008-01-21 12:26:54.000000000 -0500 +@@ -31,6 +31,6 @@ + + @COMMENCE@ + +-SUBDIRS = NETGEN NETGENPlugin GUI ++SUBDIRS = NETGENPlugin GUI + + @MODULE@ --- salome-3.2.6.orig/debian/libsalome-dev.files +++ salome-3.2.6/debian/libsalome-dev.files @@ -0,0 +1,10 @@ +usr/include/salome/*.h +usr/include/salome/*.hh +usr/include/salome/*.hxx +usr/include/salome/*.lxx +usr/include/salome/*.cxx +usr/include/salome/*.i +usr/share/idl/salome/*.idl +usr/lib/*.la +usr/lib/*.so +usr/share/aclocal/* --- salome-3.2.6.orig/debian/patch-netgen-needs-med +++ salome-3.2.6/debian/patch-netgen-needs-med @@ -0,0 +1,32 @@ +--- salome-3.2.6/NETGENPLUGIN_SRC_3.2.6/configure.in.base~ 2008-01-18 16:12:24.000000000 -0500 ++++ salome-3.2.6/NETGENPLUGIN_SRC_3.2.6/configure.in.base 2008-01-21 11:08:17.000000000 -0500 +@@ -316,13 +316,13 @@ + + CHECK_GEOM + +-# echo +-# echo --------------------------------------------- +-# echo Testing Med +-# echo --------------------------------------------- +-# echo +-# +-# CHECK_MED ++ echo ++ echo --------------------------------------------- ++ echo Testing Med ++ echo --------------------------------------------- ++ echo ++ ++CHECK_MED + + echo + echo --------------------------------------------- +@@ -347,7 +347,7 @@ + echo + + echo Configure +-variables="cc_ok fortran_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok Kernel_ok Geom_ok SMesh_ok Netgen_ok" ++variables="cc_ok fortran_ok boost_ok lex_yacc_ok python_ok swig_ok threads_ok OpenGL_ok qt_ok vtk_ok hdf5_ok omniORB_ok occ_ok doxygen_ok graphviz_ok Kernel_ok Geom_ok Med_ok SMesh_ok Netgen_ok" + + for var in $variables + do --- salome-3.2.6.orig/debian/patch-visu-missing-sources +++ salome-3.2.6/debian/patch-visu-missing-sources @@ -0,0 +1,99 @@ +--- salome-3.2.6/VISU_SRC_3.2.6/src/GUITOOLS/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/VISU_SRC_3.2.6/src/GUITOOLS/Makefile.in 2008-01-17 22:43:15.000000000 -0500 +@@ -63,4 +63,7 @@ + + LDFLAGS += $(QWT_LIBS) $(KERNEL_LDFLAGS) $(GUI_LDFLAGS) + ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ + @CONCLUDE@ +--- salome-3.2.6/VISU_SRC_3.2.6/src/VISU_I/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/VISU_SRC_3.2.6/src/VISU_I/Makefile.in 2008-01-17 23:14:36.000000000 -0500 +@@ -189,4 +189,26 @@ + CLEAN = + DISTCLEAN = + ++VISU_TimeAnimation.lo: VISU_Gen.hh MED.hh ++ ++VISU_Gen_i.lo: MED_Gen.hh ++ ++SALOMEDSSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDSSK.cc ++ cp $< $@ ++ ++SALOMEDS_AttributesSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDS_AttributesSK.cc ++ cp $< $@ ++ ++SALOME_CommSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_CommSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ + @CONCLUDE@ +--- salome-3.2.6/VISU_SRC_3.2.6/src/VISUGUI/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/VISU_SRC_3.2.6/src/VISUGUI/Makefile.in 2008-01-17 23:30:31.000000000 -0500 +@@ -131,5 +131,27 @@ + $(KERNEL_LDFLAGS) \ + $(GUI_LDFLAGS) + ++VisuGUI.lo: MED_Gen.hh VISU_Gen.hh MED.hh ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOMEDSSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDSSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ ++SALOME_ModuleCatalogSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ModuleCatalogSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ ++SALOMEDS_AttributesSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDS_AttributesSK.cc ++ cp $< $@ ++ ++SALOME_CommSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_CommSK.cc ++ cp $< $@ + + @CONCLUDE@ +--- salome-3.2.6/VISU_SRC_3.2.6/src/ENGINE/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/VISU_SRC_3.2.6/src/ENGINE/Makefile.in 2008-01-18 06:15:53.000000000 -0500 +@@ -62,4 +62,27 @@ + CLEAN = + DISTCLEAN = + ++VISU_Engine_i.lo: VISU_Gen.hh MED.hh ++ ++SALOMEDSSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDSSK.cc ++ cp $< $@ ++ ++SALOMEDS_AttributesSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDS_AttributesSK.cc ++ cp $< $@ ++ ++SALOME_CommSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_CommSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ ++SALOME_SessionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_SessionSK.cc ++ cp $< $@ ++ + @CONCLUDE@ --- salome-3.2.6.orig/debian/salome.files +++ salome-3.2.6/debian/salome.files @@ -0,0 +1,2 @@ +usr/bin/* +usr/share/info/* --- salome-3.2.6.orig/debian/patch-compo-missing-sources +++ salome-3.2.6/debian/patch-compo-missing-sources @@ -0,0 +1,204 @@ +--- salome-3.2.6/COMPONENT_SRC_3.2.6/src/AddComponent/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/COMPONENT_SRC_3.2.6/src/AddComponent/Makefile.in 2008-01-17 13:14:09.000000000 -0500 +@@ -63,5 +63,16 @@ + -lSalomeNotification -lSALOMELocalTrace -lSalomeNS -lSalomeLifeCycleCORBA \ + -lSalomeResourcesManager -lSALOMEBasics -lSalomeIDLKernel + ++AddComponent_Impl.lo: AddComponent.hh ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ ++SALOME_ContainerManagerSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ContainerManagerSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ + @CONCLUDE@ + +--- salome-3.2.6/COMPONENT_SRC_3.2.6/src/AdditionComponent/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/COMPONENT_SRC_3.2.6/src/AdditionComponent/Makefile.in 2008-01-17 13:36:27.000000000 -0500 +@@ -64,5 +64,16 @@ + -lSalomeNotification -lSALOMELocalTrace -lSalomeNS -lSalomeLifeCycleCORBA \ + -lSalomeResourcesManager -lSALOMEBasics -lSalomeIDLKernel + ++AdditionComponent_Impl.lo: AdditionComponent.hh AddComponent.hh ++ ++SALOME_ContainerManagerSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ContainerManagerSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ + @CONCLUDE@ + +--- salome-3.2.6/COMPONENT_SRC_3.2.6/src/DivComponent/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/COMPONENT_SRC_3.2.6/src/DivComponent/Makefile.in 2008-01-17 13:39:12.000000000 -0500 +@@ -53,5 +53,10 @@ + CPPFLAGS+= $(PYTHON_INCLUDES) $(KERNEL_CXXFLAGS) + LDFLAGS+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification + ++DivComponent.lo: DivComponent.hh ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ + @CONCLUDE@ + +--- salome-3.2.6/COMPONENT_SRC_3.2.6/src/MulComponent/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/COMPONENT_SRC_3.2.6/src/MulComponent/Makefile.in 2008-01-17 13:41:36.000000000 -0500 +@@ -55,5 +55,10 @@ + + LDFLAGSFORBIN+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace + ++MulComponent.cxx: MulComponent.hh ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ + @CONCLUDE@ + +--- salome-3.2.6/COMPONENT_SRC_3.2.6/src/SubComponent/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/COMPONENT_SRC_3.2.6/src/SubComponent/Makefile.in 2008-01-17 13:43:46.000000000 -0500 +@@ -55,5 +55,10 @@ + + LDFLAGSFORBIN+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace + ++SubComponent.lo: SubComponent.hh ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ + @CONCLUDE@ + +--- salome-3.2.6/COMPONENT_SRC_3.2.6/src/SyrComponent/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/COMPONENT_SRC_3.2.6/src/SyrComponent/Makefile.in 2008-01-17 13:45:39.000000000 -0500 +@@ -60,5 +60,10 @@ + -lSalomeNotification -lSALOMELocalTrace \ + -lSalomeResourcesManager -lSALOMEBasics -lSalomeIDLKernel + ++SyrComponent_Impl.lo: SyrComponent.hh ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ + @CONCLUDE@ + +--- salome-3.2.6/COMPONENT_SRC_3.2.6/src/TypesCheck/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/COMPONENT_SRC_3.2.6/src/TypesCheck/Makefile.in 2008-01-17 13:48:38.000000000 -0500 +@@ -61,5 +61,10 @@ + -lSalomeNotification -lSALOMELocalTrace \ + -lSalomeResourcesManager -lSALOMEBasics -lSalomeIDLKernel + ++TypesCheck_Impl.lo: AddComponent.hh TypesCheck.hh ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ + @CONCLUDE@ + +--- salome-3.2.6/COMPONENT_SRC_3.2.6/src/DataStreamComponent/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/COMPONENT_SRC_3.2.6/src/DataStreamComponent/Makefile.in 2008-01-17 13:51:27.000000000 -0500 +@@ -61,5 +61,10 @@ + -lSalomeNotification -lSALOMELocalTrace \ + -lSalomeResourcesManager -lSALOMEBasics -lSalomeIDLKernel + ++DataStreamComponent_Impl.lo: DataStreamComponent.hh ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ + @CONCLUDE@ + +--- salome-3.2.6/COMPONENT_SRC_3.2.6/src/SIGNALSComponent/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/COMPONENT_SRC_3.2.6/src/SIGNALSComponent/Makefile.in 2008-01-17 13:54:29.000000000 -0500 +@@ -58,5 +58,10 @@ + -lSalomeNotification -lSALOMELocalTrace \ + -lSalomeResourcesManager -lSALOMEBasics -lSalomeIDLKernel + ++SIGNALSComponent_Impl.lo: SIGNALSComponent.hh ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ + @CONCLUDE@ + +--- salome-3.2.6/COMPONENT_SRC_3.2.6/src/UndefinedSymbolComponent/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/COMPONENT_SRC_3.2.6/src/UndefinedSymbolComponent/Makefile.in 2008-01-17 13:57:00.000000000 -0500 +@@ -55,5 +55,10 @@ + + LDFLAGSFORBIN+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace + ++UndefinedSymbolComponent.lo: UndefinedSymbolComponent.hh ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ + @CONCLUDE@ + +--- salome-3.2.6/COMPONENT_SRC_3.2.6/src/SIGNALSComponent_Swig/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/COMPONENT_SRC_3.2.6/src/SIGNALSComponent_Swig/Makefile.in 2008-01-17 13:59:21.000000000 -0500 +@@ -56,5 +56,8 @@ + + LDFLAGSFORBIN+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace + ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ + @CONCLUDE@ + +--- salome-3.2.6/COMPONENT_SRC_3.2.6/src/TestFunctions/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/COMPONENT_SRC_3.2.6/src/TestFunctions/Makefile.in 2008-01-17 14:05:24.000000000 -0500 +@@ -64,5 +64,16 @@ + -lSalomeNotification -lSALOMELocalTrace -lSalomeNS -lSalomeLifeCycleCORBA \ + -lSalomeResourcesManager -lSALOMEBasics -lSalomeIDLKernel + ++TestFunctions.lo: AddComponent.hh ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOME_ContainerManagerSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ContainerManagerSK.cc ++ cp $< $@ ++ + @CONCLUDE@ + +--- salome-3.2.6/COMPONENT_SRC_3.2.6/src/CalculatorComponent/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/COMPONENT_SRC_3.2.6/src/CalculatorComponent/Makefile.in 2008-01-17 14:12:08.000000000 -0500 +@@ -56,8 +56,27 @@ + CPPFLAGS+= $(PYTHON_INCLUDES) $(HDF5_INCLUDES) $(MED2_INCLUDES) $(KERNEL_CXXFLAGS) $(MED_CXXFLAGS) + LDFLAGS+= $(KERNEL_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace $(MED_LDFLAGS) -lMEDEngine -lMEDClientcmodule + ++CalculatorEngine.lo: Calculator.hh MED.hh MED_Gen.hh + +-MED.hh MEDSK.cc: ${MED_ROOT_DIR}/idl/salome/MED.idl +- omniidl -bcxx -Wbtp -I${KERNEL_ROOT_DIR}/idl/salome $^ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ ++SALOMEDSSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDSSK.cc ++ cp $< $@ ++ ++SALOMEDS_AttributesSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDS_AttributesSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ ++SALOME_CommSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_CommSK.cc ++ cp $< $@ ++ ++SALOME_ContainerManagerSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ContainerManagerSK.cc ++ cp $< $@ + + @CONCLUDE@ --- salome-3.2.6.orig/debian/patch-fix-relocation-error +++ salome-3.2.6/debian/patch-fix-relocation-error @@ -0,0 +1,16 @@ +--- salome-3.2.6/SMESH_SRC_3.2.6/src/StdMeshers/StdMeshers_Propagation.cxx~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/StdMeshers/StdMeshers_Propagation.cxx 2008-01-18 08:10:34.000000000 -0500 +@@ -92,11 +92,13 @@ + /*! + * \brief Return an edge from which hypotheses are propagated from + */ ++/* + TopoDS_Edge StdMeshers_Propagation::GetPropagationSource(SMESH_Mesh& theMesh, + const TopoDS_Shape& theEdge) + { + return PropagationMgr::GetSource(theMesh.GetSubMeshContaining( theEdge )); + } ++*/ + + //============================================================================= + //============================================================================= --- salome-3.2.6.orig/debian/patch-visu-vtk5-port +++ salome-3.2.6/debian/patch-visu-vtk5-port @@ -0,0 +1,331 @@ +--- salome-3.2.6/VISU_SRC_3.2.6/src/CONVERTOR/VISU_Convertor_impl.cxx~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/VISU_SRC_3.2.6/src/CONVERTOR/VISU_Convertor_impl.cxx 2008-01-17 19:27:26.000000000 -0500 +@@ -1301,9 +1301,8 @@ + aDataArray->Delete(); + } + vtkIdType *pts = 0, npts = 0; +- VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocationsArray::New(); +- aCellLocationsArray->SetNumberOfComponents(1); +- aCellLocationsArray->SetNumberOfTuples(aNbCells); ++ vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New(); ++ aCellLocationsArray->SetNumberOfValues(aNbCells); + aConnectivity->InitTraversal(); + for(int i=0; aConnectivity->GetNextCell(npts,pts); i++) + aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts)); +@@ -1391,9 +1390,8 @@ + aDataArray->Delete(); + + vtkIdType *pts = 0, npts = 0; +- VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocationsArray::New(); +- aCellLocationsArray->SetNumberOfComponents(1); +- aCellLocationsArray->SetNumberOfTuples(aNbCells); ++ vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New(); ++ aCellLocationsArray->SetNumberOfValues(aNbCells); + aConnectivity->InitTraversal(); + for(int i=0; aConnectivity->GetNextCell(npts,pts); i++) + aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts)); +@@ -1554,10 +1552,9 @@ + } + + vtkIdType *pts = 0, npts = 0; +- VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocationsArray::New(); ++ vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New(); + +- aCellLocationsArray->SetNumberOfComponents(1); +- aCellLocationsArray->SetNumberOfTuples(aNbCells); ++ aCellLocationsArray->SetNumberOfValues(aNbCells); + aConnectivity->InitTraversal(); + for(int i=0; aConnectivity->GetNextCell(npts,pts); i++) + aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts)); +@@ -1819,9 +1816,8 @@ + } + anIdList->Delete(); + +- VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocationsArray::New(); +- aCellLocationsArray->SetNumberOfComponents(1); +- aCellLocationsArray->SetNumberOfTuples(aNbCells); ++ vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New(); ++ aCellLocationsArray->SetNumberOfValues(aNbCells); + + vtkIdType *pts = 0, npts = 0; + aConnectivity->InitTraversal(); +--- salome-3.2.6/VISU_SRC_3.2.6/src/CONVERTOR/VISU_ConvertorUtils.cxx~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/VISU_SRC_3.2.6/src/CONVERTOR/VISU_ConvertorUtils.cxx 2008-01-17 19:31:15.000000000 -0500 +@@ -51,7 +51,7 @@ + vtkUnstructuredGridWriter* aWriter = vtkUnstructuredGridWriter::New(); + //aWriter->SetFileType(VTK_BINARY); + aWriter->SetFileName(theFileName.c_str()); +- aWriter->SetInput(theDataSet); ++ aWriter->SetInput((vtkDataObject*)theDataSet); + aWriter->Write(); + aWriter->Delete(); + } +--- salome-3.2.6/VISU_SRC_3.2.6/src/CONVERTOR/VISU_AppendFilter.cxx~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/VISU_SRC_3.2.6/src/CONVERTOR/VISU_AppendFilter.cxx 2008-01-17 21:40:31.000000000 -0500 +@@ -226,6 +226,20 @@ + }//if non-empty dataset + }//for all inputs + } ++ ++ template ++ void ++ ForEachInput(vtkDataSetCollection* theInputs, TFunctor& theFunctor) ++ { ++ for(vtkIdType anInputId = 0; anInputId < theInputs->GetNumberOfItems(); anInputId++){ ++ if(vtkDataSet *aDataSet = theInputs->GetDataSet(anInputId)){ ++ if(aDataSet->GetNumberOfPoints() <= 0 && aDataSet->GetNumberOfCells() <= 0){ ++ continue; //no input, just skip ++ } ++ theFunctor(anInputId, aDataSet); ++ }//if non-empty dataset ++ }//for all inputs ++ } + } + + +@@ -235,8 +249,8 @@ + { + VISU::TTimerLog aTimerLog(MYDEBUG,"VISU_AppendFilter::Execute"); + vtkUnstructuredGrid *anOutput = this->GetOutput(); +- if(this->NumberOfInputs == 1){ +- anOutput->ShallowCopy(this->Inputs[0]); ++ if(this->GetInputList()->GetNumberOfItems() == 1){ ++ anOutput->ShallowCopy(this->GetInput(0)); + return; + } + +@@ -247,8 +261,8 @@ + return; + + if(IsMergingInputs()){ +- TCellIdMerger aFunctor(this->NumberOfInputs); +- ForEachInput(this->Inputs, this->NumberOfInputs, aFunctor); ++ TCellIdMerger aFunctor(this->GetInputList()->GetNumberOfItems()); ++ ForEachInput(this->GetInputList(), aFunctor); + + vtkDataSetAttributes::FieldList& aFieldList = aFunctor.myFieldList; + TObject2InputIdMap& anObject2InputIdMap = aFunctor.myObject2InputIdMap; +@@ -275,7 +289,7 @@ + //TObjectId anObjectId = anIter->first; + const TInputCellId& anInputCellId = anIter->second; + TInputId anInputId = anInputCellId.first; +- if(vtkDataSet *aDataSet = (vtkDataSet *)(this->Inputs[anInputId])){ ++ if(vtkDataSet *aDataSet = (vtkDataSet *)(this->GetInput(anInputId))){ + TCellId aCellId = anInputCellId.second; + aDataSet->GetCellPoints(aCellId, anIdList); + +@@ -288,8 +302,8 @@ + } + anIdList->Delete(); + }else{ +- TCellCounter aFunctor(this->NumberOfInputs); +- ForEachInput(this->Inputs, this->NumberOfInputs, aFunctor); ++ TCellCounter aFunctor(this->GetInputList()->GetNumberOfItems()); ++ ForEachInput(this->GetInputList(), aFunctor); + + vtkDataSetAttributes::FieldList& aFieldList = aFunctor.myFieldList; + vtkIdType aNbCells = aFunctor.GetNbCells(); +@@ -309,8 +323,8 @@ + // 2.cells + vtkIdList *anIdList = vtkIdList::New(); + anIdList->Allocate(VTK_CELL_SIZE); +- for(vtkIdType anInputId = 0; anInputId < this->NumberOfInputs; anInputId++) { +- if(vtkDataSet *aDataSet = (vtkDataSet *)(this->Inputs[anInputId])){ ++ for(vtkIdType anInputId = 0; anInputId < this->GetInputList()->GetNumberOfItems(); anInputId++) { ++ if(vtkDataSet *aDataSet = (vtkDataSet *)(this->GetInput(anInputId))){ + vtkIdType aNbCells = aDataSet->GetNumberOfCells(); + vtkCellData *aCellData = aDataSet->GetCellData(); + // copy cell and cell data +--- salome-3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_CutPlanesPL.cxx~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_CutPlanesPL.cxx 2008-01-17 21:58:08.000000000 -0500 +@@ -127,7 +127,7 @@ + VISU_CutPlanesPL + ::ClearAppendPolyData(vtkAppendPolyData *theAppendPolyData) + { +- int iEnd = theAppendPolyData->GetNumberOfInputs(); ++ int iEnd = theAppendPolyData->GetTotalNumberOfInputConnections(); + for(int i = iEnd-1; i >= 0; i--) + theAppendPolyData->RemoveInput(theAppendPolyData->GetInput(i)); + } +--- salome-3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_StreamLinesPL.cxx~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_StreamLinesPL.cxx 2008-01-17 22:19:47.000000000 -0500 +@@ -64,13 +64,13 @@ + myPointsFilter->UnRegisterAllOutputs(); + myPointsFilter->Delete(); + +- myCenters->UnRegisterAllOutputs(); ++ //myCenters->UnRegisterAllOutputs(); + myCenters->Delete(); + +- myGeomFilter->UnRegisterAllOutputs(); ++ //myGeomFilter->UnRegisterAllOutputs(); + myGeomFilter->Delete(); + +- myStream->UnRegisterAllOutputs(); ++ //myStream->UnRegisterAllOutputs(); + myStream->Delete(); + } + +--- salome-3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_DeformedShapePL.cxx~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_DeformedShapePL.cxx 2008-01-17 22:14:20.000000000 -0500 +@@ -43,10 +43,10 @@ + VISU_DeformedShapePL + ::~VISU_DeformedShapePL() + { +- myWarpVector->UnRegisterAllOutputs(); ++ //myWarpVector->UnRegisterAllOutputs(); + myWarpVector->Delete(); + +- myCellDataToPointData->UnRegisterAllOutputs(); ++ //myCellDataToPointData->UnRegisterAllOutputs(); + myCellDataToPointData->Delete(); + } + +--- salome-3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_IsoSurfacesPL.cxx~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_IsoSurfacesPL.cxx 2008-01-17 22:13:35.000000000 -0500 +@@ -44,10 +44,10 @@ + VISU_IsoSurfacesPL + ::~VISU_IsoSurfacesPL() + { +- myContourFilter->UnRegisterAllOutputs(); ++ //myContourFilter->UnRegisterAllOutputs(); + myContourFilter->Delete(); + +- myCellDataToPointData->UnRegisterAllOutputs(); ++ //myCellDataToPointData->UnRegisterAllOutputs(); + myCellDataToPointData->Delete(); + } + +--- salome-3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_GaussPointsPL.cxx~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_GaussPointsPL.cxx 2008-01-17 22:24:33.000000000 -0500 +@@ -311,7 +311,7 @@ + ::GetNodeCoord(int theObjID) + { + vtkIdType anID = GetNodeVTKID(theObjID); +- vtkDataSet* aDataSet = myGeomFilter->GetInput(); ++ vtkDataSet* aDataSet = (vtkDataSet *)myGeomFilter->GetInput(); + return aDataSet->GetPoint(anID); + } + +--- salome-3.2.6/VISU_SRC_3.2.6/src/PIPELINE/SALOME_ExtractGeometry.cxx~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/VISU_SRC_3.2.6/src/PIPELINE/SALOME_ExtractGeometry.cxx 2008-01-17 22:25:28.000000000 -0500 +@@ -202,7 +202,7 @@ + vtkFloatingPointType multiplier; + vtkPoints *newPts; + vtkIdList *newCellPts; +- vtkDataSet *input = this->GetInput(); ++ vtkDataSet *input = (vtkDataSet *)this->GetInput(); + vtkPointData *pd = input->GetPointData(); + vtkCellData *cd = input->GetCellData(); + vtkUnstructuredGrid *output = this->GetOutput(); +--- salome-3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_ScalarBarCtrl.cxx~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_ScalarBarCtrl.cxx 2008-01-17 22:26:48.000000000 -0500 +@@ -34,7 +34,6 @@ + #include + #include + #include +-#include + + #include + +--- salome-3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.cxx~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/VISU_SRC_3.2.6/src/PIPELINE/VISU_ScalarMapOnDeformedShapePL.cxx 2008-01-17 22:28:06.000000000 -0500 +@@ -66,7 +66,7 @@ + VISU_ScalarMapOnDeformedShapePL + ::~VISU_ScalarMapOnDeformedShapePL() + { +- myDeformVectors->UnRegisterAllOutputs(); ++ //myDeformVectors->UnRegisterAllOutputs(); + myDeformVectors->Delete(); + + myMergeFilter->UnRegisterAllOutputs(); +@@ -75,7 +75,7 @@ + myExtractorScalars->UnRegisterAllOutputs(); + myExtractorScalars->Delete(); + +- myCellDataToPointData->UnRegisterAllOutputs(); ++ //myCellDataToPointData->UnRegisterAllOutputs(); + myCellDataToPointData->Delete(); + } + +--- salome-3.2.6/GUI_SRC_3.2.6/adm_local/unix/config_files/check_vtk.m4~ 2008-01-17 15:06:29.000000000 -0500 ++++ salome-3.2.6/GUI_SRC_3.2.6/adm_local/unix/config_files/check_vtk.m4 2008-01-17 22:33:25.000000000 -0500 +@@ -70,7 +70,7 @@ + fi + + LOCAL_INCLUDES="$OGL_INCLUDES" +-LOCAL_LIBS="-lvtkCommon -lvtkGraphics -lvtkImaging -lvtkFiltering -lvtkIO -lvtkRendering -lvtkHybrid $OGL_LIBS $LXLIB -lX11 -lXt" ++LOCAL_LIBS="-lvtkCommon -lvtkGraphics -lvtkImaging -lvtkFiltering -lvtkIO -lvtkRendering -lvtkHybrid -lvtkWidgets $OGL_LIBS $LXLIB -lX11 -lXt" + TRY_LINK_LIBS="-lvtkCommon $OGL_LIBS $LXLIB -lX11 -lXt" + + if test -z $VTKHOME +--- salome-3.2.6/VISU_SRC_3.2.6/src/VISU_I/VISU_CutLines_i.cc~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/VISU_SRC_3.2.6/src/VISU_I/VISU_CutLines_i.cc 2008-01-17 22:52:27.000000000 -0500 +@@ -409,7 +409,7 @@ + aTitle = aTitle.simplifyWhiteSpace(); + aTableOfReal->SetTitle(aTitle.latin1()); + +- int iLineEnd = myCutLinesPL->GetAppendPolyData()->GetNumberOfInputs(); ++ int iLineEnd = myCutLinesPL->GetAppendPolyData()->GetTotalNumberOfInputConnections(); + if(MYDEBUG) MESSAGE("CutPlanes_i::BuildTableOfReal iLineEnd = "<GetTuple1(i); + } + if(aFilter){ +- aFilter->UnRegisterAllOutputs(); ++ //aFilter->UnRegisterAllOutputs(); + aFilter->Delete(); + } + } +--- salome-3.2.6/VISU_SRC_3.2.6/src/VISU_I/VISU_StreamLines_i.cc~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/VISU_SRC_3.2.6/src/VISU_I/VISU_StreamLines_i.cc 2008-01-17 23:07:47.000000000 -0500 +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + + using namespace VISU; + using namespace std; +@@ -161,7 +162,7 @@ + + VISU::StreamLines_i::~StreamLines_i(){ + if(MYDEBUG) MESSAGE("StreamLines_i::~StreamLines_i()"); +- myAppendFilter->UnRegisterAllOutputs(); ++ //myAppendFilter->UnRegisterAllOutputs(); + myAppendFilter->Delete(); + } + +@@ -178,7 +179,7 @@ + vtkPointSet* aSource = NULL; + if(!thePrs3d->_is_nil()) + if((aPrs3di = dynamic_cast(VISU::GetServant(thePrs3d).in()))){ +- for(int i = myAppendFilter->GetNumberOfInputs()-1; i >= 0; i--) ++ for(int i = myAppendFilter->GetInputList()->GetNumberOfItems()-1; i >= 0; i--) + myAppendFilter->RemoveInput(myAppendFilter->GetInput(i)); + myAppendFilter->AddInput(aPrs3di->GetPL()->GetMapper()->GetInput()); + aSource = myAppendFilter->GetOutput(); +--- salome-3.2.6/VISU_SRC_3.2.6/src/VISUGUI/VisuGUI_ClippingDlg.cxx~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/VISU_SRC_3.2.6/src/VISUGUI/VisuGUI_ClippingDlg.cxx 2008-01-17 23:21:45.000000000 -0500 +@@ -218,7 +218,7 @@ + myMapper->RemoveAllInputs(); + myMapper->Delete(); + +- myPlaneSource->UnRegisterAllOutputs(); ++ //myPlaneSource->UnRegisterAllOutputs(); + myPlaneSource->Delete(); + } + +--- salome-3.2.6/VISU_SRC_3.2.6/src/VISUGUI/VisuGUI_Plot3DDlg.cxx~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/VISU_SRC_3.2.6/src/VISUGUI/VisuGUI_Plot3DDlg.cxx 2008-01-17 23:23:23.000000000 -0500 +@@ -119,7 +119,7 @@ + ~TPlane() { + myMapper->RemoveAllInputs(); + myMapper->Delete(); +- myPlaneSource->UnRegisterAllOutputs(); ++ //myPlaneSource->UnRegisterAllOutputs(); + myPlaneSource->Delete(); + }; + // Not implemented. --- salome-3.2.6.orig/debian/patch-libtool-fortran-tag +++ salome-3.2.6/debian/patch-libtool-fortran-tag @@ -0,0 +1,11 @@ +--- salome-3.2.6/SMESH_SRC_3.2.6/adm_local/unix/make_conclude.in~ 2008-01-18 00:28:03.000000000 -0500 ++++ salome-3.2.6/SMESH_SRC_3.2.6/adm_local/unix/make_conclude.in 2008-01-18 07:30:52.000000000 -0500 +@@ -311,7 +311,7 @@ + $(FC) $(FCFLAGS) -c $< -o $@ + + .f.lo: +- $(LT) --mode=compile $(FC) $(FCFLAGS) -c $< ++ $(LT) --mode=compile --tag=F77 $(FC) $(FCFLAGS) -c $< + + .ui.h: + $(UIC) -o $@ $< --- salome-3.2.6.orig/debian/patch-calc-missing-sources +++ salome-3.2.6/debian/patch-calc-missing-sources @@ -0,0 +1,37 @@ +--- salome-3.2.6/CALCULATOR_SRC_3.2.6/src/CALCULATOR/Makefile.in~ 2007-04-24 12:41:05.000000000 -0400 ++++ salome-3.2.6/CALCULATOR_SRC_3.2.6/src/CALCULATOR/Makefile.in 2008-01-17 09:24:38.000000000 -0500 +@@ -43,7 +43,33 @@ + LDFLAGS+= $(KERNEL_LDFLAGS) -lSalomeContainer -lOpUtil $(MED2_LIBS) $(HDF5_LIBS) $(MED_LDFLAGS) -lMEDClientcmodule + + MED.hh MEDSK.cc: MED.idl +- omniidl -bcxx -Wbtp -I$(top_builddir)/idl -I${KERNEL_ROOT_DIR}/idl/salome $^ ++ $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< ++ ++CALCULATOR_Gen.hh CALCULATOR_GenSK.cc: CALCULATOR_Gen.idl ++ $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< ++ ++CALCULATOR.lo: MED.hh CALCULATOR_Gen.hh ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ ++SALOME_CommSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_CommSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOMEDSSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDSSK.cc ++ cp $< $@ ++ ++LoggerSK.cc: $(KERNEL_ROOT_DIR)/idl/LoggerSK.cc ++ cp $< $@ ++ ++SALOMEDS_AttributesSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDS_AttributesSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ + + + --- salome-3.2.6.orig/debian/patch-sier-add-visu-vars +++ salome-3.2.6/debian/patch-sier-add-visu-vars @@ -0,0 +1,24 @@ +--- salome-3.2.6/SIERPINSKY_SRC_3.2.6/adm_local/unix/make_commence.in~ 2008-01-17 10:48:08.000000000 -0500 ++++ salome-3.2.6/SIERPINSKY_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-17 14:33:07.000000000 -0500 +@@ -234,6 +234,10 @@ + RANDOMIZER_CXXFLAGS=@RANDOMIZER_CXXFLAGS@ + RANDOMIZER_LDFLAGS=@RANDOMIZER_LDFLAGS@ + ++VISU_ROOT_DIR=@VISU_ROOT_DIR@ ++VISU_CXXFLAGS=@VISU_CXXFLAGS@ ++VISU_LDFLAGS=@VISU_LDFLAGS@ ++ + ## Installation points + prefix=@prefix@ + exec_prefix=@exec_prefix@ +--- salome-3.2.6/SIERPINSKY_SRC_3.2.6/src/SierpinskyGUI/Makefile.in~ 2006-06-01 07:50:03.000000000 -0400 ++++ salome-3.2.6/SIERPINSKY_SRC_3.2.6/src/SierpinskyGUI/Makefile.in 2008-01-17 14:41:34.000000000 -0500 +@@ -9,7 +9,7 @@ + top_srcdir=@top_srcdir@ + top_builddir=../.. + srcdir=@srcdir@ +-VPATH=.:@srcdir@:@top_srcdir@/idl:$(top_builddir)/idl:${RANDOMIZER_ROOT_DIR}/idl/salome ++VPATH=.:@srcdir@:@top_srcdir@/idl:$(top_builddir)/idl:${RANDOMIZER_ROOT_DIR}/idl/salome:${VISU_ROOT_DIR}/idl/salome + + @COMMENCE@ + --- salome-3.2.6.orig/debian/patch-med-missing-stuff +++ salome-3.2.6/debian/patch-med-missing-stuff @@ -0,0 +1,251 @@ +--- salome-3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_CellModel.hxx~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_CellModel.hxx 2008-01-14 22:13:15.000000000 -0500 +@@ -232,6 +232,7 @@ + return _constituentsType[dim-1][num-1]; + } + ++ ostream & operator<<(ostream &os,const CELLMODEL &my); + }//End of namespace MEDMEM + + #endif /* CELLMODEL_HXX */ +--- salome-3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_Exception.hxx~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_Exception.hxx 2008-01-14 22:23:04.000000000 -0500 +@@ -75,6 +75,7 @@ + ~MED_DRIVER_NOT_FOUND_EXCEPTION() throw(); + + }; ++ostream & operator<< (ostream &os, const MEDEXCEPTION &ex ); + }; + + #endif /* MEDEXCEPTION_HXX */ +--- salome-3.2.6/MED_SRC_3.2.6/Makefile.in~ 2008-01-15 19:59:11.000000000 -0500 ++++ salome-3.2.6/MED_SRC_3.2.6/Makefile.in 2008-01-16 00:14:41.000000000 -0500 +@@ -245,7 +245,7 @@ + done + + # install script in $(bindir) : +-install-bin: $(BIN_SCRIPT) ++install-bin: $(BIN_SCRIPT) bin/salome/VERSION + $(INSTALL) -d $(DESTDIR)$(bindir) + for f in X $(BIN_SCRIPT); do \ + if test $$f != X; then \ +--- salome-3.2.6/MED_SRC_3.2.6/src/Makefile.in~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/MED_SRC_3.2.6/src/Makefile.in 2008-01-16 17:34:19.000000000 -0500 +@@ -33,7 +33,7 @@ + + #SUBDIRS = MEDWrapper INTERPOLATION MEDMEM MEDMEM_SWIG MEDMEM_I MED MEDGUI MedCorba_Swig MED_SWIG MedClient + +-SUBDIRS = MEDWrapper INTERPOLATION MEDMEM MEDMEM_SWIG ++SUBDIRS = MEDWrapper MEDMEM INTERPOLATION MEDMEM_SWIG + + ifeq ($(MED_WITH_KERNEL),yes) + SUBDIRS+= MEDMEM_I MED MedCorba_Swig MED_SWIG MedClient +--- salome-3.2.6/MED_SRC_3.2.6/src/MEDMEM_I/Makefile.in~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/MED_SRC_3.2.6/src/MEDMEM_I/Makefile.in 2008-01-16 18:12:10.000000000 -0500 +@@ -71,6 +71,34 @@ + # does we put only -lSalomeContainer and compiler retrieves -lSalomeNS -lRegistry -lOpUtil ???? + + MED.hh MEDSK.cc: MED.idl +- omniidl -bcxx -Wbtp -I$(top_builddir)/idl -I${KERNEL_ROOT_DIR}/idl/salome $^ ++ $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< ++ ++MEDMEM_Med_i.lo: MED.hh SALOME_GenericObj_i.hh ++ ++SALOME_GenericObj_i.hh: $(KERNEL_ROOT_DIR)/src/GenericObj/SALOME_GenericObj_i.hh ++ cp $< $@ ++ ++MEDMEM_Field_i.lo: MED_Gen.hh ++ ++MED_Gen.hh MEDSK.cc: MED_Gen.idl ++ $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ ++SALOMEDSSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDSSK.cc ++ cp $< $@ ++ ++SALOMEDS_AttributesSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDS_AttributesSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOME_CommSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_CommSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ + + @CONCLUDE@ +--- salome-3.2.6/MED_SRC_3.2.6/src/MED/Makefile.in~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/MED_SRC_3.2.6/src/MED/Makefile.in 2008-01-16 18:32:19.000000000 -0500 +@@ -65,6 +65,38 @@ + -lSalomeContainer -lSalomeHDFPersist -lSalomeDS -lSalomeNS -lRegistry -lOpUtil -L../MEDMEM_I -lMEDMEMImpl + + MED.hh MEDSK.cc: MED.idl +- omniidl -bcxx -Wbtp -I$(top_builddir)/idl -I${KERNEL_ROOT_DIR}/idl/salome $^ ++ $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< ++ ++MED_Gen.hh MED_GenSK.cc: MED_Gen.idl ++ $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< ++ ++SALOME_GenericObj_i.hh: $(KERNEL_ROOT_DIR)/src/GenericObj/SALOME_GenericObj_i.hh ++ cp $< $@ ++ ++Med_Gen_Driver_i.lo: MED.hh MED_Gen.hh SALOME_GenericObj_i.hh ++ ++SALOMEDSSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDSSK.cc ++ cp $< $@ ++ ++SALOMEDS_AttributesSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDS_AttributesSK.cc ++ cp $< $@ ++ ++SALOME_ModuleCatalogSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ModuleCatalogSK.cc ++ cp $< $@ ++ ++SALOME_CommSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_CommSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ ++SALOME_ContainerManagerSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ContainerManagerSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ + + @CONCLUDE@ +--- salome-3.2.6/MED_SRC_3.2.6/src/MedCorba_Swig/Makefile.in~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/MED_SRC_3.2.6/src/MedCorba_Swig/Makefile.in 2008-01-16 18:38:36.000000000 -0500 +@@ -78,6 +78,24 @@ + ############################################################################# + + MED.hh MEDSK.cc: MED.idl +- omniidl -bcxx -Wbtp -I$(top_builddir)/idl -I${KERNEL_ROOT_DIR}/idl/salome $^ ++ $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< + ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ ++SALOMEDSSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDSSK.cc ++ cp $< $@ ++ ++SALOMEDS_AttributesSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDS_AttributesSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOME_CommSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_CommSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ + @CONCLUDE@ +--- salome-3.2.6/MED_SRC_3.2.6/src/MedClient/src/Makefile.in~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/MED_SRC_3.2.6/src/MedClient/src/Makefile.in 2008-01-16 19:32:54.000000000 -0500 +@@ -101,6 +101,24 @@ + LDFLAGS+=${KERNEL_LDFLAGS} -lOpUtil -L../../MedCorba_Swig -lMedCorba_Swigcmodule -L../../MEDMEM -lmedmem + + MED.hh MEDSK.cc: MED.idl +- omniidl -bcxx -Wbtp -I$(top_builddir)/idl -I${KERNEL_ROOT_DIR}/idl/salome $^ ++ $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ ++SALOMEDSSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDSSK.cc ++ cp $< $@ ++ ++SALOMEDS_AttributesSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDS_AttributesSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOME_CommSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_CommSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ + + @CONCLUDE@ +--- salome-3.2.6/MED_SRC_3.2.6/src/MedClient/test/test2/Makefile.in~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/MED_SRC_3.2.6/src/MedClient/test/test2/Makefile.in 2008-01-16 20:17:29.000000000 -0500 +@@ -69,7 +69,25 @@ + SWIG_DEP = libMEDClient.i libMEDMEM_Swig.i libMedCorba_Swig.i + + MED.hh MEDSK.cc: MED.idl +- omniidl -bcxx -Wbtp -I$(top_builddir)/idl -I${KERNEL_ROOT_DIR}/idl/salome $^ ++ $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ ++SALOMEDSSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDSSK.cc ++ cp $< $@ ++ ++SALOMEDS_AttributesSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDS_AttributesSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOME_CommSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_CommSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ + + @CONCLUDE@ + +--- salome-3.2.6/MED_SRC_3.2.6/src/MEDGUI/Makefile.in~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/MED_SRC_3.2.6/src/MEDGUI/Makefile.in 2008-01-16 20:32:15.000000000 -0500 +@@ -63,6 +63,29 @@ + LDFLAGS += -lSalomeApp -L../MEDMEM_I -lMEDMEMImpl -L../MEDMEM -lmedmem -L../MED -lMEDEngine ${KERNEL_LDFLAGS} ${GUI_LDFLAGS} + + MED.hh MEDSK.cc: MED.idl +- omniidl -bcxx -Wbtp -I$(top_builddir)/idl -I${KERNEL_ROOT_DIR}/idl/salome $^ ++ $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< ++ ++MED_Gen.hh MED_GenSK.cc: MED_Gen.idl ++ $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< ++ ++MedGUI.lo: MED_Gen.hh MED.hh ++ ++SALOMEDSSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDSSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ ++SALOMEDS_AttributesSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDS_AttributesSK.cc ++ cp $< $@ ++ ++SALOME_CommSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_CommSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ + + @CONCLUDE@ +--- salome-3.2.6/MED_SRC_3.2.6/src/MEDMEM/Makefile.in~ 2008-01-16 21:56:43.000000000 -0500 ++++ salome-3.2.6/MED_SRC_3.2.6/src/MEDMEM/Makefile.in 2008-01-16 23:39:17.000000000 -0500 +@@ -167,7 +167,7 @@ + + CPPFLAGS+=$(MED2_INCLUDES) $(HDF5_INCLUDES) + +-CXXFLAGS+=@CXXTMPDPTHFLAGS@ ++CXXFLAGS+=@CXXTMPDPTHFLAGS@ -I../INTERPOLATION + #LDFLAGS+=$(MED2_LIBS) $(HDF5_LIBS) + # change motivated by the bug KERNEL4778. + LDFLAGS+=$(MED2_LIBS) $(HDF5_LIBS) -L../MEDWrapper/V2_1/Core -lmed_V2_1 $(STDLIB) --- salome-3.2.6.orig/debian/python2.4-salome.files +++ salome-3.2.6/debian/python2.4-salome.files @@ -0,0 +1,2 @@ +usr/lib/python2.4/site-packages/salome/* +usr/lib/python2.4/site-packages/salome/*/* --- salome-3.2.6.orig/debian/patch-sier-missing-sources +++ salome-3.2.6/debian/patch-sier-missing-sources @@ -0,0 +1,54 @@ +--- salome-3.2.6/SIERPINSKY_SRC_3.2.6/src/Sierpinsky/Makefile.in~ 2006-06-01 07:50:03.000000000 -0400 ++++ salome-3.2.6/SIERPINSKY_SRC_3.2.6/src/Sierpinsky/Makefile.in 2008-01-17 14:19:39.000000000 -0500 +@@ -28,4 +28,21 @@ + LDFLAGS += $(KERNEL_LDFLAGS) $(MED_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace -lgd -lMEDWrapper + LDFLAGSFORBIN += $(KERNEL_LDFLAGS) $(MED_LDFLAGS) -lSalomeContainer -lSalomeNS -lOpUtil -lRegistry -lSalomeNotification -lSALOMELocalTrace -lgd -lMEDWrapper -lMEDWrapper_V2_2 -lMEDWrapper_V2_1 -lMEDWrapperBase + ++SIERPINSKY_Gen_i.lo: Sierpinsky.hh ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOMEDSSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDSSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ ++SALOME_CommSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_CommSK.cc ++ cp $< $@ ++ + @CONCLUDE@ +--- salome-3.2.6/SIERPINSKY_SRC_3.2.6/src/SierpinskyGUI/Makefile.in~ 2006-06-01 07:50:03.000000000 -0400 ++++ salome-3.2.6/SIERPINSKY_SRC_3.2.6/src/SierpinskyGUI/Makefile.in 2008-01-17 14:43:38.000000000 -0500 +@@ -38,5 +38,27 @@ + CXXFLAGS+= $(QT_INCLUDES) $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) $(RANDOMIZER_CXXFLAGS) $(GUI_CXXFLAGS) + + LDFLAGS+= $(KERNEL_LDFLAGS) $(QT_LIBS) $(GUI_LDFLAGS) -lSalomeApp -L../Sierpinsky -lSIERPINSKYEngine $(RANDOMIZER_LDFLAGS) -lSalomeLifeCycleCORBA ++ ++SierpinskyGUI.lo: Sierpinsky.hh ++ ++SierpinskyGUI_RunDlg.lo: Randomizer.hh VISU_Gen.hh MED.hh ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOMEDSSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDSSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ ++SALOMEDS_AttributesSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDS_AttributesSK.cc ++ cp $< $@ ++ ++SALOME_CommSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_CommSK.cc ++ cp $< $@ + + @CONCLUDE@ --- salome-3.2.6.orig/debian/patch-hello-missing-sources +++ salome-3.2.6/debian/patch-hello-missing-sources @@ -0,0 +1,56 @@ +--- salome-3.2.6/HELLO_SRC_3.2.6/src/HELLO/Makefile.in~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/HELLO_SRC_3.2.6/src/HELLO/Makefile.in 2008-01-17 08:32:43.000000000 -0500 +@@ -44,5 +44,19 @@ + + # Executables targets + ++HELLO.lo: HELLO_Gen.hh ++ ++HELLO_Gen.hh: HELLO_Gen.idl ++ $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++LoggerSK.cc: $(KERNEL_ROOT_DIR)/idl/LoggerSK.cc ++ cp $< $@ ++ + @CONCLUDE@ + +--- salome-3.2.6/HELLO_SRC_3.2.6/src/HELLOGUI/Makefile.in~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/HELLO_SRC_3.2.6/src/HELLOGUI/Makefile.in 2008-01-17 08:39:10.000000000 -0500 +@@ -46,6 +46,31 @@ + CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + LDFLAGS += -lSalomeApp -L../HELLO -lHELLOEngine $(KERNEL_LDFLAGS) $(GUI_LDFLAGS) + ++HELLOGUI.lo: HELLO_Gen.hh ++ ++HELLO_Gen.hh: HELLO_Gen.idl ++ $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< ++ ++SALOMEDSSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDSSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOME_ModuleCatalogSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ModuleCatalogSK.cc ++ cp $< $@ ++ ++SALOMEDS_AttributesSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDS_AttributesSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ ++LoggerSK.cc: $(KERNEL_ROOT_DIR)/idl/LoggerSK.cc ++ cp $< $@ + + + @CONCLUDE@ --- salome-3.2.6.orig/debian/patch-geom-missing-sources +++ salome-3.2.6/debian/patch-geom-missing-sources @@ -0,0 +1,524 @@ +--- salome-3.2.6/GEOM_SRC_3.2.6/src/SKETCHER/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/SKETCHER/Makefile.in 2008-01-16 07:43:32.000000000 -0500 +@@ -47,5 +47,17 @@ + CXXFLAGS += $(KERNEL_CXXFLAGS) + LDFLAGS += $(CAS_KERNEL) $(CAS_MODELER) $(KERNEL_LDFLAGS) + ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ ++SALOMEDSSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDSSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ + @CONCLUDE@ + +--- salome-3.2.6/GEOM_SRC_3.2.6/src/GEOM_I/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/GEOM_I/Makefile.in 2008-01-16 08:13:40.000000000 -0500 +@@ -95,4 +95,27 @@ + CLEAN = + DISTCLEAN = + ++GEOM_Object_i.lo: GEOM_Gen.hh SALOME_GenericObj_i.hh ++ ++GEOM_Gen.hh: ../../idl/GEOM_Gen.idl ++ $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< ++ ++SALOME_GenericObj_i.hh: $(KERNEL_ROOT_DIR)/src/GenericObj/SALOME_GenericObj_i.hh ++ cp $< $@ ++ ++SALOMEDSSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDSSK.cc ++ cp $< $@ ++ ++SALOMEDS_AttributesSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDS_AttributesSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ + @CONCLUDE@ +--- salome-3.2.6/GEOM_SRC_3.2.6/src/GEOMClient/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/GEOMClient/Makefile.in 2008-01-16 08:18:34.000000000 -0500 +@@ -57,6 +57,22 @@ + CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) + LDFLAGS += $(CAS_TKTopAlgo) $(KERNEL_LDFLAGS) + ++GEOM_Client.lo: GEOM_Gen.hh ++ ++GEOM_Gen.hh: ../../idl/GEOM_Gen.idl ++ $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ ++SALOMEDSSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDSSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ + + @CONCLUDE@ + +--- salome-3.2.6/GEOM_SRC_3.2.6/src/GEOMFiltersSelection/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/GEOMFiltersSelection/Makefile.in 2008-01-16 08:37:39.000000000 -0500 +@@ -67,4 +67,16 @@ + CLEAN = + DISTCLEAN = + ++SALOMEDSSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDSSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ + @CONCLUDE@ +--- salome-3.2.6/GEOM_SRC_3.2.6/src/GEOMGUI/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/GEOMGUI/Makefile.in 2008-01-16 08:54:38.000000000 -0500 +@@ -75,5 +75,25 @@ + CXXFLAGS += $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + + LDFLAGS += -L../GEOMFiltersSelection -lGEOMFiltersSelection $(KERNEL_LDFLAGS) $(GUI_LDFLAGS) -lOCCViewer -lVTKViewer -lSalomeApp -lCAM -L../GEOMClient -lGEOMClient -lSOCC -lSVTK -L../OBJECT -lGEOMObject -lToolsGUI -lEvent ++ ++GeometryGUI.lo: GEOM_Gen.hh ++ ++GEOM_Gen.hh: ../../idl/GEOM_Gen.idl ++ $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOMEDSSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDSSK.cc ++ cp $< $@ ++ ++SALOMEDS_AttributesSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDS_AttributesSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ + + @CONCLUDE@ +--- salome-3.2.6/GEOM_SRC_3.2.6/src/GEOMBase/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/GEOMBase/Makefile.in 2008-01-16 08:59:31.000000000 -0500 +@@ -68,5 +68,25 @@ + CXXFLAGS += $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + + LDFLAGS += $(KERNEL_LDFLAGS) $(GUI_LDFLAGS) -L../DlgRef -lDlgRef -L../GEOMGUI -lGEOM -lsuit -lOCCViewer -lVTKViewer $(CAS_LDPATH) -lTKPrim ++ ++GEOMBase.lo: GEOM_Gen.hh ++ ++GEOM_Gen.hh: ../../idl/GEOM_Gen.idl ++ $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOMEDSSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDSSK.cc ++ cp $< $@ ++ ++SALOMEDS_AttributesSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDS_AttributesSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ + + @CONCLUDE@ +--- salome-3.2.6/GEOM_SRC_3.2.6/src/GEOMToolsGUI/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/GEOMToolsGUI/Makefile.in 2008-01-16 09:05:16.000000000 -0500 +@@ -61,5 +61,22 @@ + CXXFLAGS += $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + + LDFLAGS += $(KERNEL_LDFLAGS) $(GUI_LDFLAGS) -L../GEOMBase -lGEOMBase -lVTKViewer -lOCCViewer -lsuit -lSalomeApp ++ ++GEOMToolsGUI.lo: GEOM_Gen.hh ++ ++GEOM_Gen.hh: ../../idl/GEOM_Gen.idl ++ $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< ++ ++SALOMEDS_AttributesSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDS_AttributesSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ + + @CONCLUDE@ +--- salome-3.2.6/GEOM_SRC_3.2.6/src/DisplayGUI/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/DisplayGUI/Makefile.in 2008-01-16 09:15:09.000000000 -0500 +@@ -54,5 +54,19 @@ + CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + + LDFLAGS += -L../GEOMGUI -lGEOM ++ ++DisplayGUI.lo: GEOM_Gen.hh ++ ++GEOM_Gen.hh: ../../idl/GEOM_Gen.idl ++ $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ + + @CONCLUDE@ +--- salome-3.2.6/GEOM_SRC_3.2.6/src/BasicGUI/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/BasicGUI/Makefile.in 2008-01-16 09:25:29.000000000 -0500 +@@ -74,5 +74,19 @@ + CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + + LDFLAGS += -L../GEOMFiltersSelection -lGEOMFiltersSelection -L../GEOMBase -lGEOMBase -L../GEOMGUI -lGEOM ++ ++BasicGUI.lo: GEOM_Gen.hh ++ ++GEOM_Gen.hh: ../../idl/GEOM_Gen.idl ++ $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ + + @CONCLUDE@ +--- salome-3.2.6/GEOM_SRC_3.2.6/src/PrimitiveGUI/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/PrimitiveGUI/Makefile.in 2008-01-16 09:35:16.000000000 -0500 +@@ -64,5 +64,19 @@ + CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + + LDFLAGS += -L../GEOMFiltersSelection -lGEOMFiltersSelection -L../GEOMBase -lGEOMBase ++ ++PrimitiveGUI.lo: GEOM_Gen.hh ++ ++GEOM_Gen.hh: ../../idl/GEOM_Gen.idl ++ $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ + + @CONCLUDE@ +--- salome-3.2.6/GEOM_SRC_3.2.6/src/GenerationGUI/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/GenerationGUI/Makefile.in 2008-01-16 09:39:53.000000000 -0500 +@@ -62,5 +62,19 @@ + CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + + LDFLAGS += -L../GEOMFiltersSelection -lGEOMFiltersSelection -L../GEOMBase -lGEOMBase $(CAS_LDPATH) -lTKOffset ++ ++GenerationGUI.lo: GEOM_Gen.hh ++ ++GEOM_Gen.hh: ../../idl/GEOM_Gen.idl ++ $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ + + @CONCLUDE@ +--- salome-3.2.6/GEOM_SRC_3.2.6/src/EntityGUI/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/EntityGUI/Makefile.in 2008-01-16 09:45:09.000000000 -0500 +@@ -84,5 +84,19 @@ + CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + + LDFLAGS += -L../GEOMFiltersSelection -lGEOMFiltersSelection -L../SKETCHER -lGEOMSketcher -L../GEOMBase -lGEOMBase -L../GEOMGUI -lGEOM ++ ++EntityGUI.lo: GEOM_Gen.hh ++ ++GEOM_Gen.hh: ../../idl/GEOM_Gen.idl ++ $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ + + @CONCLUDE@ +--- salome-3.2.6/GEOM_SRC_3.2.6/src/BuildGUI/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/BuildGUI/Makefile.in 2008-01-16 09:50:44.000000000 -0500 +@@ -66,5 +66,19 @@ + CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + + LDFLAGS += -L../GEOMFiltersSelection -lGEOMFiltersSelection -L../GEOMBase -lGEOMBase ++ ++BuildGUI.lo: GEOM_Gen.hh ++ ++GEOM_Gen.hh: ../../idl/GEOM_Gen.idl ++ $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ + + @CONCLUDE@ +--- salome-3.2.6/GEOM_SRC_3.2.6/src/BooleanGUI/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/BooleanGUI/Makefile.in 2008-01-16 09:54:26.000000000 -0500 +@@ -56,5 +56,19 @@ + CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + + LDFLAGS += -L../GEOMBase -lGEOMBase ++ ++BooleanGUI.lo: GEOM_Gen.hh ++ ++GEOM_Gen.hh: ../../idl/GEOM_Gen.idl ++ $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ + + @CONCLUDE@ +--- salome-3.2.6/GEOM_SRC_3.2.6/src/TransformationGUI/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/TransformationGUI/Makefile.in 2008-01-16 09:59:26.000000000 -0500 +@@ -70,5 +70,19 @@ + CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + + LDFLAGS += -L../GEOMFiltersSelection -lGEOMFiltersSelection -L../GEOMBase -lGEOMBase ++ ++TransformationGUI.lo: GEOM_Gen.hh ++ ++GEOM_Gen.hh: ../../idl/GEOM_Gen.idl ++ $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ + + @CONCLUDE@ +--- salome-3.2.6/GEOM_SRC_3.2.6/src/OperationGUI/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/OperationGUI/Makefile.in 2008-01-16 10:04:47.000000000 -0500 +@@ -66,5 +66,19 @@ + CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + + LDFLAGS += $(CAS_LDPATH) -lTKFillet -L../GEOMBase -lGEOMBase ++ ++OperationGUI.lo: GEOM_Gen.hh ++ ++GEOM_Gen.hh: ../../idl/GEOM_Gen.idl ++ $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ + + @CONCLUDE@ +--- salome-3.2.6/GEOM_SRC_3.2.6/src/RepairGUI/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/RepairGUI/Makefile.in 2008-01-16 10:09:16.000000000 -0500 +@@ -76,5 +76,19 @@ + CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + + LDFLAGS += -L../GEOMBase -lGEOMBase ++ ++RepairGUI.lo: GEOM_Gen.hh ++ ++GEOM_Gen.hh: ../../idl/GEOM_Gen.idl ++ $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ + + @CONCLUDE@ +--- salome-3.2.6/GEOM_SRC_3.2.6/src/MeasureGUI/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/MeasureGUI/Makefile.in 2008-01-16 10:16:31.000000000 -0500 +@@ -88,5 +88,19 @@ + CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + + LDFLAGS += -L../GEOMBase -lGEOMBase ++ ++MeasureGUI.lo: GEOM_Gen.hh ++ ++GEOM_Gen.hh: ../../idl/GEOM_Gen.idl ++ $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ + + @CONCLUDE@ +--- salome-3.2.6/GEOM_SRC_3.2.6/src/GroupGUI/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/GroupGUI/Makefile.in 2008-01-16 10:25:48.000000000 -0500 +@@ -56,5 +56,19 @@ + CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + + LDFLAGS += -L../GEOMFiltersSelection -lGEOMFiltersSelection -L../GEOMBase -lGEOMBase ++ ++GroupGUI.lo: GEOM_Gen.hh ++ ++GEOM_Gen.hh: ../../idl/GEOM_Gen.idl ++ $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ + + @CONCLUDE@ +--- salome-3.2.6/GEOM_SRC_3.2.6/src/BlocksGUI/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/BlocksGUI/Makefile.in 2008-01-16 10:44:14.000000000 -0500 +@@ -64,5 +64,19 @@ + CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) + + LDFLAGS += -L../GEOMFiltersSelection -lGEOMFiltersSelection -L../GEOMBase -lGEOMBase ++ ++BlocksGUI.lo: GEOM_Gen.hh ++ ++GEOM_Gen.hh: ../../idl/GEOM_Gen.idl ++ $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ + + @CONCLUDE@ +--- salome-3.2.6/GEOM_SRC_3.2.6/src/GEOM_I_Superv/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/GEOM_I_Superv/Makefile.in 2008-01-16 10:53:07.000000000 -0500 +@@ -60,5 +60,37 @@ + CLEAN = + DISTCLEAN = + ++GEOM_Superv_i.lo: GEOM_Gen.hh SALOME_GenericObj_i.hh GEOM_Superv.hh ++ ++GEOM_Gen.hh: ../../idl/GEOM_Gen.idl ++ $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< ++ ++SALOME_GenericObj_i.hh: $(KERNEL_ROOT_DIR)/src/GenericObj/SALOME_GenericObj_i.hh ++ cp $< $@ ++ ++GEOM_Superv.hh: ../../idl/GEOM_Superv.idl ++ $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< ++ ++SALOMEDSSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDSSK.cc ++ cp $< $@ ++ ++SALOMEDS_AttributesSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDS_AttributesSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ ++SALOME_ModuleCatalogSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ModuleCatalogSK.cc ++ cp $< $@ ++ ++SALOME_SessionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_SessionSK.cc ++ cp $< $@ ++ + @CONCLUDE@ + +--- salome-3.2.6/GEOM_SRC_3.2.6/src/GEOM_SWIG/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/GEOM_SWIG/Makefile.in 2008-01-16 11:08:14.000000000 -0500 +@@ -87,5 +87,20 @@ + CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(KERNEL_CXXFLAGS) -DHAVE_CONFIG_H + LIBS+= $(PYTHON_LIBS) + LDFLAGS+= -L../GEOMGUI -lGEOM ++ ++SALOMEDSSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDSSK.cc ++ cp $< $@ ++ ++SALOMEDS_AttributesSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDS_AttributesSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ + + @CONCLUDE@ --- salome-3.2.6.orig/debian/patch-smesh-missing-sources +++ salome-3.2.6/debian/patch-smesh-missing-sources @@ -0,0 +1,232 @@ +--- salome-3.2.6/SMESH_SRC_3.2.6/src/SMESH_I/Makefile.in~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/SMESH_I/Makefile.in 2008-01-17 10:10:28.000000000 -0500 +@@ -173,4 +173,30 @@ + -lTKMath \ + -lTKShHealing + ++SMESH_Gen_i.lo: GEOM_Gen.hh MED.hh SMESH_Gen.hh SMESH_Mesh.hh SMESH_Hypothesis.hh SMESH_Group.hh ++ ++SMESH_Gen_i.lo: SMESH_Filter.hh ++ ++SMESH_DumpPython.lo: SMESH_MeshEditor.hh ++ ++SMESH_Pattern_i.lo: SMESH_Pattern.hh ++ ++SALOMEDSSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDSSK.cc ++ cp $< $@ ++ ++SALOMEDS_AttributesSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDS_AttributesSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ ++SALOME_CommSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_CommSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ + @CONCLUDE@ +--- salome-3.2.6/SMESH_SRC_3.2.6/src/SMESHClient/Makefile.in~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/SMESHClient/Makefile.in 2008-01-17 10:19:17.000000000 -0500 +@@ -100,5 +100,25 @@ + + LDFLAGSFORBIN += $(LDFLAGS) + ++SMESH_Client.lo: GEOM_Gen.hh MED.hh SMESH_Gen.hh SMESH_Mesh.hh SMESH_Hypothesis.hh ++ ++SALOME_CommSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_CommSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ ++SALOMEDSSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDSSK.cc ++ cp $< $@ ++ ++SALOMEDS_AttributesSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDS_AttributesSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ + @CONCLUDE@ + +--- salome-3.2.6/SMESH_SRC_3.2.6/src/OBJECT/Makefile.in~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/OBJECT/Makefile.in 2008-01-18 00:09:09.000000000 -0500 +@@ -137,4 +137,21 @@ + -lSALOMEBasics \ + -lOpUtil + ++SMESH_Object.lo: GEOM_Gen.hh MED.hh SMESH_Gen.hh SMESH_Mesh.hh SMESH_Group.hh SMESH_Hypothesis.hh ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ ++SALOME_CommSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_CommSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ ++SALOMEDSSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDSSK.cc ++ cp $< $@ ++ + @CONCLUDE@ +--- salome-3.2.6/SMESH_SRC_3.2.6/src/SMESHFiltersSelection/Makefile.in~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/SMESHFiltersSelection/Makefile.in 2008-01-18 00:18:35.000000000 -0500 +@@ -76,4 +76,29 @@ + CLEAN = + DISTCLEAN = + ++SMESH_NumberFilter.lo: GEOM_Gen.hh ++ ++SMESH_GenSK.cc: MED.hh ++ ++SALOME_CommSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_CommSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOMEDSSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDSSK.cc ++ cp $< $@ ++ ++SALOMEDS_AttributesSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDS_AttributesSK.cc ++ cp $< $@ ++ ++SALOME_ModuleCatalogSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ModuleCatalogSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ + @CONCLUDE@ +--- salome-3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/Makefile.in~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/Makefile.in 2008-01-18 07:05:15.000000000 -0500 +@@ -207,4 +207,27 @@ + + LDFLAGSFORBIN += $(LDFLAGS) + ++SMESHGUI.lo: GEOM_Gen.hh MED.hh SMESH_Group.hh SMESH_Hypothesis.hh SMESH_Filter.hh SMESH_MeshEditor.hh SMESH_Pattern.hh SMESH_Gen.hh SMESH_Mesh.hh ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOMEDSSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDSSK.cc ++ cp $< $@ ++ ++SALOMEDS_AttributesSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDS_AttributesSK.cc ++ cp $< $@ ++ ++SALOME_ModuleCatalogSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ModuleCatalogSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ ++SALOME_CommSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_CommSK.cc ++ cp $< $@ ++ + @CONCLUDE@ +--- salome-3.2.6/SMESH_SRC_3.2.6/src/SMESH_SWIG/Makefile.in~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/SMESH_SWIG/Makefile.in 2008-01-18 07:16:08.000000000 -0500 +@@ -120,5 +120,25 @@ + CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(KERNEL_CXXFLAGS) -DHAVE_CONFIG_H + LIBS+= $(PYTHON_LIBS) + LDFLAGS+= -L../SMESHGUI -lSMESH $(KERNEL_LDFLAGS) -lSalomeGenericObj ++ ++SMESH_GenSK.lo: MED.hh ++ ++SALOMEDSSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDSSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOME_ModuleCatalogSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ModuleCatalogSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ ++SALOME_CommSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_CommSK.cc ++ cp $< $@ + + @CONCLUDE@ +--- salome-3.2.6/SMESH_SRC_3.2.6/src/StdMeshers_I/Makefile.in~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/StdMeshers_I/Makefile.in 2008-01-18 08:23:33.000000000 -0500 +@@ -119,5 +119,25 @@ + #IDLCXXFLAGS+= -Wbtp + + LDFLAGS+= $(HDF5_LIBS) -L../StdMeshers -lStdMeshers -L../SMESH_I -lSMESHEngine $(KERNEL_LDFLAGS) ++ ++StdMeshers_i.lo: GEOM_Gen.hh MED.hh SMESH_Gen.hh SMESH_Mesh.hh SMESH_Hypothesis.hh SMESH_Group.hh SMESH_BasicHypothesis.hh ++ ++SALOMEDSSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDSSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOMEDS_AttributesSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDS_AttributesSK.cc ++ cp $< $@ ++ ++SALOME_CommSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_CommSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ + + @CONCLUDE@ +--- salome-3.2.6/SMESH_SRC_3.2.6/src/StdMeshersGUI/Makefile.in~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/StdMeshersGUI/Makefile.in 2008-01-18 08:58:23.000000000 -0500 +@@ -88,4 +88,26 @@ + -lTKBO $(KERNEL_LDFLAGS) $(GEOM_LDFLAGS) $(GUI_LDFLAGS) \ + $(QWT_LIBS) + ++StdMeshersGUI.lo: GEOM_Gen.hh MED.hh SMESH_Hypothesis.hh SMESH_Mesh.hh ++ ++StdMeshersGUI_StdHypothesisCreator.lo: SMESH_Gen.hh SMESH_BasicHypothesis.hh ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOME_CommSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_CommSK.cc ++ cp $< $@ ++ ++SALOMEDSSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDSSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ ++SALOME_ContainerManagerSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ContainerManagerSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ + @CONCLUDE@ --- salome-3.2.6.orig/debian/patch-libtool-exe-link-fix +++ salome-3.2.6/debian/patch-libtool-exe-link-fix @@ -0,0 +1,133 @@ +--- salome-3.2.6/KERNEL_SRC_3.2.6/salome_adm/unix/DEPRECATED/make_conclude.in~ 2008-01-16 23:49:46.000000000 -0500 ++++ salome-3.2.6/KERNEL_SRC_3.2.6/salome_adm/unix/DEPRECATED/make_conclude.in 2008-01-17 06:52:37.000000000 -0500 +@@ -100,7 +100,7 @@ + ln -sf $(CURDIR)/$< $@ + + $(BIN) $(TEST_PROGS): %: %.lo $(BIN_OBJ) +- $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(BIN_LIB) $(LDFLAGSFORBIN) $(LIBSFORBIN) ++ $(LT_LINK_EXE) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(BIN_LIB) $(LDFLAGSFORBIN) $(LIBSFORBIN) + + # copy python scripts in $(top_builddir)/bin/salome + # +--- salome-3.2.6/GUI_SRC_3.2.6/adm_local/unix/make_commence.in~ 2008-01-15 11:34:21.000000000 -0500 ++++ salome-3.2.6/GUI_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-15 12:02:53.000000000 -0500 +@@ -185,8 +185,8 @@ + DOXYGEN_WITH_STL = @DOXYGEN_WITH_STL@ + + ## Shared libraries +-LT_STATIC_EXEC=@LT_STATIC_EXEC@ +-DYNAMIC_DIRS=@DYNAMIC_DIRS@ ++LT_STATIC_EXEC= ++DYNAMIC_DIRS= + LT_LIB=libtool + LT=$(top_builddir)/libtool + LT_COMPILE=$(LT) --mode=compile $(CC) +--- salome-3.2.6/GUI_SRC_3.2.6/adm_local/unix/make_conclude.in~ 2008-01-15 11:34:21.000000000 -0500 ++++ salome-3.2.6/GUI_SRC_3.2.6/adm_local/unix/make_conclude.in 2008-01-15 12:06:20.000000000 -0500 +@@ -127,7 +127,7 @@ + ln -sf $(CURDIR)/$< $@ + + $(BIN) $(TEST_PROGS): %: %.lo $(BIN_OBJ) +- $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(BIN_LIB) $(LDFLAGSFORBIN) $(LIBSFORBIN) ++ $(LT_LINK_EXE) $(CPPFLAGS) $(CXXFLAGS) -o $@ $^ $(BIN_LIB) $(LDFLAGSFORBIN) $(LIBSFORBIN) + + # copy python scripts in $(top_builddir)/bin/salome + # +--- salome-3.2.6/MED_SRC_3.2.6/adm_local/unix/make_commence.in~ 2008-01-14 19:43:49.000000000 -0500 ++++ salome-3.2.6/MED_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-14 23:23:40.000000000 -0500 +@@ -198,8 +198,8 @@ + DOXYGEN_WITH_STL = @DOXYGEN_WITH_STL@ + + ## Shared libraries +-LT_STATIC_EXEC=@LT_STATIC_EXEC@ +-DYNAMIC_DIRS=@DYNAMIC_DIRS@ ++LT_STATIC_EXEC= ++DYNAMIC_DIRS= + LT_LIB=libtool + LT=$(top_builddir)/libtool + LT_COMPILE=$(LT) --mode=compile $(CC) +--- salome-3.2.6/MED_SRC_3.2.6/adm_local/unix/make_conclude.in~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/MED_SRC_3.2.6/adm_local/unix/make_conclude.in 2008-01-14 23:23:19.000000000 -0500 +@@ -97,7 +97,7 @@ + ln -sf $(CURDIR)/$< $@ + + $(BIN) $(TEST_PROGS): %: %.lo $(BIN_OBJ) +- $(CXX) $(CXXFLAGS) -o $@ $^ $(BIN_LIB) $(LDFLAGSFORBIN) $(LIBSFORBIN) ++ $(LT_LINK_EXE) $(CXXFLAGS) -o $@ $^ $(BIN_LIB) $(LDFLAGSFORBIN) $(LIBSFORBIN) + + # copy python scripts in $(top_builddir)/bin/salome + # +--- salome-3.2.6/SUPERV_SRC_3.2.6/adm_local/unix/make_commence.in~ 2008-01-16 23:49:46.000000000 -0500 ++++ salome-3.2.6/SUPERV_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-17 06:54:36.000000000 -0500 +@@ -184,8 +184,8 @@ + DOXYGEN_WITH_STL = @DOXYGEN_WITH_STL@ + + ## Shared libraries +-LT_STATIC_EXEC=@LT_STATIC_EXEC@ +-DYNAMIC_DIRS=@DYNAMIC_DIRS@ ++LT_STATIC_EXEC= ++DYNAMIC_DIRS= + LT_LIB=libtool + LT=$(top_builddir)/libtool + LT_COMPILE=$(LT) --mode=compile $(CC) +--- salome-3.2.6/SMESH_SRC_3.2.6/adm_local/unix/make_commence.in~ 2008-01-16 23:49:46.000000000 -0500 ++++ salome-3.2.6/SMESH_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-17 08:55:20.000000000 -0500 +@@ -184,8 +184,8 @@ + DOXYGEN_WITH_STL = @DOXYGEN_WITH_STL@ + + ## Shared libraries +-LT_STATIC_EXEC=@LT_STATIC_EXEC@ +-DYNAMIC_DIRS=@DYNAMIC_DIRS@ ++LT_STATIC_EXEC= ++DYNAMIC_DIRS= + LT_LIB=libtool + LT=$(top_builddir)/libtool + LT_COMPILE=$(LT) --mode=compile $(CC) +--- salome-3.2.6/SMESH_SRC_3.2.6/adm_local/unix/make_conclude.in~ 2008-01-17 08:50:12.000000000 -0500 ++++ salome-3.2.6/SMESH_SRC_3.2.6/adm_local/unix/make_conclude.in 2008-01-17 08:55:14.000000000 -0500 +@@ -95,7 +95,7 @@ + ln -sf $(CURDIR)/$< $@ + + $(BIN) $(TEST_PROGS): %: %.lo $(BIN_OBJ) +- $(CXX) $(CXXFLAGS) -o $@ $^ $(BIN_LIB) $(LDFLAGSFORBIN) $(LIBSFORBIN) ++ $(LT_LINK_EXE) $(CXXFLAGS) -o $@ $^ $(BIN_LIB) $(LDFLAGSFORBIN) $(LIBSFORBIN) + + # copy python scripts in $(top_builddir)/bin/salome + # +--- salome-3.2.6/COMPONENT_SRC_3.2.6/adm_local/unix/make_commence.in~ 2008-01-17 13:16:30.000000000 -0500 ++++ salome-3.2.6/COMPONENT_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-17 13:22:01.000000000 -0500 +@@ -184,8 +184,8 @@ + DOXYGEN = @DOXYGEN@ + + ## Shared libraries +-LT_STATIC_EXEC=@LT_STATIC_EXEC@ +-DYNAMIC_DIRS=@DYNAMIC_DIRS@ ++LT_STATIC_EXEC= ++DYNAMIC_DIRS= + LT_LIB=libtool + LT=$(top_builddir)/libtool + LT_COMPILE=$(LT) --mode=compile $(CC) +--- salome-3.2.6/COMPONENT_SRC_3.2.6/adm_local/unix/make_conclude.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/COMPONENT_SRC_3.2.6/adm_local/unix/make_conclude.in 2008-01-17 13:22:59.000000000 -0500 +@@ -95,7 +95,7 @@ + ln -sf $(CURDIR)/$< $@ + + $(BIN) $(TEST_PROGS): %: %.lo $(BIN_OBJ) +- $(CXX) $(CXXFLAGS) -o $@ $^ $(BIN_LIB) $(LDFLAGSFORBIN) $(LIBSFORBIN) ++ $(LT_LINK_EXE) $(CXXFLAGS) -o $@ $^ $(BIN_LIB) $(LDFLAGSFORBIN) $(LIBSFORBIN) + + # copy python scripts in $(top_builddir)/bin/salome + # +--- salome-3.2.6/VISU_SRC_3.2.6/adm_local/unix/make_commence.in~ 2008-01-17 15:06:28.000000000 -0500 ++++ salome-3.2.6/VISU_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-17 21:43:45.000000000 -0500 +@@ -175,8 +175,8 @@ + DOXYGEN_WITH_STL = @DOXYGEN_WITH_STL@ + + ## Shared libraries +-LT_STATIC_EXEC=@LT_STATIC_EXEC@ +-DYNAMIC_DIRS=@DYNAMIC_DIRS@ ++LT_STATIC_EXEC= ++DYNAMIC_DIRS= + LT_LIB=libtool + LT=$(top_builddir)/libtool + LT_COMPILE=$(LT) --mode=compile $(CC) --- salome-3.2.6.orig/debian/patch-superv-missing-sources +++ salome-3.2.6/debian/patch-superv-missing-sources @@ -0,0 +1,147 @@ +--- salome-3.2.6/SUPERV_SRC_3.2.6/src/GraphBase/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/SUPERV_SRC_3.2.6/src/GraphBase/Makefile.in 2008-01-17 06:49:15.000000000 -0500 +@@ -114,4 +114,30 @@ + LDFLAGSFORBIN=$(LDFLAGS) -lSalomeContainer -lSalomeResourcesManager -lRegistry -lSalomeNotification -lSALOMEBasics + //LIBS += -Xlinker -export-dynamic $(PYTHON_LIBS) + ++DataFlowBase_Base.lo: SUPERV.hh ++ ++SUPERV.hh: SUPERV.idl ++ $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< ++ ++LoggerSK.cc: $(KERNEL_ROOT_DIR)/idl/LoggerSK.cc ++ cp $< $@ ++ ++SALOME_ModuleCatalogSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ModuleCatalogSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ ++SALOMEDSSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDSSK.cc ++ cp $< $@ ++ ++SALOMEDS_AttributesSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDS_AttributesSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ + @CONCLUDE@ +--- salome-3.2.6/SUPERV_SRC_3.2.6/src/GraphEditor/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/SUPERV_SRC_3.2.6/src/GraphEditor/Makefile.in 2008-01-17 07:00:03.000000000 -0500 +@@ -66,6 +66,25 @@ + -lc $(QT_MT_LIBS) $(OGL_LIBS) $(KERNEL_LDFLAGS) + #LIBS += -Xlinker -export-dynamic $(PYTHON_LIBS) + ++DataFlowEditor_InNode.lo: SUPERV.hh ++ ++SUPERV.hh: SUPERV.idl ++ $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< ++ ++SALOME_ModuleCatalogSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ModuleCatalogSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ ++SALOMEDSSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDSSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ + + @CONCLUDE@ + +--- salome-3.2.6/SUPERV_SRC_3.2.6/src/GraphExecutor/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/SUPERV_SRC_3.2.6/src/GraphExecutor/Makefile.in 2008-01-17 07:15:31.000000000 -0500 +@@ -77,6 +77,25 @@ + $(KERNEL_LDFLAGS) + #LIBS += -Xlinker -export-dynamic $(PYTHON_LIBS) + ++DataFlowExecutor_FiniteStateMachine.lo: SUPERV.hh ++ ++SUPERV.hh: SUPERV.idl ++ $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< ++ ++SALOME_ModuleCatalogSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ModuleCatalogSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ ++SALOMEDSSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDSSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ + + @CONCLUDE@ + +--- salome-3.2.6/SUPERV_SRC_3.2.6/src/Supervision/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/SUPERV_SRC_3.2.6/src/Supervision/Makefile.in 2008-01-17 07:23:39.000000000 -0500 +@@ -101,5 +101,25 @@ + LDFLAGSFORBIN += $(LDFLAGS) $(KERNEL_LDFLAGS) -lSalomeResourcesManager -lSALOMEBasics + #LIBSFORBIN += $(LIBS) + ++Value_Impl.lo: SUPERV.hh ++ ++SUPERV.hh: SUPERV.idl ++ $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< ++ ++SALOME_ModuleCatalogSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ModuleCatalogSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ ++SALOMEDSSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDSSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ + @CONCLUDE@ + +--- salome-3.2.6/SUPERV_SRC_3.2.6/src/SUPERVGUI/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/SUPERV_SRC_3.2.6/src/SUPERVGUI/Makefile.in 2008-01-17 08:04:17.000000000 -0500 +@@ -107,4 +107,27 @@ + #-lqsplitterP + LIBS+= + ++SUPERVGUI.lo: SUPERV.hh ++ ++SUPERV.hh: ../../idl/SUPERV.idl ++ $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< ++ ++SALOMEDSSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDSSK.cc ++ cp $< $@ ++ ++SALOMEDS_AttributesSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOMEDS_AttributesSK.cc ++ cp $< $@ ++ ++SALOME_ModuleCatalogSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ModuleCatalogSK.cc ++ cp $< $@ ++ ++SALOME_ComponentSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ComponentSK.cc ++ cp $< $@ ++ ++SALOME_ExceptionSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_ExceptionSK.cc ++ cp $< $@ ++ ++SALOME_GenericObjSK.cc: $(KERNEL_ROOT_DIR)/idl/SALOME_GenericObjSK.cc ++ cp $< $@ ++ + @CONCLUDE@ --- salome-3.2.6.orig/debian/patch-gui-vtk5-port +++ salome-3.2.6/debian/patch-gui-vtk5-port @@ -0,0 +1,125 @@ +--- salome-3.2.6.orig/GUI_SRC_3.2.6/adm_local/unix/config_files/check_vtk.m4 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/adm_local/unix/config_files/check_vtk.m4 2008-01-11 13:39:11.000000000 -0500 +@@ -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,7 +84,7 @@ + + if test ! -z $VTKHOME + then +- LOCAL_INCLUDES="-I$VTKHOME/include/vtk $LOCAL_INCLUDES" ++ LOCAL_INCLUDES="-I$VTKHOME/include/vtk-5.0 $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" + fi +@@ -142,4 +142,4 @@ + # Save cache + AC_CACHE_SAVE + +-])dnl +\ No newline at end of file ++])dnl +--- salome-3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ExtractUnstructuredGrid.cxx 2008-01-15 00:11:22.000000000 -0500 +@@ -233,9 +233,8 @@ + } + } + if((aNbElems = aConnectivity->GetNumberOfCells())){ +- VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocationsArray::New(); +- aCellLocationsArray->SetNumberOfComponents(1); +- aCellLocationsArray->SetNumberOfTuples(aNbElems); ++ vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New(); ++ aCellLocationsArray->SetNumberOfValues(aNbElems); + aConnectivity->InitTraversal(); + for(vtkIdType i = 0, *pts, npts; aConnectivity->GetNextCell(npts,pts); i++){ + aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts)); +@@ -322,9 +321,8 @@ + } + } + if((aNbElems = aConnectivity->GetNumberOfCells())){ +- VTKViewer_CellLocationsArray* aCellLocationsArray = VTKViewer_CellLocationsArray::New(); +- aCellLocationsArray->SetNumberOfComponents(1); +- aCellLocationsArray->SetNumberOfTuples(aNbElems); ++ vtkIdTypeArray* aCellLocationsArray = vtkIdTypeArray::New(); ++ aCellLocationsArray->SetNumberOfValues(aNbElems); + aConnectivity->InitTraversal(); + for(vtkIdType i = 0, *pts, npts; aConnectivity->GetNextCell(npts,pts); i++){ + aCellLocationsArray->SetValue(i,aConnectivity->GetTraversalLocation(npts)); +--- salome-3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_GeometryFilter.cxx~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_GeometryFilter.cxx 2008-01-15 00:22:24.000000000 -0500 +@@ -80,7 +80,7 @@ + VTKViewer_GeometryFilter + ::Execute() + { +- vtkDataSet *input= this->GetInput(); ++ vtkDataSet *input= (vtkDataSet *)this->GetInput(); + vtkIdType numCells=input->GetNumberOfCells(); + + if (numCells == 0) +--- salome-3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_AppendFilter.cxx~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_AppendFilter.cxx 2008-01-15 00:44:07.000000000 -0500 +@@ -119,8 +119,8 @@ + 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->GetTotalNumberOfInputConnections(); ++aDataSetId){ ++ vtkDataSet* aDataSet = this->GetInput(aDataSetId); + // Do mapping of the nodes + if(!GetSharedPointsDataSet()){ + vtkIdType aNbPnts = aDataSet->GetNumberOfPoints(); +@@ -265,11 +265,11 @@ + + numCells = 0; + +- vtkDataSetAttributes::FieldList cellList(this->NumberOfInputs); ++ vtkDataSetAttributes::FieldList cellList(this->GetTotalNumberOfInputConnections()); + int firstCD=1; + +- for (idx = 0; idx < this->NumberOfInputs; ++idx) { +- ds = (vtkDataSet *)(this->Inputs[idx]); ++ for (idx = 0; idx < this->GetTotalNumberOfInputConnections(); ++idx) { ++ ds = this->GetInput(idx); + if (ds != NULL) { + if ( ds->GetNumberOfPoints() <= 0 && ds->GetNumberOfCells() <= 0 ) { + continue; //no input, just skip +@@ -308,8 +308,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->GetTotalNumberOfInputConnections(); ++idx) { ++ ds = this->GetInput(idx); + if (ds != NULL) { + numCells = ds->GetNumberOfCells(); + cd = ds->GetCellData(); +--- salome-3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ShrinkFilter.cxx~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_ShrinkFilter.cxx 2008-01-15 00:45:29.000000000 -0500 +@@ -58,7 +58,7 @@ + vtkFloatingPointType center[3], *p, pt[3]; + vtkPointData *pd, *outPD;; + vtkIdList *ptIds, *newPtIds; +- vtkDataSet *input= this->GetInput(); ++ vtkDataSet *input= (vtkDataSet *)this->GetInput(); + vtkUnstructuredGrid *output = this->GetOutput(); + vtkIdType tenth; + vtkFloatingPointType decimal; +--- salome-3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_TransformFilter.cxx~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/VTKViewer/VTKViewer_TransformFilter.cxx 2008-01-15 11:59:35.000000000 -0500 +@@ -43,7 +43,7 @@ + vtkPoints *inPts; + vtkPoints *newPts; + int numPts, numCells; +- vtkPointSet *input = this->GetInput(); ++ vtkPointSet *input = (vtkPointSet *)this->GetInput(); + vtkPointSet *output = this->GetOutput(); + vtkPointData *pd=input->GetPointData(), *outPD=output->GetPointData(); + vtkCellData *cd=input->GetCellData(), *outCD=output->GetCellData(); --- salome-3.2.6.orig/debian/patch-lib-install-fix +++ salome-3.2.6/debian/patch-lib-install-fix @@ -0,0 +1,33 @@ +--- salome-3.2.6/GUI_SRC_3.2.6/adm_local/unix/make_conclude.in~ 2008-01-15 14:11:41.000000000 -0500 ++++ salome-3.2.6/GUI_SRC_3.2.6/adm_local/unix/make_conclude.in 2008-01-15 15:23:14.000000000 -0500 +@@ -206,7 +206,7 @@ + install: $(LIB) $(BIN) $(TEST_PROGS) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) $(DESTDIR)$(bindir) $(DESTDIR)$(datadir) $(DESTDIR)$(idldir) install-python install-sharedpyqt install-qm install-res + @for f in X $(LIB); do \ + if test $$f != X; then \ +- ($(LT_INSTALL_LIB) $$f $(DESTDIR)$(libdir)/. || exit 1); \ ++ ($(LT_INSTALL_LIB) $$f $(DESTDIR)$(libdir) || exit 1); \ + fi; \ + done + @if ! test -z $(LIB_SWIG) ; then \ +--- salome-3.2.6/SMESH_SRC_3.2.6/adm_local/unix/make_conclude.in~ 2008-01-16 23:49:46.000000000 -0500 ++++ salome-3.2.6/SMESH_SRC_3.2.6/adm_local/unix/make_conclude.in 2008-01-17 08:50:12.000000000 -0500 +@@ -141,7 +141,7 @@ + install: $(LIB) $(BIN) $(TEST_PROGS) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) $(DESTDIR)$(bindir) $(DESTDIR)$(datadir) $(DESTDIR)$(idldir) install-python install-sharedpyqt install-qm + @for f in X $(LIB); do \ + if test $$f != X; then \ +- ($(LT_INSTALL_LIB) $$f $(DESTDIR)$(libdir)/. || exit 1); \ ++ ($(LT_INSTALL_LIB) $$f $(DESTDIR)$(libdir) || exit 1); \ + fi; \ + done + @if ! test -z $(LIB_SWIG) ; then \ +--- salome-3.2.6/COMPONENT_SRC_3.2.6/adm_local/unix/make_conclude.in~ 2008-01-17 13:29:50.000000000 -0500 ++++ salome-3.2.6/COMPONENT_SRC_3.2.6/adm_local/unix/make_conclude.in 2008-01-17 13:31:45.000000000 -0500 +@@ -141,7 +141,7 @@ + install: $(LIB) $(BIN) $(TEST_PROGS) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) $(DESTDIR)$(bindir) $(DESTDIR)$(datadir) $(DESTDIR)$(idldir) install-python install-sharedpyqt install-qm + @for f in X $(LIB); do \ + if test $$f != X; then \ +- ($(LT_INSTALL_LIB) $$f $(DESTDIR)$(libdir)/. || exit 1); \ ++ ($(LT_INSTALL_LIB) $$f $(DESTDIR)$(libdir) || exit 1); \ + fi; \ + done + @if test "X$(LIB_SWIG)" != "X"; then \ --- salome-3.2.6.orig/debian/patch-idl-dirs +++ salome-3.2.6/debian/patch-idl-dirs @@ -0,0 +1,255 @@ +--- salome-3.2.6/GUI_SRC_3.2.6/adm_local/unix/make_commence.in~ 2008-01-15 17:02:17.000000000 -0500 ++++ salome-3.2.6/GUI_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-15 18:26:41.000000000 -0500 +@@ -164,7 +164,7 @@ + CORBA_LIBS = @CORBA_LIBS@ + CORBA_CXXFLAGS = @CORBA_CXXFLAGS@ + +-IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_srcdir)/idl -I$(KERNEL_ROOT_DIR)/idl/salome ++IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_srcdir)/idl -I$(KERNEL_ROOT_DIR)/idl + IDLPYFLAGS = @IDLPYFLAGS@ + + IDL = @IDL@ +--- salome-3.2.6/GEOM_SRC_3.2.6/adm_local/unix/make_commence.in~ 2008-01-14 16:40:06.000000000 -0500 ++++ salome-3.2.6/GEOM_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-14 18:58:16.000000000 -0500 +@@ -129,7 +129,7 @@ + + OMNIORB_IDL = @OMNIORB_IDL@ + OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@ +-OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_srcdir)/idl -I$(KERNEL_ROOT_DIR)/idl/salome ++OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_srcdir)/idl -I$(KERNEL_ROOT_DIR)/idl + + OMNIORB_IDL_CLN_H = @OMNIORB_IDL_CLN_H@ + OMNIORB_IDL_CLN_CXX = @OMNIORB_IDL_CLN_CXX@ +@@ -146,7 +146,7 @@ + CORBA_LIBS = @CORBA_LIBS@ + CORBA_CXXFLAGS = @CORBA_CXXFLAGS@ + +-IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_srcdir)/idl -I$(KERNEL_ROOT_DIR)/idl/salome ++IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_srcdir)/idl -I$(KERNEL_ROOT_DIR)/idl + IDLPYFLAGS = @IDLPYFLAGS@ + + IDL = @IDL@ +--- salome-3.2.6/MED_SRC_3.2.6/adm_local/unix/make_commence.in~ 2008-01-14 16:40:06.000000000 -0500 ++++ salome-3.2.6/MED_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-16 23:09:03.000000000 -0500 +@@ -154,7 +154,7 @@ + + OMNIORB_IDL = @OMNIORB_IDL@ + OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@ +-OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/salome/idl -I$(KERNEL_ROOT_DIR)/idl/salome ++OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/salome/idl -I$(KERNEL_ROOT_DIR)/idl + + OMNIORB_IDL_CLN_H = @OMNIORB_IDL_CLN_H@ + OMNIORB_IDL_CLN_CXX = @OMNIORB_IDL_CLN_CXX@ +@@ -171,7 +171,7 @@ + CORBA_LIBS = @CORBA_LIBS@ + CORBA_CXXFLAGS = @CORBA_CXXFLAGS@ + +-IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl/salome -I$(KERNEL_ROOT_DIR)/idl/salome ++IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl/salome -I$(KERNEL_ROOT_DIR)/idl + IDLPYFLAGS = @IDLPYFLAGS@ + + IDL = @IDL@ +--- salome-3.2.6/RANDOMIZER_SRC_3.2.6/adm_local/unix/make_commence.in~ 2008-01-14 16:40:06.000000000 -0500 ++++ salome-3.2.6/RANDOMIZER_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-14 19:08:00.000000000 -0500 +@@ -47,7 +47,7 @@ + + OMNIORB_IDL = @OMNIORB_IDL@ + OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@ +-OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl/salome -I$(KERNEL_ROOT_DIR)/idl/salome ++OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl/salome -I$(KERNEL_ROOT_DIR)/idl + + OMNIORB_IDL_CLN_H = @OMNIORB_IDL_CLN_H@ + OMNIORB_IDL_CLN_CXX = @OMNIORB_IDL_CLN_CXX@ +--- salome-3.2.6/SUPERV_SRC_3.2.6/adm_local/unix/make_commence.in~ 2008-01-15 07:15:59.000000000 -0500 ++++ salome-3.2.6/SUPERV_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-15 08:12:35.000000000 -0500 +@@ -141,7 +141,7 @@ + + OMNIORB_IDL = @OMNIORB_IDL@ + OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@ +-OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl/salome -I$(KERNEL_ROOT_DIR)/idl/salome ++OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl/salome -I$(KERNEL_ROOT_DIR)/idl + + OMNIORB_IDL_CLN_H = @OMNIORB_IDL_CLN_H@ + OMNIORB_IDL_CLN_CXX = @OMNIORB_IDL_CLN_CXX@ +@@ -158,7 +158,7 @@ + CORBA_LIBS = @CORBA_LIBS@ + CORBA_CXXFLAGS = @CORBA_CXXFLAGS@ + +-IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl/salome -I$(KERNEL_ROOT_DIR)/idl/salome ++IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl/salome -I$(KERNEL_ROOT_DIR)/idl + IDLPYFLAGS = @IDLPYFLAGS@ + + IDL = @IDL@ +--- salome-3.2.6/HELLO_SRC_3.2.6/adm_local/unix/make_commence.in~ 2008-01-15 07:15:59.000000000 -0500 ++++ salome-3.2.6/HELLO_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-15 08:51:53.000000000 -0500 +@@ -136,7 +136,7 @@ + + OMNIORB_IDL = @OMNIORB_IDL@ + OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@ +-OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl -I$(KERNEL_ROOT_DIR)/idl/salome ++OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl -I$(KERNEL_ROOT_DIR)/idl + + OMNIORB_IDL_CLN_H = @OMNIORB_IDL_CLN_H@ + OMNIORB_IDL_CLN_CXX = @OMNIORB_IDL_CLN_CXX@ +@@ -153,7 +153,7 @@ + CORBA_LIBS = @CORBA_LIBS@ + CORBA_CXXFLAGS = @CORBA_CXXFLAGS@ + +-IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl -I$(KERNEL_ROOT_DIR)/idl/salome ++IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl -I$(KERNEL_ROOT_DIR)/idl + IDLPYFLAGS = @IDLPYFLAGS@ + + IDL = @IDL@ +--- salome-3.2.6/PYHELLO_SRC_3.2.6/adm_local/unix/make_commence.in~ 2008-01-15 07:15:59.000000000 -0500 ++++ salome-3.2.6/PYHELLO_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-15 09:04:22.000000000 -0500 +@@ -132,7 +132,7 @@ + + OMNIORB_IDL = @OMNIORB_IDL@ + OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@ +-OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl -I$(KERNEL_ROOT_DIR)/idl/salome ++OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl -I$(KERNEL_ROOT_DIR)/idl + + OMNIORB_IDL_CLN_H = @OMNIORB_IDL_CLN_H@ + OMNIORB_IDL_CLN_CXX = @OMNIORB_IDL_CLN_CXX@ +--- salome-3.2.6/VISU_SRC_3.2.6/adm_local/unix/make_commence.in~ 2008-01-15 07:15:59.000000000 -0500 ++++ salome-3.2.6/VISU_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-17 22:46:53.000000000 -0500 +@@ -132,7 +132,7 @@ + OMNIORB_IDL = @OMNIORB_IDL@ + OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@ + OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/salome/idl \ +- -I$(KERNEL_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl/salome ++ -I$(KERNEL_ROOT_DIR)/idl -I$(MED_ROOT_DIR)/idl + + OMNIORB_IDL_CLN_H = @OMNIORB_IDL_CLN_H@ + OMNIORB_IDL_CLN_CXX = @OMNIORB_IDL_CLN_CXX@ +@@ -150,7 +150,7 @@ + CORBA_CXXFLAGS = @CORBA_CXXFLAGS@ + + IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl/salome \ +- -I$(KERNEL_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl/salome ++ -I$(KERNEL_ROOT_DIR)/idl -I$(MED_ROOT_DIR)/idl/salome + IDLPYFLAGS = @IDLPYFLAGS@ + + IDL = @IDL@ +--- salome-3.2.6/SMESH_SRC_3.2.6/adm_local/unix/make_commence.in~ 2008-01-15 07:15:59.000000000 -0500 ++++ salome-3.2.6/SMESH_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-15 09:17:25.000000000 -0500 +@@ -141,7 +141,7 @@ + OMNIORB_IDL = @OMNIORB_IDL@ + OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@ + OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl/salome \ +- -I$(KERNEL_ROOT_DIR)/idl/salome -I$(GEOM_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl/salome ++ -I$(KERNEL_ROOT_DIR)/idl -I$(GEOM_ROOT_DIR)/idl -I$(MED_ROOT_DIR)/idl + + OMNIORB_IDL_CLN_H = @OMNIORB_IDL_CLN_H@ + OMNIORB_IDL_CLN_CXX = @OMNIORB_IDL_CLN_CXX@ +@@ -159,7 +159,7 @@ + CORBA_CXXFLAGS = @CORBA_CXXFLAGS@ + + IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl/salome \ +- -I$(KERNEL_ROOT_DIR)/idl/salome -I$(GEOM_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl/salome ++ -I$(KERNEL_ROOT_DIR)/idl -I$(GEOM_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl/salome + IDLPYFLAGS = @IDLPYFLAGS@ + + IDL = @IDL@ +--- salome-3.2.6/COMPONENT_SRC_3.2.6/adm_local/unix/make_commence.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/COMPONENT_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-15 00:54:04.000000000 -0500 +@@ -143,7 +143,7 @@ + + OMNIORB_IDL = @OMNIORB_IDL@ + OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@ +-OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl/salome -I$(KERNEL_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl/salome ++OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl/salome -I$(KERNEL_ROOT_DIR)/idl -I$(MED_ROOT_DIR)/idl + + OMNIORB_IDL_CLN_H = @OMNIORB_IDL_CLN_H@ + OMNIORB_IDL_CLN_CXX = @OMNIORB_IDL_CLN_CXX@ +@@ -160,7 +160,7 @@ + CORBA_LIBS = @CORBA_LIBS@ + CORBA_CXXFLAGS = @CORBA_CXXFLAGS@ + +-IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl/salome -I$(KERNEL_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl/salome ++IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl/salome -I$(KERNEL_ROOT_DIR)/idl -I$(MED_ROOT_DIR)/idl + + IDLPYFLAGS = @IDLPYFLAGS@ + +--- salome-3.2.6/CALCULATOR_SRC_3.2.6/adm_local/unix/make_commence.in~ 2008-01-15 07:15:59.000000000 -0500 ++++ salome-3.2.6/CALCULATOR_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-15 09:29:00.000000000 -0500 +@@ -133,7 +133,7 @@ + + OMNIORB_IDL = @OMNIORB_IDL@ + OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@ +-OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl -I$(KERNEL_ROOT_DIR)/idl/salome ++OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl -I$(KERNEL_ROOT_DIR)/idl + + OMNIORB_IDL_CLN_H = @OMNIORB_IDL_CLN_H@ + OMNIORB_IDL_CLN_CXX = @OMNIORB_IDL_CLN_CXX@ +@@ -150,7 +150,7 @@ + CORBA_LIBS = @CORBA_LIBS@ + CORBA_CXXFLAGS = @CORBA_CXXFLAGS@ + +-IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl -I$(KERNEL_ROOT_DIR)/idl/salome ++IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl -I$(KERNEL_ROOT_DIR)/idl + IDLPYFLAGS = @IDLPYFLAGS@ + + IDL = @IDL@ +--- salome-3.2.6/PYCALCULATOR_SRC_3.2.6/adm_local/unix/make_commence.in~ 2008-01-15 07:15:59.000000000 -0500 ++++ salome-3.2.6/PYCALCULATOR_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-15 09:35:49.000000000 -0500 +@@ -66,7 +66,7 @@ + + OMNIORB_IDL = @OMNIORB_IDL@ + OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@ +-OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl -I$(KERNEL_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl/salome ++OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl -I$(KERNEL_ROOT_DIR)/idl -I$(MED_ROOT_DIR)/idl + + OMNIORB_IDL_CLN_H = @OMNIORB_IDL_CLN_H@ + OMNIORB_IDL_CLN_CXX = @OMNIORB_IDL_CLN_CXX@ +--- salome-3.2.6/SIERPINSKY_SRC_3.2.6/adm_local/unix/make_commence.in~ 2008-01-16 21:34:07.000000000 -0500 ++++ salome-3.2.6/SIERPINSKY_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-16 21:36:06.000000000 -0500 +@@ -154,7 +154,7 @@ + + OMNIORB_IDL = @OMNIORB_IDL@ + OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@ +-OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl/salome -I$(KERNEL_ROOT_DIR)/idl/salome \ ++OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl/salome -I$(KERNEL_ROOT_DIR)/idl \ + -I$(MED_ROOT_DIR)/idl/salome -I$(VISU_ROOT_DIR)/idl/salome -I$(RANDOMIZER_ROOT_DIR)/idl/salome + + OMNIORB_IDL_CLN_H = @OMNIORB_IDL_CLN_H@ +@@ -172,7 +172,7 @@ + CORBA_LIBS = @CORBA_LIBS@ + CORBA_CXXFLAGS = @CORBA_CXXFLAGS@ + +-IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl/salome -I$(KERNEL_ROOT_DIR)/idl/salome \ ++IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(top_srcdir)/idl -I$(top_builddir)/idl/salome -I$(KERNEL_ROOT_DIR)/idl \ + -I$(MED_ROOT_DIR)/idl/salome -I$(VISU_ROOT_DIR)/idl/salome -I$(RANDOMIZER_ROOT_DIR)/idl/salome + + IDLPYFLAGS = @IDLPYFLAGS@ +--- salome-3.2.6/NETGENPLUGIN_SRC_3.2.6/adm_local/unix/make_commence.in~ 2008-01-18 16:12:24.000000000 -0500 ++++ salome-3.2.6/NETGENPLUGIN_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-21 10:18:02.000000000 -0500 +@@ -137,7 +137,7 @@ + + OMNIORB_IDL = @OMNIORB_IDL@ + OMNIORB_IDLCXXFLAGS = @OMNIORB_IDLCXXFLAGS@ +-OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(srcdir) -I$(KERNEL_ROOT_DIR)/idl/salome \ ++OMNIORB_IDLPYFLAGS = @OMNIORB_IDLPYFLAGS@ -I$(srcdir) -I$(KERNEL_ROOT_DIR)/idl \ + -I$(GEOM_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl/salome\ + -I$(SMESH_ROOT_DIR)/idl/salome + +@@ -156,7 +156,7 @@ + CORBA_LIBS = @CORBA_LIBS@ + CORBA_CXXFLAGS = @CORBA_CXXFLAGS@ + +-IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(srcdir) -I$(KERNEL_ROOT_DIR)/idl/salome \ ++IDLCXXFLAGS = -bcxx @IDLCXXFLAGS@ -I$(srcdir) -I$(KERNEL_ROOT_DIR)/idl \ + -I$(GEOM_ROOT_DIR)/idl/salome -I$(MED_ROOT_DIR)/idl/salome\ + -I$(SMESH_ROOT_DIR)/idl/salome + IDLPYFLAGS = @IDLPYFLAGS@ +--- salome-3.2.6/xdata-0.5.49/adm/unix/make_end.am~ 2007-05-11 06:06:24.000000000 -0400 ++++ salome-3.2.6/xdata-0.5.49/adm/unix/make_end.am 2008-01-15 09:41:13.000000000 -0500 +@@ -98,7 +98,7 @@ + echo $< compilation ... ; \ + mkdir .idls 2> /dev/null ; \ + includes=`env | awk -F "_ROOT_DIR=" '{if(NF>1){printf "-I"$$2"/idl/salome "}}'` ; \ +- includes=$$includes" "-I$(SALOME_KERNEL)/idl/salome ; \ ++ includes=$$includes" "-I$(SALOME_KERNEL)/idl ; \ + cmd="$(OMNIIDL)" ; \ + if test -f $(SALOME_KERNEL)/salome_adm/unix/pythonbe.py ; then \ + cmd=$$cmd" -bpythonbe -p$(SALOME_KERNEL)/salome_adm/unix" ; \ --- salome-3.2.6.orig/debian/patch-no-stomp-adm-local +++ salome-3.2.6/debian/patch-no-stomp-adm-local @@ -0,0 +1,258 @@ +--- salome-3.2.6/GUI_SRC_3.2.6/adm_local/Makefile.in~ 2008-01-16 21:56:43.000000000 -0500 ++++ salome-3.2.6/GUI_SRC_3.2.6/adm_local/Makefile.in 2008-01-16 23:04:55.000000000 -0500 +@@ -31,7 +31,7 @@ + bin: + + resources : +- cp -rf @top_srcdir@/adm_local $(top_builddir) ++# cp -rf @top_srcdir@/adm_local $(top_builddir) + + inc: + +--- salome-3.2.6/GUI_SRC_3.2.6/doc/salome/gui/Makefile.in~ 2008-01-15 19:59:11.000000000 -0500 ++++ salome-3.2.6/GUI_SRC_3.2.6/doc/salome/gui/Makefile.in 2008-01-15 23:37:17.000000000 -0500 +@@ -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 +--- salome-3.2.6/GEOM_SRC_3.2.6/adm_local/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/adm_local/Makefile.in 2008-01-16 11:25:09.000000000 -0500 +@@ -32,7 +32,7 @@ + bin: + + resources : +- cp -rf @top_srcdir@/adm_local $(top_builddir) ++# cp -rf @top_srcdir@/adm_local $(top_builddir) + + inc: + +--- salome-3.2.6/GEOM_SRC_3.2.6/doc/salome/gui/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/doc/salome/gui/Makefile.in 2008-01-16 11:11:30.000000000 -0500 +@@ -29,7 +29,7 @@ + @COMMENCE@ + + usr_docs: +- cp -fr $(srcdir)/GEOM ./ ++# cp -fr $(srcdir)/GEOM ./ + -find $(PWD) -name CVS -prune -exec rm -rf {} \; + + docs: usr_docs +--- salome-3.2.6/MED_SRC_3.2.6/adm_local/Makefile.in~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/MED_SRC_3.2.6/adm_local/Makefile.in 2008-01-16 20:48:03.000000000 -0500 +@@ -31,7 +31,7 @@ + bin: + + resources : +- cp -rf @top_srcdir@/adm_local $(top_builddir) ++# cp -rf @top_srcdir@/adm_local $(top_builddir) + + inc: + +--- salome-3.2.6/RANDOMIZER_SRC_3.2.6/adm_local/Makefile.in~ 2006-05-06 05:01:22.000000000 -0400 ++++ salome-3.2.6/RANDOMIZER_SRC_3.2.6/adm_local/Makefile.in 2008-01-15 08:04:15.000000000 -0500 +@@ -32,7 +32,7 @@ + bin: + + resources : +- cp -rf @top_srcdir@/adm_local $(top_builddir) ++# cp -rf @top_srcdir@/adm_local $(top_builddir) + + inc: + +--- salome-3.2.6/PYHELLO_SRC_3.2.6/adm_local/Makefile.in~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/PYHELLO_SRC_3.2.6/adm_local/Makefile.in 2008-01-15 14:36:13.000000000 -0500 +@@ -31,7 +31,7 @@ + bin: + + resources : +- cp -rf @top_srcdir@/adm_local $(top_builddir) ++# cp -rf @top_srcdir@/adm_local $(top_builddir) + + inc: + +--- salome-3.2.6/SUPERV_SRC_3.2.6/doc/salome/gui/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/SUPERV_SRC_3.2.6/doc/salome/gui/Makefile.in 2008-01-17 08:12:54.000000000 -0500 +@@ -29,7 +29,7 @@ + @COMMENCE@ + + usr_docs: +- cp -fr $(srcdir)/SUPERV ./ ++# cp -fr $(srcdir)/SUPERV ./ + -find $(PWD) -name CVS -prune -exec rm -rf {} \; + + docs: usr_docs +--- salome-3.2.6/SUPERV_SRC_3.2.6/adm_local/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/SUPERV_SRC_3.2.6/adm_local/Makefile.in 2008-01-17 08:16:42.000000000 -0500 +@@ -32,7 +32,7 @@ + bin: + + resources : +- cp -rf @top_srcdir@/adm_local $(top_builddir) ++# cp -rf @top_srcdir@/adm_local $(top_builddir) + + inc: + +--- salome-3.2.6/HELLO_SRC_3.2.6/adm_local/Makefile.in~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/HELLO_SRC_3.2.6/adm_local/Makefile.in 2008-01-17 08:42:00.000000000 -0500 +@@ -31,7 +31,7 @@ + bin: + + resources : +- cp -rf @top_srcdir@/adm_local $(top_builddir) ++# cp -rf @top_srcdir@/adm_local $(top_builddir) + + inc: + +--- salome-3.2.6/CALCULATOR_SRC_3.2.6/adm_local/Makefile.in~ 2007-04-24 12:41:05.000000000 -0400 ++++ salome-3.2.6/CALCULATOR_SRC_3.2.6/adm_local/Makefile.in 2008-01-17 09:32:59.000000000 -0500 +@@ -31,7 +31,7 @@ + bin: + + resources : +- cp -rf @top_srcdir@/adm_local $(top_builddir) ++# cp -rf @top_srcdir@/adm_local $(top_builddir) + + inc: + +--- salome-3.2.6/COMPONENT_SRC_3.2.6/adm_local/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/COMPONENT_SRC_3.2.6/adm_local/Makefile.in 2008-01-17 14:13:36.000000000 -0500 +@@ -31,7 +31,7 @@ + bin: + + resources : +- cp -rf @top_srcdir@/adm_local $(top_builddir) ++# cp -rf @top_srcdir@/adm_local $(top_builddir) + + inc: + +--- salome-3.2.6/SIERPINSKY_SRC_3.2.6/adm_local/Makefile.in~ 2006-05-06 05:02:02.000000000 -0400 ++++ salome-3.2.6/SIERPINSKY_SRC_3.2.6/adm_local/Makefile.in 2008-01-17 14:47:18.000000000 -0500 +@@ -32,7 +32,7 @@ + bin: + + resources : +- cp -rf @top_srcdir@/adm_local $(top_builddir) ++# cp -rf @top_srcdir@/adm_local $(top_builddir) + + inc: + +--- salome-3.2.6/VISU_SRC_3.2.6/adm_local/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/VISU_SRC_3.2.6/adm_local/Makefile.in 2008-01-17 23:43:25.000000000 -0500 +@@ -32,7 +32,7 @@ + bin: + + resources : +- cp -rf @top_srcdir@/adm_local $(top_builddir) ++# cp -rf @top_srcdir@/adm_local $(top_builddir) + + inc: + +--- salome-3.2.6/VISU_SRC_3.2.6/doc/salome/gui/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/VISU_SRC_3.2.6/doc/salome/gui/Makefile.in 2008-01-17 23:49:29.000000000 -0500 +@@ -30,7 +30,7 @@ + @COMMENCE@ + + usr_docs: +- cp -fr $(srcdir)/VISU ./ ++# cp -fr $(srcdir)/VISU ./ + -find $(PWD) -name CVS -prune -exec rm -rf {} \; + + docs: usr_docs +--- salome-3.2.6/SMESH_SRC_3.2.6/doc/salome/gui/Makefile.in~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/doc/salome/gui/Makefile.in 2008-01-18 09:03:07.000000000 -0500 +@@ -30,7 +30,7 @@ + @COMMENCE@ + + usr_docs: +- cp -fr $(srcdir)/SMESH ./ ++# cp -fr $(srcdir)/SMESH ./ + -find $(PWD) -name CVS -prune -exec rm -rf {} \; + + docs: usr_docs +--- salome-3.2.6/SMESH_SRC_3.2.6/adm_local/Makefile.in~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/adm_local/Makefile.in 2008-01-18 09:08:24.000000000 -0500 +@@ -32,7 +32,7 @@ + bin: + + resources : +- cp -rf @top_srcdir@/adm_local $(top_builddir) ++# cp -rf @top_srcdir@/adm_local $(top_builddir) + + inc: + +--- salome-3.2.6/NETGENPLUGIN_SRC_3.2.6/adm_local/Makefile.in~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/NETGENPLUGIN_SRC_3.2.6/adm_local/Makefile.in 2008-01-21 11:39:57.000000000 -0500 +@@ -32,7 +32,7 @@ + bin: + + resources : +- cp -rf @top_srcdir@/adm_local $(top_builddir) ++# cp -rf @top_srcdir@/adm_local $(top_builddir) + + inc: + +--- salome-3.2.6/GEOM_SRC_3.2.6/doc/salome/tui/Makefile.in~ 2008-01-24 07:42:52.000000000 -0500 ++++ salome-3.2.6/GEOM_SRC_3.2.6/doc/salome/tui/Makefile.in 2008-01-24 13:31:56.000000000 -0500 +@@ -75,9 +75,9 @@ + $(doxygen) ./doxyfile_py; \ + cd ../..; \ + fi; \ +- cp -fr $(srcdir)/GEOM/sources/static/*.* ./GEOM/ +- cp -fr $(srcdir)/GEOM/sources/ GEOM/ +- cp -fr $(srcdir)/GEOM/HTML/ GEOM/ ++# cp -fr $(srcdir)/GEOM/sources/static/*.* ./GEOM/ ++# cp -fr $(srcdir)/GEOM/sources/ GEOM/ ++# cp -fr $(srcdir)/GEOM/HTML/ GEOM/ + rm -fr INPUT + + clean: +--- salome-3.2.6/MED_SRC_3.2.6/doc/salome/tui/Makefile.in~ 2008-01-24 13:41:36.000000000 -0500 ++++ salome-3.2.6/MED_SRC_3.2.6/doc/salome/tui/Makefile.in 2008-01-24 17:32:06.000000000 -0500 +@@ -36,9 +36,9 @@ + mv -f doxyfile1 doxyfile; \ + $(doxygen) ./doxyfile; \ + cd ..; \ +- cp -fr $(srcdir)/MED/sources/static/*.* ./MED/ +- cp -fr $(srcdir)/MED/sources/ MED/ +- cp -fr $(srcdir)/MED/HTML/ MED/ ++# cp -fr $(srcdir)/MED/sources/static/*.* ./MED/ ++# cp -fr $(srcdir)/MED/sources/ MED/ ++# cp -fr $(srcdir)/MED/HTML/ MED/ + rm -fr INPUT + + clean: +--- salome-3.2.6/SUPERV_SRC_3.2.6/doc/salome/tui/Makefile.in~ 2008-01-24 13:41:36.000000000 -0500 ++++ salome-3.2.6/SUPERV_SRC_3.2.6/doc/salome/tui/Makefile.in 2008-01-24 17:32:48.000000000 -0500 +@@ -54,9 +54,9 @@ + mv -f doxyfile1 doxyfile; \ + $(doxygen) ./doxyfile; \ + cd ..; \ +- cp -fr $(srcdir)/SUPERV/sources/static/*.* ./SUPERV/ +- cp -fr $(srcdir)/SUPERV/sources/ SUPERV/ +- cp -fr $(srcdir)/SUPERV/HTML/ SUPERV/ ++# cp -fr $(srcdir)/SUPERV/sources/static/*.* ./SUPERV/ ++# cp -fr $(srcdir)/SUPERV/sources/ SUPERV/ ++# cp -fr $(srcdir)/SUPERV/HTML/ SUPERV/ + rm -fr INPUT + + clean: +--- salome-3.2.6/SMESH_SRC_3.2.6/doc/salome/tui/Makefile.in~ 2008-01-24 13:41:36.000000000 -0500 ++++ salome-3.2.6/SMESH_SRC_3.2.6/doc/salome/tui/Makefile.in 2008-01-24 17:33:46.000000000 -0500 +@@ -73,9 +73,9 @@ + $(doxygen) ./doxyfile_py; \ + cd ../..; \ + fi; \ +- cp -fr $(srcdir)/SMESH/sources/static/*.* ./SMESH/ +- cp -fr $(srcdir)/SMESH/sources/ SMESH/ +- cp -fr $(srcdir)/SMESH/HTML/ SMESH/ ++# cp -fr $(srcdir)/SMESH/sources/static/*.* ./SMESH/ ++# cp -fr $(srcdir)/SMESH/sources/ SMESH/ ++# cp -fr $(srcdir)/SMESH/HTML/ SMESH/ + rm -fr INPUT + + clean: --- salome-3.2.6.orig/debian/patch-hdf5-libs-with-mpi +++ salome-3.2.6/debian/patch-hdf5-libs-with-mpi @@ -0,0 +1,11 @@ +--- salome-3.2.6/KERNEL_SRC_3.2.6/salome_adm/unix/config_files/check_mpi.m4~ 2008-01-14 19:43:49.000000000 -0500 ++++ salome-3.2.6/KERNEL_SRC_3.2.6/salome_adm/unix/config_files/check_mpi.m4 2008-01-14 23:53:17.000000000 -0500 +@@ -104,6 +104,8 @@ + CORBA_IDLPYFLAGS="-DHAVE_MPI2 $CORBA_IDLPYFLAGS" + fi + ++HDF5_LIBS="$HDF5_LIBS $MPI_LIBS" ++ + AC_SUBST(WITHMPI) + AC_SUBST(MPI_INCLUDES) + AC_SUBST(MPI_LIBS) --- salome-3.2.6.orig/debian/patch-fake-depend +++ salome-3.2.6/debian/patch-fake-depend @@ -0,0 +1,704 @@ +--- salome-3.2.6.orig/GUI_SRC_3.2.6/src/RegistryDisplay/Makefile 2008-01-13 16:53:22.000000000 -0500 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/RegistryDisplay/Makefile 2008-01-13 22:22:55.000000000 -0500 +@@ -838,7 +838,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6.orig/GUI_SRC_3.2.6/src/TOOLSGUI/Makefile 2008-01-13 16:53:23.000000000 -0500 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/TOOLSGUI/Makefile 2008-01-13 22:25:59.000000000 -0500 +@@ -844,7 +844,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6.orig/GUI_SRC_3.2.6/src/Session/Makefile 2008-01-13 16:53:22.000000000 -0500 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/Session/Makefile 2008-01-13 22:26:54.000000000 -0500 +@@ -859,7 +859,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6.orig/GUI_SRC_3.2.6/src/SalomeApp/Makefile 2008-01-13 16:53:22.000000000 -0500 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/SalomeApp/Makefile 2008-01-13 22:27:26.000000000 -0500 +@@ -872,7 +872,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6.orig/GUI_SRC_3.2.6/src/SALOME_SWIG/Makefile 2008-01-13 16:53:22.000000000 -0500 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/SALOME_SWIG/Makefile 2008-01-13 22:27:45.000000000 -0500 +@@ -836,7 +836,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6.orig/GUI_SRC_3.2.6/src/SALOME_PY/Makefile 2008-01-13 16:53:22.000000000 -0500 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/SALOME_PY/Makefile 2008-01-13 22:28:04.000000000 -0500 +@@ -831,7 +831,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6.orig/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile 2008-01-13 16:53:22.000000000 -0500 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SALOME_PYQT_GUI/Makefile 2008-01-13 22:28:38.000000000 -0500 +@@ -883,7 +883,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6.orig/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/Makefile 2008-01-13 16:53:22.000000000 -0500 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/SALOME_PYQT/SalomePyQt/Makefile 2008-01-13 22:29:04.000000000 -0500 +@@ -914,7 +914,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/GEOM_SRC_3.2.6/src/SKETCHER/Makefile~ 2008-01-14 16:42:15.000000000 -0500 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/SKETCHER/Makefile 2008-01-14 17:50:42.000000000 -0500 +@@ -807,7 +807,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/GEOM_SRC_3.2.6/src/GEOM_I/Makefile~ 2008-01-14 16:42:15.000000000 -0500 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/GEOM_I/Makefile 2008-01-14 17:51:56.000000000 -0500 +@@ -855,7 +855,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/GEOM_SRC_3.2.6/src/GEOMClient/Makefile~ 2008-01-14 16:42:15.000000000 -0500 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/GEOMClient/Makefile 2008-01-14 17:52:48.000000000 -0500 +@@ -818,7 +818,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/GEOM_SRC_3.2.6/src/GEOMFiltersSelection/Makefile~ 2008-01-14 16:42:15.000000000 -0500 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/GEOMFiltersSelection/Makefile 2008-01-14 17:53:28.000000000 -0500 +@@ -827,7 +827,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/GEOM_SRC_3.2.6/src/GEOMGUI/Makefile~ 2008-01-14 16:42:15.000000000 -0500 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/GEOMGUI/Makefile 2008-01-14 17:54:01.000000000 -0500 +@@ -836,7 +836,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/GEOM_SRC_3.2.6/src/GEOMBase/Makefile~ 2008-01-14 16:42:15.000000000 -0500 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/GEOMBase/Makefile 2008-01-14 17:54:31.000000000 -0500 +@@ -829,7 +829,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/GEOM_SRC_3.2.6/src/GEOMToolsGUI/Makefile~ 2008-01-14 16:42:15.000000000 -0500 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/GEOMToolsGUI/Makefile 2008-01-14 17:55:01.000000000 -0500 +@@ -822,7 +822,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/GEOM_SRC_3.2.6/src/DisplayGUI/Makefile~ 2008-01-14 16:42:15.000000000 -0500 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/DisplayGUI/Makefile 2008-01-14 17:55:30.000000000 -0500 +@@ -815,7 +815,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/GEOM_SRC_3.2.6/src/BasicGUI/Makefile~ 2008-01-14 16:42:14.000000000 -0500 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/BasicGUI/Makefile 2008-01-14 17:56:05.000000000 -0500 +@@ -835,7 +835,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/GEOM_SRC_3.2.6/src/PrimitiveGUI/Makefile~ 2008-01-14 16:42:15.000000000 -0500 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/PrimitiveGUI/Makefile 2008-01-14 17:56:31.000000000 -0500 +@@ -825,7 +825,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/GEOM_SRC_3.2.6/src/GenerationGUI/Makefile~ 2008-01-14 16:42:15.000000000 -0500 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/GenerationGUI/Makefile 2008-01-14 17:57:02.000000000 -0500 +@@ -823,7 +823,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/GEOM_SRC_3.2.6/src/EntityGUI/Makefile~ 2008-01-14 16:42:15.000000000 -0500 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/EntityGUI/Makefile 2008-01-14 17:57:29.000000000 -0500 +@@ -845,7 +845,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/GEOM_SRC_3.2.6/src/BuildGUI/Makefile~ 2008-01-14 16:42:15.000000000 -0500 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/BuildGUI/Makefile 2008-01-14 17:57:52.000000000 -0500 +@@ -827,7 +827,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/GEOM_SRC_3.2.6/src/BooleanGUI/Makefile~ 2008-01-14 16:42:14.000000000 -0500 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/BooleanGUI/Makefile 2008-01-14 17:58:16.000000000 -0500 +@@ -817,7 +817,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/GEOM_SRC_3.2.6/src/TransformationGUI/Makefile~ 2008-01-14 16:42:15.000000000 -0500 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/TransformationGUI/Makefile 2008-01-14 17:58:38.000000000 -0500 +@@ -831,7 +831,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/GEOM_SRC_3.2.6/src/OperationGUI/Makefile~ 2008-01-14 16:42:15.000000000 -0500 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/OperationGUI/Makefile 2008-01-14 18:44:37.000000000 -0500 +@@ -827,7 +827,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/GEOM_SRC_3.2.6/src/RepairGUI/Makefile~ 2008-01-14 16:42:15.000000000 -0500 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/RepairGUI/Makefile 2008-01-14 18:45:07.000000000 -0500 +@@ -837,7 +837,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/GEOM_SRC_3.2.6/src/MeasureGUI/Makefile~ 2008-01-14 16:42:15.000000000 -0500 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/MeasureGUI/Makefile 2008-01-14 18:45:40.000000000 -0500 +@@ -849,7 +849,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/GEOM_SRC_3.2.6/src/GroupGUI/Makefile~ 2008-01-14 16:42:15.000000000 -0500 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/GroupGUI/Makefile 2008-01-14 18:46:07.000000000 -0500 +@@ -817,7 +817,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/GEOM_SRC_3.2.6/src/BlocksGUI/Makefile~ 2008-01-14 16:42:14.000000000 -0500 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/BlocksGUI/Makefile 2008-01-14 18:46:29.000000000 -0500 +@@ -825,7 +825,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/GEOM_SRC_3.2.6/src/GEOM_I_Superv/Makefile~ 2008-01-14 16:42:15.000000000 -0500 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/GEOM_I_Superv/Makefile 2008-01-14 18:46:57.000000000 -0500 +@@ -820,7 +820,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/GEOM_SRC_3.2.6/src/GEOM_SWIG/Makefile~ 2008-01-14 16:42:15.000000000 -0500 ++++ salome-3.2.6/GEOM_SRC_3.2.6/src/GEOM_SWIG/Makefile 2008-01-14 18:47:34.000000000 -0500 +@@ -848,7 +848,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/MED_SRC_3.2.6/src/MEDMEM_I/Makefile~ 2008-01-14 15:13:09.000000000 -0500 ++++ salome-3.2.6/MED_SRC_3.2.6/src/MEDMEM_I/Makefile 2008-01-14 15:48:59.000000000 -0500 +@@ -887,7 +887,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/MED_SRC_3.2.6/src/MED/Makefile~ 2008-01-14 15:13:08.000000000 -0500 ++++ salome-3.2.6/MED_SRC_3.2.6/src/MED/Makefile 2008-01-14 15:50:44.000000000 -0500 +@@ -881,7 +881,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/MED_SRC_3.2.6/src/MedCorba_Swig/Makefile~ 2008-01-14 15:13:09.000000000 -0500 ++++ salome-3.2.6/MED_SRC_3.2.6/src/MedCorba_Swig/Makefile 2008-01-14 15:51:44.000000000 -0500 +@@ -894,7 +894,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/MED_SRC_3.2.6/src/MedClient/src/Makefile~ 2008-01-14 15:13:08.000000000 -0500 ++++ salome-3.2.6/MED_SRC_3.2.6/src/MedClient/src/Makefile 2008-01-14 15:53:10.000000000 -0500 +@@ -917,7 +917,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/MED_SRC_3.2.6/src/MedClient/test/test2/Makefile~ 2008-01-14 15:13:09.000000000 -0500 ++++ salome-3.2.6/MED_SRC_3.2.6/src/MedClient/test/test2/Makefile 2008-01-14 15:55:01.000000000 -0500 +@@ -885,7 +885,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/MED_SRC_3.2.6/src/MEDGUI/Makefile~ 2008-01-14 15:13:09.000000000 -0500 ++++ salome-3.2.6/MED_SRC_3.2.6/src/MEDGUI/Makefile 2008-01-14 15:55:51.000000000 -0500 +@@ -879,7 +879,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/SUPERV_SRC_3.2.6/src/GraphBase/Makefile~ 2008-01-15 07:19:26.000000000 -0500 ++++ salome-3.2.6/SUPERV_SRC_3.2.6/src/GraphBase/Makefile 2008-01-15 08:07:49.000000000 -0500 +@@ -879,7 +879,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/SUPERV_SRC_3.2.6/src/GraphEditor/Makefile~ 2008-01-15 07:19:26.000000000 -0500 ++++ salome-3.2.6/SUPERV_SRC_3.2.6/src/GraphEditor/Makefile 2008-01-15 08:08:34.000000000 -0500 +@@ -832,7 +832,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/SUPERV_SRC_3.2.6/src/GraphExecutor/Makefile~ 2008-01-15 07:19:27.000000000 -0500 ++++ salome-3.2.6/SUPERV_SRC_3.2.6/src/GraphExecutor/Makefile 2008-01-15 08:09:33.000000000 -0500 +@@ -843,7 +843,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/SUPERV_SRC_3.2.6/src/Supervision/Makefile~ 2008-01-15 07:19:27.000000000 -0500 ++++ salome-3.2.6/SUPERV_SRC_3.2.6/src/Supervision/Makefile 2008-01-15 08:10:12.000000000 -0500 +@@ -866,7 +866,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/SUPERV_SRC_3.2.6/src/SUPERVGUI/Makefile~ 2008-01-15 07:19:27.000000000 -0500 ++++ salome-3.2.6/SUPERV_SRC_3.2.6/src/SUPERVGUI/Makefile 2008-01-15 08:10:40.000000000 -0500 +@@ -872,7 +872,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/HELLO_SRC_3.2.6/src/HELLO/Makefile~ 2008-01-15 07:19:51.000000000 -0500 ++++ salome-3.2.6/HELLO_SRC_3.2.6/src/HELLO/Makefile 2008-01-15 08:49:57.000000000 -0500 +@@ -802,7 +802,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/HELLO_SRC_3.2.6/src/HELLOGUI/Makefile~ 2008-01-15 07:19:51.000000000 -0500 ++++ salome-3.2.6/HELLO_SRC_3.2.6/src/HELLOGUI/Makefile 2008-01-15 08:50:37.000000000 -0500 +@@ -806,7 +806,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/VISU_SRC_3.2.6/src/GUITOOLS/Makefile~ 2008-01-15 07:20:36.000000000 -0500 ++++ salome-3.2.6/VISU_SRC_3.2.6/src/GUITOOLS/Makefile 2008-01-15 09:07:07.000000000 -0500 +@@ -839,7 +839,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/VISU_SRC_3.2.6/src/VISU_I/Makefile~ 2008-01-15 07:20:36.000000000 -0500 ++++ salome-3.2.6/VISU_SRC_3.2.6/src/VISU_I/Makefile 2008-01-15 09:07:58.000000000 -0500 +@@ -965,7 +965,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/VISU_SRC_3.2.6/src/VISUGUI/Makefile~ 2008-01-15 07:20:36.000000000 -0500 ++++ salome-3.2.6/VISU_SRC_3.2.6/src/VISUGUI/Makefile 2008-01-15 09:08:26.000000000 -0500 +@@ -908,7 +908,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/VISU_SRC_3.2.6/src/ENGINE/Makefile~ 2008-01-15 07:20:36.000000000 -0500 ++++ salome-3.2.6/VISU_SRC_3.2.6/src/ENGINE/Makefile 2008-01-15 09:08:56.000000000 -0500 +@@ -838,7 +838,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/SMESH_SRC_3.2.6/src/SMESH_I/Makefile~ 2008-01-14 16:45:15.000000000 -0500 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/SMESH_I/Makefile 2008-01-14 19:20:14.000000000 -0500 +@@ -914,7 +914,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/SMESH_SRC_3.2.6/src/SMESHClient/Makefile~ 2008-01-15 07:21:08.000000000 -0500 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/SMESHClient/Makefile 2008-01-15 09:12:22.000000000 -0500 +@@ -841,7 +841,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/SMESH_SRC_3.2.6/src/OBJECT/Makefile~ 2008-01-15 07:21:07.000000000 -0500 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/OBJECT/Makefile 2008-01-15 09:13:06.000000000 -0500 +@@ -878,7 +878,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/SMESH_SRC_3.2.6/src/SMESHFiltersSelection/Makefile~ 2008-01-15 07:21:08.000000000 -0500 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/SMESHFiltersSelection/Makefile 2008-01-15 09:13:36.000000000 -0500 +@@ -817,7 +817,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/Makefile~ 2008-01-15 07:21:08.000000000 -0500 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/SMESHGUI/Makefile 2008-01-15 09:14:10.000000000 -0500 +@@ -948,7 +948,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/SMESH_SRC_3.2.6/src/SMESH_SWIG/Makefile~ 2008-01-15 07:21:08.000000000 -0500 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/SMESH_SWIG/Makefile 2008-01-15 09:14:39.000000000 -0500 +@@ -862,7 +862,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/SMESH_SRC_3.2.6/src/StdMeshers_I/Makefile~ 2008-01-15 07:21:08.000000000 -0500 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/StdMeshers_I/Makefile 2008-01-15 09:15:16.000000000 -0500 +@@ -861,7 +861,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/SMESH_SRC_3.2.6/src/StdMeshersGUI/Makefile~ 2008-01-15 07:21:08.000000000 -0500 ++++ salome-3.2.6/SMESH_SRC_3.2.6/src/StdMeshersGUI/Makefile 2008-01-15 09:15:48.000000000 -0500 +@@ -829,7 +829,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/COMPONENT_SRC_3.2.6/src/AddComponent/Makefile~ 2008-01-15 07:21:44.000000000 -0500 ++++ salome-3.2.6/COMPONENT_SRC_3.2.6/src/AddComponent/Makefile 2008-01-15 09:19:15.000000000 -0500 +@@ -801,7 +801,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/COMPONENT_SRC_3.2.6/src/AdditionComponent/Makefile~ 2008-01-15 07:21:44.000000000 -0500 ++++ salome-3.2.6/COMPONENT_SRC_3.2.6/src/AdditionComponent/Makefile 2008-01-15 09:20:00.000000000 -0500 +@@ -802,7 +802,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/COMPONENT_SRC_3.2.6/src/DivComponent/Makefile~ 2008-01-15 07:21:44.000000000 -0500 ++++ salome-3.2.6/COMPONENT_SRC_3.2.6/src/DivComponent/Makefile 2008-01-15 09:20:22.000000000 -0500 +@@ -791,7 +791,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/COMPONENT_SRC_3.2.6/src/MulComponent/Makefile~ 2008-01-15 07:21:44.000000000 -0500 ++++ salome-3.2.6/COMPONENT_SRC_3.2.6/src/MulComponent/Makefile 2008-01-15 09:20:52.000000000 -0500 +@@ -793,7 +793,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/COMPONENT_SRC_3.2.6/src/SubComponent/Makefile~ 2008-01-15 07:21:44.000000000 -0500 ++++ salome-3.2.6/COMPONENT_SRC_3.2.6/src/SubComponent/Makefile 2008-01-15 09:21:19.000000000 -0500 +@@ -793,7 +793,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/COMPONENT_SRC_3.2.6/src/SyrComponent/Makefile~ 2008-01-15 07:21:45.000000000 -0500 ++++ salome-3.2.6/COMPONENT_SRC_3.2.6/src/SyrComponent/Makefile 2008-01-15 09:21:50.000000000 -0500 +@@ -798,7 +798,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/CALCULATOR_SRC_3.2.6/src/CALCULATOR/Makefile~ 2008-01-15 07:22:08.000000000 -0500 ++++ salome-3.2.6/CALCULATOR_SRC_3.2.6/src/CALCULATOR/Makefile 2008-01-15 09:27:53.000000000 -0500 +@@ -827,7 +827,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/SIERPINSKY_SRC_3.2.6/src/Sierpinsky/Makefile~ 2008-01-15 07:22:53.000000000 -0500 ++++ salome-3.2.6/SIERPINSKY_SRC_3.2.6/src/Sierpinsky/Makefile 2008-01-15 09:36:57.000000000 -0500 +@@ -835,7 +835,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) +--- salome-3.2.6/SIERPINSKY_SRC_3.2.6/src/SierpinskyGUI/Makefile~ 2008-01-15 07:22:53.000000000 -0500 ++++ salome-3.2.6/SIERPINSKY_SRC_3.2.6/src/SierpinskyGUI/Makefile 2008-01-15 09:37:39.000000000 -0500 +@@ -846,7 +846,7 @@ + echo 'Dependencies cannot be built when $$srcdir == $$builddir'; \ + fi + +-depend:.depend ++depend: + + # when use the path as regexp, prevent taking "." for "any symbol" + srcdir_re = $(subst .,[.],$(srcdir)) --- salome-3.2.6.orig/debian/patch-med-debian-compat +++ salome-3.2.6/debian/patch-med-debian-compat @@ -0,0 +1,53 @@ +--- salome-3.2.6/MED_SRC_3.2.6/src/MEDWrapper/Base/MED_Common.hxx~ 2008-01-14 19:43:49.000000000 -0500 ++++ salome-3.2.6/MED_SRC_3.2.6/src/MEDWrapper/Base/MED_Common.hxx 2008-01-14 21:44:05.000000000 -0500 +@@ -53,7 +53,7 @@ + typedef int TInt; + #endif + #if defined(IRIX64) || defined(OSF1) || defined(PCLINUX64) +- typedef long TInt; ++ typedef int TInt; + #endif + typedef hid_t TIdt; + typedef herr_t TErr; +--- salome-3.2.6/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/med.hxx~ 2008-01-14 21:06:42.000000000 -0500 ++++ salome-3.2.6/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/med.hxx 2008-01-14 21:50:25.000000000 -0500 +@@ -124,7 +124,7 @@ + typedef herr_t med_err; + + /* types elementaires */ +-typedef long med_int; ++typedef int med_int; + typedef double med_float; + #endif + +--- salome-3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_define.hxx~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_define.hxx 2008-01-14 22:20:16.000000000 -0500 +@@ -149,7 +149,7 @@ + typedef herr_t med_err; + + /* types elementaires */ +-typedef long med_int; ++typedef int med_int; + typedef double med_float; + #endif + +--- salome-3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_MEDMEMchampLire.cxx~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_MEDMEMchampLire.cxx 2008-01-14 22:51:00.000000000 -0500 +@@ -110,7 +110,7 @@ + char chemin[MED_TAILLE_CHA+MED_TAILLE_NOM+1]=""; + med_size psize=0; + med_int *pfltabtmp=0; +- med_ssize *pfltab=0; ++ med_size *pfltab=0; + + /* + * On inhibe le gestionnaire d'erreur HDF 5 +@@ -185,7 +185,7 @@ + psize = i; + + pfltabtmp = (med_int *) malloc (sizeof(med_int)*psize); +- pfltab = (med_ssize *) malloc (sizeof(med_ssize)*psize); ++ pfltab = (med_size *) malloc (sizeof(med_size)*psize); + if (MEDprofilLire(fid,pfltabtmp,profil) < 0) + goto ERROR; + for (i=0;i> configure.in_tmp1 +-echo " ./salome_adm/unix/F77config.h \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/sstream \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/depend \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/F77config.h \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/sstream \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/depend \\" >> configure.in_tmp1 + echo " ./adm_local/unix/make_omniorb:${ABS_CONF_DIR}/adm_local/unix/make_omniorb.in \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/envScript \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/envScript \\" >> configure.in_tmp1 + echo " ./adm_local/unix/make_commence:${ABS_CONF_DIR}/adm_local/unix/make_commence.in \\" >> configure.in_tmp1 + echo " ./adm_local/unix/make_conclude:${ABS_CONF_DIR}/adm_local/unix/make_conclude.in \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/make_module \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/make_module \\" >> configure.in_tmp1 + + \rm -f configure.in_tmp2 configure.in_tmp3 + touch configure.in_tmp2 +--- salome-3.2.6.orig/GUI_SRC_3.2.6/adm_local/unix/make_commence.in 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-11 16:27:18.000000000 -0500 +@@ -249,11 +249,11 @@ + + LOCAL_MAKE = make_commence make_conclude make_omniorb + +-KERNEL_MAKE = make_module depend SALOMEconfig.h F77config.h sstream envScript ++KERNEL_MAKE = make_module depend F77config.h sstream envScript + + $(top_builddir)/config.status: $(top_srcdir)/configure \ + $(LOCAL_MAKE:%=$(top_srcdir)/adm_local/unix/%.in) \ +- $(KERNEL_MAKE:%=$(KERNEL_ROOT_DIR)/salome_adm/unix/%.in) ++ $(KERNEL_MAKE:%=$(KERNEL_ROOT_DIR)/salome_adm/unix/DEPRECATED/%.in) + cd $(top_builddir) ; ./config.status --recheck + + # VPATH contain $(srcdir), so make configure is good in top_srcdir and we must add target configure otherwise :-) +--- salome-3.2.6.orig/GUI_SRC_3.2.6/configure.in.base 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/configure.in.base 2008-01-11 17:56:07.000000000 -0500 +@@ -501,10 +501,10 @@ + + AC_SUBST_FILE(COMMENCE) COMMENCE=adm_local/unix/make_commence + AC_SUBST_FILE(CONCLUDE) CONCLUDE=adm_local/unix/make_conclude +-AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/make_module ++AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/DEPRECATED/make_module + + dnl les dependences +-AC_SUBST_FILE(DEPEND) DEPEND=salome_adm/unix/depend ++AC_SUBST_FILE(DEPEND) DEPEND=salome_adm/unix/DEPRECATED/depend + + dnl We don t need to say when we re entering directories if we re using + dnl GNU make becuase make does it for us. +@@ -568,7 +568,7 @@ + done + cd $ROOT_BUILDDIR + +-AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=salome_adm/unix/envScript ++AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=salome_adm/unix/DEPRECATED/envScript + + dnl copy xml files to the build tree (lib directory) + dnl pourquoi ???? +--- salome-3.2.6.orig/GEOM_SRC_3.2.6/build_configure 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/build_configure 2008-01-14 11:10:04.000000000 -0500 +@@ -127,15 +127,14 @@ + # put them "manually" + # + +-echo " ./salome_adm/unix/SALOMEconfig.h \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/F77config.h \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/sstream \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/depend \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/F77config.h \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/sstream \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/depend \\" >> configure.in_tmp1 + echo " ./adm_local/unix/make_omniorb:${ABS_CONF_DIR}/adm_local/unix/make_omniorb.in \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/envScript \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/envScript \\" >> configure.in_tmp1 + echo " ./adm_local/unix/make_commence:${ABS_CONF_DIR}/adm_local/unix/make_commence.in \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/make_conclude \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/make_module \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/make_conclude \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/make_module \\" >> configure.in_tmp1 + + \rm -f configure.in_tmp2 configure.in_tmp3 + touch configure.in_tmp2 +--- salome-3.2.6.orig/GEOM_SRC_3.2.6/adm_local/unix/make_commence.in 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-14 11:12:29.000000000 -0500 +@@ -238,11 +238,11 @@ + + LOCAL_MAKE = make_commence make_omniorb + +-KERNEL_MAKE = make_module make_conclude depend SALOMEconfig.h F77config.h sstream envScript ++KERNEL_MAKE = make_module make_conclude depend F77config.h sstream envScript + + $(top_builddir)/config.status: $(top_srcdir)/configure \ + $(LOCAL_MAKE:%=$(top_srcdir)/adm_local/unix/%.in) \ +- $(KERNEL_MAKE:%=$(KERNEL_ROOT_DIR)/salome_adm/unix/%.in) ++ $(KERNEL_MAKE:%=$(KERNEL_ROOT_DIR)/salome_adm/unix/DEPRECATED/%.in) + cd $(top_builddir) ; ./config.status --recheck + + # VPATH contain $(srcdir), so make configure is good in top_srcdir and we must add target configure otherwise :-) +--- salome-3.2.6.orig/GEOM_SRC_3.2.6/configure.in.base 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/configure.in.base 2008-01-14 11:15:34.000000000 -0500 +@@ -314,11 +314,11 @@ + dnl generals files which could be included in every makefile + + AC_SUBST_FILE(COMMENCE) COMMENCE=adm_local/unix/make_commence +-AC_SUBST_FILE(CONCLUDE) CONCLUDE=salome_adm/unix/make_conclude +-AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/make_module ++AC_SUBST_FILE(CONCLUDE) CONCLUDE=salome_adm/unix/DEPRECATED/make_conclude ++AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/DEPRECATED/make_module + + dnl les dependences +-AC_SUBST_FILE(DEPEND) DEPEND=salome_adm/unix/depend ++AC_SUBST_FILE(DEPEND) DEPEND=salome_adm/unix/DEPRECATED/depend + + dnl We don t need to say when we re entering directories if we re using + dnl GNU make becuase make does it for us. +@@ -376,7 +376,7 @@ + done + cd $ROOT_BUILDDIR + +-AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=salome_adm/unix/envScript ++AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=salome_adm/unix/DEPRECATED/envScript + + dnl copy xml files to the build tree (lib directory) + dnl pourquoi ???? +--- salome-3.2.6.orig/MED_SRC_3.2.6/build_configure 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/MED_SRC_3.2.6/build_configure 2008-01-14 11:18:57.000000000 -0500 +@@ -190,23 +190,22 @@ + # + echo "" >> configure.in_tmp1 + echo "AC_OUTPUT([ \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/SALOMEconfig.h \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/sstream \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/depend \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/sstream \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/depend \\" >> configure.in_tmp1 + echo " ])" >> configure.in_tmp1 + echo "" >> configure.in_tmp1 + echo 'if test $MED_WITH_KERNEL = yes; then' >> configure.in_tmp1 + echo "{" >> configure.in_tmp1 + echo "AC_OUTPUT([ \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/F77config.h \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/F77config.h \\" >> configure.in_tmp1 + echo " ./adm_local/unix/make_omniorb:${ABS_CONF_DIR}/adm_local/unix/make_omniorb.in \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/envScript \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/envScript \\" >> configure.in_tmp1 + echo " ])" >> configure.in_tmp1 + echo "}" >> configure.in_tmp1 + echo "fi" >> configure.in_tmp1 + echo "" >> configure.in_tmp1 + echo "AC_OUTPUT([ \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/make_module \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/make_module \\" >> configure.in_tmp1 + + # _CS_gbo Pour assurer ls construction correct de la chaîne de + # dépendance, il apparaît nécessaire de surcharger le make_conclude +--- salome-3.2.6.orig/MED_SRC_3.2.6/adm_local/unix/make_commence.in 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/MED_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-14 11:20:48.000000000 -0500 +@@ -275,7 +275,7 @@ + ifeq ($(MED_WITH_KERNEL),yes) + LOCAL_MAKE += make_omniorb + +- KERNEL_MAKE = make_module depend SALOMEconfig.h sstream ++ KERNEL_MAKE = make_module depend sstream + KERNEL_MAKE += F77config.h envScript + + NOKERNEL_MAKE = +@@ -288,7 +288,7 @@ + + $(top_builddir)/config.status: $(top_srcdir)/configure \ + $(LOCAL_MAKE:%=$(top_srcdir)/adm_local/unix/%.in) \ +- $(KERNEL_MAKE:%=$(KERNEL_ROOT_DIR)/salome_adm/unix/%.in) \ ++ $(KERNEL_MAKE:%=$(KERNEL_ROOT_DIR)/salome_adm/unix/DEPRECATED/%.in) \ + $(NOKERNEL_MAKE:%=$(top_srcdir)/adm_local_without_kernel/unix/%.in) + cd $(top_builddir) ; ./config.status --recheck + +--- salome-3.2.6.orig/MED_SRC_3.2.6/configure.in.base 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/MED_SRC_3.2.6/configure.in.base 2008-01-14 11:23:23.000000000 -0500 +@@ -502,10 +502,10 @@ + + AC_SUBST_FILE(COMMENCE) COMMENCE=adm_local/unix/make_commence + AC_SUBST_FILE(CONCLUDE) CONCLUDE=adm_local/unix/make_conclude +-AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/make_module ++AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/DEPRECATED/make_module + + dnl les dependences +-AC_SUBST_FILE(DEPEND) DEPEND=salome_adm/unix/depend ++AC_SUBST_FILE(DEPEND) DEPEND=salome_adm/unix/DEPRECATED/depend + + dnl We don t need to say when we re entering directories if we re using + dnl GNU make becuase make does it for us. +@@ -565,7 +565,7 @@ + cd $ROOT_BUILDDIR + + if test ${MED_WITH_KERNEL} = "yes"; then +-AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=salome_adm/unix/envScript ++AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=salome_adm/unix/DEPRECATED/envScript + fi + + dnl copy xml files to the build tree (lib directory) +--- salome-3.2.6.orig/RANDOMIZER_SRC_3.2.6/build_configure 2006-05-06 05:01:22.000000000 -0400 ++++ salome-3.2.6/RANDOMIZER_SRC_3.2.6/build_configure 2008-01-14 11:38:34.000000000 -0500 +@@ -131,14 +131,13 @@ + # Attention, l'ordre d'entrée des fichiers doit être choisi avec + # précision + # +-echo " ./salome_adm/unix/SALOMEconfig.h \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/F77config.h \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/sstream \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/F77config.h \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/sstream \\" >> configure.in_tmp1 + +-echo " ./salome_adm/unix/depend \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/depend \\" >> configure.in_tmp1 + echo " ./adm_local/unix/make_omniorb:${ABS_CONF_DIR}/adm_local/unix/make_omniorb.in \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/envScript \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/make_module \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/envScript \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/make_module \\" >> configure.in_tmp1 + + # _CS_gbo Pour assurer ls construction correct de la chaîne de + # dépendance, il apparaît nécessaire de surcharger le make_conclude +@@ -147,7 +146,7 @@ + # c'est à dire le make_conclude (resp. make_commence) du répertoire + # adm_local + echo " ./adm_local/unix/make_commence:${ABS_CONF_DIR}/adm_local/unix/make_commence.in \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/make_conclude \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/make_conclude \\" >> configure.in_tmp1 + + \rm -f configure.in_tmp2 configure.in_tmp3 + touch configure.in_tmp2 +--- salome-3.2.6.orig/RANDOMIZER_SRC_3.2.6/configure.in.base 2007-03-02 08:58:14.000000000 -0500 ++++ salome-3.2.6/RANDOMIZER_SRC_3.2.6/configure.in.base 2008-01-14 11:41:53.000000000 -0500 +@@ -179,11 +179,11 @@ + dnl generals files which could be included in every makefile + + AC_SUBST_FILE(COMMENCE) COMMENCE=adm_local/unix/make_commence +-AC_SUBST_FILE(CONCLUDE) CONCLUDE=salome_adm/unix/make_conclude +-AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/make_module ++AC_SUBST_FILE(CONCLUDE) CONCLUDE=salome_adm/unix/DEPRECATED/make_conclude ++AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/DEPRECATED/make_module + + dnl les dependences +-AC_SUBST_FILE(DEPEND) DEPEND=salome_adm/unix/depend ++AC_SUBST_FILE(DEPEND) DEPEND=salome_adm/unix/DEPRECATED/depend + + dnl We don t need to say when we re entering directories if we re using + dnl GNU make becuase make does it for us. +@@ -240,7 +240,7 @@ + done + cd $ROOT_BUILDDIR + +-AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=salome_adm/unix/envScript ++AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=salome_adm/unix/DEPRECATED/envScript + + dnl copy xml files to the build tree (lib directory) + dnl pourquoi ???? +--- salome-3.2.6.orig/RANDOMIZER_SRC_3.2.6/adm_local/unix/make_commence.in 2006-06-27 03:47:49.000000000 -0400 ++++ salome-3.2.6/RANDOMIZER_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-14 11:41:08.000000000 -0500 +@@ -145,11 +145,11 @@ + + LOCAL_MAKE = make_commence make_omniorb + +-KERNEL_MAKE = make_module make_conclude depend SALOMEconfig.h F77config.h sstream envScript ++KERNEL_MAKE = make_module make_conclude depend F77config.h sstream envScript + + $(top_builddir)/config.status: $(top_srcdir)/configure \ + $(LOCAL_MAKE:%=$(top_srcdir)/adm_local/unix/%.in) \ +- $(KERNEL_MAKE:%=$(KERNEL_ROOT_DIR)/salome_adm/unix/%.in) ++ $(KERNEL_MAKE:%=$(KERNEL_ROOT_DIR)/salome_adm/unix/DEPRECATED/%.in) + cd $(top_builddir) ; ./config.status --recheck + + # VPATH contain $(srcdir), so make configure is good in top_srcdir and we must add target configure otherwise :-) +--- salome-3.2.6.orig/SUPERV_SRC_3.2.6/build_configure 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/SUPERV_SRC_3.2.6/build_configure 2008-01-14 16:05:20.000000000 -0500 +@@ -129,15 +129,14 @@ + # put them "manually" + # + +-echo " ./salome_adm/unix/SALOMEconfig.h \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/F77config.h \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/sstream \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/depend \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/F77config.h \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/sstream \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/depend \\" >> configure.in_tmp1 + echo " ./adm_local/unix/make_omniorb:${ABS_CONF_DIR}/adm_local/unix/make_omniorb.in \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/envScript \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/envScript \\" >> configure.in_tmp1 + echo " ./adm_local/unix/make_commence:${ABS_CONF_DIR}/adm_local/unix/make_commence.in \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/make_conclude \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/make_module \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/make_conclude \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/make_module \\" >> configure.in_tmp1 + + \rm -f configure.in_tmp2 configure.in_tmp3 + touch configure.in_tmp2 +--- salome-3.2.6.orig/SUPERV_SRC_3.2.6/configure.in.base 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/SUPERV_SRC_3.2.6/configure.in.base 2008-01-14 16:05:30.000000000 -0500 +@@ -318,11 +318,11 @@ + dnl generals files which could be included in every makefile + + AC_SUBST_FILE(COMMENCE) COMMENCE=adm_local/unix/make_commence +-AC_SUBST_FILE(CONCLUDE) CONCLUDE=salome_adm/unix/make_conclude +-AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/make_module ++AC_SUBST_FILE(CONCLUDE) CONCLUDE=salome_adm/unix/DEPRECATED/make_conclude ++AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/DEPRECATED/make_module + + dnl les dependences +-AC_SUBST_FILE(DEPEND) DEPEND=salome_adm/unix/depend ++AC_SUBST_FILE(DEPEND) DEPEND=salome_adm/unix/DEPRECATED/depend + + dnl We don t need to say when we re entering directories if we re using + dnl GNU make becuase make does it for us. +@@ -379,7 +379,7 @@ + done + cd $ROOT_BUILDDIR + +-AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=salome_adm/unix/envScript ++AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=salome_adm/unix/DEPRECATED/envScript + + dnl copy xml files to the build tree (lib directory) + dnl pourquoi ???? +--- salome-3.2.6.orig/HELLO_SRC_3.2.6/build_configure 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/HELLO_SRC_3.2.6/build_configure 2008-01-14 11:56:43.000000000 -0500 +@@ -123,15 +123,14 @@ + # put them "manually" + # + +-echo "./salome_adm/unix/SALOMEconfig.h \\" >> configure.in_tmp1 +-echo "./salome_adm/unix/F77config.h \\" >> configure.in_tmp1 +-echo "./salome_adm/unix/sstream \\" >> configure.in_tmp1 +-echo "./salome_adm/unix/depend \\" >> configure.in_tmp1 ++echo "./salome_adm/unix/DEPRECATED/F77config.h \\" >> configure.in_tmp1 ++echo "./salome_adm/unix/DEPRECATED/sstream \\" >> configure.in_tmp1 ++echo "./salome_adm/unix/DEPRECATED/depend \\" >> configure.in_tmp1 + echo "./adm_local/unix/make_omniorb:${ABS_CONF_DIR}/adm_local/unix/make_omniorb.in \\" >> configure.in_tmp1 +-echo "./salome_adm/unix/envScript \\" >> configure.in_tmp1 ++echo "./salome_adm/unix/DEPRECATED/envScript \\" >> configure.in_tmp1 + echo "./adm_local/unix/make_commence:${ABS_CONF_DIR}/adm_local/unix/make_commence.in \\" >> configure.in_tmp1 +-echo "./salome_adm/unix/make_conclude \\" >> configure.in_tmp1 +-echo "./salome_adm/unix/make_module \\" >> configure.in_tmp1 ++echo "./salome_adm/unix/DEPRECATED/make_conclude \\" >> configure.in_tmp1 ++echo "./salome_adm/unix/DEPRECATED/make_module \\" >> configure.in_tmp1 + + \rm -f configure.in_tmp2 + touch configure.in_tmp2 +--- salome-3.2.6.orig/HELLO_SRC_3.2.6/configure.in.base 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/HELLO_SRC_3.2.6/configure.in.base 2008-01-14 11:57:36.000000000 -0500 +@@ -255,11 +255,11 @@ + dnl generals files which could be included in every makefile + + AC_SUBST_FILE(COMMENCE) COMMENCE=adm_local/unix/make_commence +-AC_SUBST_FILE(CONCLUDE) CONCLUDE=salome_adm/unix/make_conclude +-AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/make_module ++AC_SUBST_FILE(CONCLUDE) CONCLUDE=salome_adm/unix/DEPRECATED/make_conclude ++AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/DEPRECATED/make_module + + dnl les dependences +-AC_SUBST_FILE(DEPEND) DEPEND=salome_adm/unix/depend ++AC_SUBST_FILE(DEPEND) DEPEND=salome_adm/unix/DEPRECATED/depend + + dnl We don t need to say when we re entering directories if we re using + dnl GNU make becuase make does it for us. +@@ -298,7 +298,7 @@ + done + cd $ROOT_BUILDDIR + +-AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=salome_adm/unix/envScript ++AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=salome_adm/unix/DEPRECATED/envScript + + echo + echo --------------------------------------------- +--- salome-3.2.6.orig/HELLO_SRC_3.2.6/adm_local/unix/make_commence.in 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/HELLO_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-14 11:59:21.000000000 -0500 +@@ -240,11 +240,11 @@ + + LOCAL_MAKE = make_commence make_omniorb + +-KERNEL_MAKE = make_module make_conclude depend SALOMEconfig.h F77config.h sstream envScript ++KERNEL_MAKE = make_module make_conclude depend F77config.h sstream envScript + + $(top_builddir)/config.status: $(top_srcdir)/configure \ + $(LOCAL_MAKE:%=$(top_srcdir)/adm_local/unix/%.in) \ +- $(KERNEL_MAKE:%=$(KERNEL_ROOT_DIR)/salome_adm/unix/%.in) ++ $(KERNEL_MAKE:%=$(KERNEL_ROOT_DIR)/salome_adm/unix/DEPRECATED/%.in) + cd $(top_builddir) ; ./config.status --recheck + + # VPATH contain $(srcdir), so make configure is good in top_srcdir and we must add target configure otherwise :-) +--- salome-3.2.6.orig/PYHELLO_SRC_3.2.6/build_configure 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/PYHELLO_SRC_3.2.6/build_configure 2008-01-14 13:21:25.000000000 -0500 +@@ -123,15 +123,14 @@ + # put them "manually" + # + +-echo "./salome_adm/unix/SALOMEconfig.h \\" >> configure.in_tmp1 +-echo "./salome_adm/unix/F77config.h \\" >> configure.in_tmp1 +-echo "./salome_adm/unix/sstream \\" >> configure.in_tmp1 +-echo "./salome_adm/unix/depend \\" >> configure.in_tmp1 ++echo "./salome_adm/unix/DEPRECATED/F77config.h \\" >> configure.in_tmp1 ++echo "./salome_adm/unix/DEPRECATED/sstream \\" >> configure.in_tmp1 ++echo "./salome_adm/unix/DEPRECATED/depend \\" >> configure.in_tmp1 + echo "./adm_local/unix/make_omniorb:${ABS_CONF_DIR}/adm_local/unix/make_omniorb.in \\" >> configure.in_tmp1 +-echo "./salome_adm/unix/envScript \\" >> configure.in_tmp1 ++echo "./salome_adm/unix/DEPRECATED/envScript \\" >> configure.in_tmp1 + echo "./adm_local/unix/make_commence:${ABS_CONF_DIR}/adm_local/unix/make_commence.in \\" >> configure.in_tmp1 +-echo "./salome_adm/unix/make_conclude \\" >> configure.in_tmp1 +-echo "./salome_adm/unix/make_module \\" >> configure.in_tmp1 ++echo "./salome_adm/unix/DEPRECATED/make_conclude \\" >> configure.in_tmp1 ++echo "./salome_adm/unix/DEPRECATED/make_module \\" >> configure.in_tmp1 + + \rm -f configure.in_tmp2 + touch configure.in_tmp2 +--- salome-3.2.6.orig/PYHELLO_SRC_3.2.6/configure.in.base 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/PYHELLO_SRC_3.2.6/configure.in.base 2008-01-14 13:22:13.000000000 -0500 +@@ -179,11 +179,11 @@ + dnl generals files which could be included in every makefile + + AC_SUBST_FILE(COMMENCE) COMMENCE=adm_local/unix/make_commence +-AC_SUBST_FILE(CONCLUDE) CONCLUDE=salome_adm/unix/make_conclude +-AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/make_module ++AC_SUBST_FILE(CONCLUDE) CONCLUDE=salome_adm/unix/DEPRECATED/make_conclude ++AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/DEPRECATED/make_module + + dnl les dependences +-AC_SUBST_FILE(DEPEND) DEPEND=salome_adm/unix/depend ++AC_SUBST_FILE(DEPEND) DEPEND=salome_adm/unix/DEPRECATED/depend + + dnl We don t need to say when we re entering directories if we re using + dnl GNU make becuase make does it for us. +@@ -222,7 +222,7 @@ + done + cd $ROOT_BUILDDIR + +-AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=salome_adm/unix/envScript ++AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=salome_adm/unix/DEPRECATED/envScript + + echo + echo --------------------------------------------- +--- salome-3.2.6.orig/PYHELLO_SRC_3.2.6/adm_local/unix/make_commence.in 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/PYHELLO_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-14 13:21:59.000000000 -0500 +@@ -227,11 +227,11 @@ + + LOCAL_MAKE = make_commence make_omniorb + +-KERNEL_MAKE = make_module make_conclude depend SALOMEconfig.h F77config.h sstream envScript ++KERNEL_MAKE = make_module make_conclude depend F77config.h sstream envScript + + $(top_builddir)/config.status: $(top_srcdir)/configure \ + $(LOCAL_MAKE:%=$(top_srcdir)/adm_local/unix/%.in) \ +- $(KERNEL_MAKE:%=$(KERNEL_ROOT_DIR)/salome_adm/unix/%.in) ++ $(KERNEL_MAKE:%=$(KERNEL_ROOT_DIR)/salome_adm/unix/DEPRECATED/%.in) + cd $(top_builddir) ; ./config.status --recheck + + # VPATH contain $(srcdir), so make configure is good in top_srcdir and we must add target configure otherwise :-) +--- salome-3.2.6/PYHELLO_SRC_3.2.6/Makefile.in~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/PYHELLO_SRC_3.2.6/Makefile.in 2008-01-15 09:01:33.000000000 -0500 +@@ -68,7 +68,7 @@ + cp -p $< $@; \ + fi; \ + +-include/salome/sstream: salome_adm/unix/sstream ++include/salome/sstream: salome_adm/unix/DEPRECATED/sstream + -$(RM) $@ + $(LN_S) ../../$< $@ + +--- salome-3.2.6.orig/SMESH_SRC_3.2.6/build_configure 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/build_configure 2008-01-14 13:25:07.000000000 -0500 +@@ -146,15 +146,14 @@ + # put them "manually" + # + +-echo " ./salome_adm/unix/SALOMEconfig.h \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/F77config.h \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/sstream \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/depend \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/F77config.h \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/sstream \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/depend \\" >> configure.in_tmp1 + echo " ./adm_local/unix/make_omniorb:${ABS_CONF_DIR}/adm_local/unix/make_omniorb.in \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/envScript \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/envScript \\" >> configure.in_tmp1 + echo " ./adm_local/unix/make_commence:${ABS_CONF_DIR}/adm_local/unix/make_commence.in \\" >> configure.in_tmp1 + echo " ./adm_local/unix/make_conclude:${ABS_CONF_DIR}/adm_local/unix/make_conclude.in \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/make_module \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/make_module \\" >> configure.in_tmp1 + + \rm -f configure.in_tmp2 configure.in_tmp3 + touch configure.in_tmp2 +--- salome-3.2.6.orig/SMESH_SRC_3.2.6/configure.in.base 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/configure.in.base 2008-01-14 13:28:19.000000000 -0500 +@@ -359,10 +359,10 @@ + + AC_SUBST_FILE(COMMENCE) COMMENCE=adm_local/unix/make_commence + AC_SUBST_FILE(CONCLUDE) CONCLUDE=adm_local/unix/make_conclude +-AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/make_module ++AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/DEPRECATED/make_module + + dnl les dependences +-AC_SUBST_FILE(DEPEND) DEPEND=salome_adm/unix/depend ++AC_SUBST_FILE(DEPEND) DEPEND=salome_adm/unix/DEPRECATED/depend + + dnl We don t need to say when we re entering directories if we re using + dnl GNU make becuase make does it for us. +@@ -419,7 +419,7 @@ + done + cd $ROOT_BUILDDIR + +-AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=salome_adm/unix/envScript ++AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=salome_adm/unix/DEPRECATED/envScript + + dnl copy xml files to the build tree (lib directory) + dnl pourquoi ???? +--- salome-3.2.6.orig/SMESH_SRC_3.2.6/adm_local/unix/make_commence.in 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-14 13:28:45.000000000 -0500 +@@ -258,11 +258,11 @@ + + LOCAL_MAKE = make_commence make_conclude make_omniorb + +-KERNEL_MAKE = make_module depend SALOMEconfig.h F77config.h sstream envScript ++KERNEL_MAKE = make_module depend F77config.h sstream envScript + + $(top_builddir)/config.status: $(top_srcdir)/configure \ + $(LOCAL_MAKE:%=$(top_srcdir)/adm_local/unix/%.in) \ +- $(KERNEL_MAKE:%=$(KERNEL_ROOT_DIR)/salome_adm/unix/%.in) ++ $(KERNEL_MAKE:%=$(KERNEL_ROOT_DIR)/salome_adm/unix/DEPRECATED/%.in) + cd $(top_builddir) ; ./config.status --recheck + + # VPATH contain $(srcdir), so make configure is good in top_srcdir and we must add target configure otherwise :-) +--- salome-3.2.6.orig/VISU_SRC_3.2.6/build_configure 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/VISU_SRC_3.2.6/build_configure 2008-01-14 13:32:20.000000000 -0500 +@@ -138,15 +138,14 @@ + # put them "manually" + # + +-echo " ./salome_adm/unix/SALOMEconfig.h \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/F77config.h \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/sstream \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/depend \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/F77config.h \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/sstream \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/depend \\" >> configure.in_tmp1 + echo " ./adm_local/unix/make_omniorb:${ABS_CONF_DIR}/adm_local/unix/make_omniorb.in \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/envScript \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/envScript \\" >> configure.in_tmp1 + echo " ./adm_local/unix/make_commence:${ABS_CONF_DIR}/adm_local/unix/make_commence.in \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/make_conclude \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/make_module \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/make_conclude \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/make_module \\" >> configure.in_tmp1 + + \rm -f configure.in_tmp2 configure.in_tmp3 + touch configure.in_tmp2 +--- salome-3.2.6.orig/VISU_SRC_3.2.6/configure.in.base 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/VISU_SRC_3.2.6/configure.in.base 2008-01-14 13:32:31.000000000 -0500 +@@ -332,11 +332,11 @@ + dnl generals files which could be included in every makefile + + AC_SUBST_FILE(COMMENCE) COMMENCE=adm_local/unix/make_commence +-AC_SUBST_FILE(CONCLUDE) CONCLUDE=salome_adm/unix/make_conclude +-AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/make_module ++AC_SUBST_FILE(CONCLUDE) CONCLUDE=salome_adm/unix/DEPRECATED/make_conclude ++AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/DEPRECATED/make_module + + dnl les dependences +-AC_SUBST_FILE(DEPEND) DEPEND=salome_adm/unix/depend ++AC_SUBST_FILE(DEPEND) DEPEND=salome_adm/unix/DEPRECATED/depend + + dnl We don t need to say when we re entering directories if we re using + dnl GNU make becuase make does it for us. +@@ -393,7 +393,7 @@ + done + cd $ROOT_BUILDDIR + +-AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=salome_adm/unix/envScript ++AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=salome_adm/unix/DEPRECATED/envScript + + dnl copy xml files to the build tree (lib directory) + dnl pourquoi ???? +--- salome-3.2.6.orig/VISU_SRC_3.2.6/adm_local/unix/make_commence.in 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/VISU_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-14 13:32:54.000000000 -0500 +@@ -248,11 +248,11 @@ + + LOCAL_MAKE = make_commence make_omniorb + +-KERNEL_MAKE = make_module make_conclude depend SALOMEconfig.h F77config.h sstream envScript ++KERNEL_MAKE = make_module make_conclude depend F77config.h sstream envScript + + $(top_builddir)/config.status: $(top_srcdir)/configure \ + $(LOCAL_MAKE:%=$(top_srcdir)/adm_local/unix/%.in) \ +- $(KERNEL_MAKE:%=$(KERNEL_ROOT_DIR)/salome_adm/unix/%.in) ++ $(KERNEL_MAKE:%=$(KERNEL_ROOT_DIR)/salome_adm/unix/DEPRECATED/%.in) + cd $(top_builddir) ; ./config.status --recheck + + # VPATH contain $(srcdir), so make configure is good in top_srcdir and we must add target configure otherwise :-) +--- salome-3.2.6.orig/COMPONENT_SRC_3.2.6/build_configure 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/COMPONENT_SRC_3.2.6/build_configure 2008-01-14 13:35:54.000000000 -0500 +@@ -157,14 +157,13 @@ + # Attention, l'ordre d'entrée des fichiers doit être choisi avec + # précision + # +-echo " ./salome_adm/unix/SALOMEconfig.h \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/F77config.h \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/sstream \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/F77config.h \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/sstream \\" >> configure.in_tmp1 + +-echo " ./salome_adm/unix/depend \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/depend \\" >> configure.in_tmp1 + echo " ./adm_local/unix/make_omniorb:${ABS_CONF_DIR}/adm_local/unix/make_omniorb.in \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/envScript \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/make_module \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/envScript \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/make_module \\" >> configure.in_tmp1 + + # _CS_gbo Pour assurer ls construction correct de la chaîne de + # dépendance, il apparaît nécessaire de surcharger le make_conclude +--- salome-3.2.6.orig/COMPONENT_SRC_3.2.6/configure.in.base 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/COMPONENT_SRC_3.2.6/configure.in.base 2008-01-14 13:36:05.000000000 -0500 +@@ -431,10 +431,10 @@ + + AC_SUBST_FILE(COMMENCE) COMMENCE=adm_local/unix/make_commence + AC_SUBST_FILE(CONCLUDE) CONCLUDE=adm_local/unix/make_conclude +-AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/make_module ++AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/DEPRECATED/make_module + + dnl les dependences +-AC_SUBST_FILE(DEPEND) DEPEND=salome_adm/unix/depend ++AC_SUBST_FILE(DEPEND) DEPEND=salome_adm/unix/DEPRECATED/depend + + dnl We don t need to say when we re entering directories if we re using + dnl GNU make becuase make does it for us. +@@ -491,7 +491,7 @@ + done + cd $ROOT_BUILDDIR + +-AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=salome_adm/unix/envScript ++AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=salome_adm/unix/DEPRECATED/envScript + + dnl copy xml files to the build tree (lib directory) + dnl pourquoi ???? +--- salome-3.2.6.orig/COMPONENT_SRC_3.2.6/adm_local/unix/make_commence.in 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/COMPONENT_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-14 13:36:26.000000000 -0500 +@@ -252,11 +252,11 @@ + + LOCAL_MAKE = make_commence make_conclude make_omniorb + +-KERNEL_MAKE = make_module depend SALOMEconfig.h F77config.h sstream envScript ++KERNEL_MAKE = make_module depend F77config.h sstream envScript + + $(top_builddir)/config.status: $(top_srcdir)/configure \ + $(LOCAL_MAKE:%=$(top_srcdir)/adm_local/unix/%.in) \ +- $(KERNEL_MAKE:%=$(KERNEL_ROOT_DIR)/salome_adm/unix/%.in) ++ $(KERNEL_MAKE:%=$(KERNEL_ROOT_DIR)/salome_adm/unix/DEPRECATED/%.in) + cd $(top_builddir) ; ./config.status --recheck + + # VPATH contain $(srcdir), so make configure is good in top_srcdir and we must add target configure otherwise :-) +--- salome-3.2.6.orig/CALCULATOR_SRC_3.2.6/build_configure 2007-04-24 12:41:05.000000000 -0400 ++++ salome-3.2.6/CALCULATOR_SRC_3.2.6/build_configure 2008-01-14 13:39:59.000000000 -0500 +@@ -149,15 +149,14 @@ + # put them "manually" + # + +-echo "./salome_adm/unix/SALOMEconfig.h \\" >> configure.in_tmp1 +-echo "./salome_adm/unix/F77config.h \\" >> configure.in_tmp1 +-echo "./salome_adm/unix/sstream \\" >> configure.in_tmp1 +-echo "./salome_adm/unix/depend \\" >> configure.in_tmp1 ++echo "./salome_adm/unix/DEPRECATED/F77config.h \\" >> configure.in_tmp1 ++echo "./salome_adm/unix/DEPRECATED/sstream \\" >> configure.in_tmp1 ++echo "./salome_adm/unix/DEPRECATED/depend \\" >> configure.in_tmp1 + echo "./adm_local/unix/make_omniorb:${ABS_CONF_DIR}/adm_local/unix/make_omniorb.in \\" >> configure.in_tmp1 +-echo "./salome_adm/unix/envScript \\" >> configure.in_tmp1 ++echo "./salome_adm/unix/DEPRECATED/envScript \\" >> configure.in_tmp1 + echo "./adm_local/unix/make_commence:${ABS_CONF_DIR}/adm_local/unix/make_commence.in \\" >> configure.in_tmp1 +-echo "./salome_adm/unix/make_conclude \\" >> configure.in_tmp1 +-echo "./salome_adm/unix/make_module \\" >> configure.in_tmp1 ++echo "./salome_adm/unix/DEPRECATED/make_conclude \\" >> configure.in_tmp1 ++echo "./salome_adm/unix/DEPRECATED/make_module \\" >> configure.in_tmp1 + + \rm -f configure.in_tmp2 + touch configure.in_tmp2 +--- salome-3.2.6.orig/CALCULATOR_SRC_3.2.6/configure.in.base 2007-04-24 12:41:05.000000000 -0400 ++++ salome-3.2.6/CALCULATOR_SRC_3.2.6/configure.in.base 2008-01-14 13:40:07.000000000 -0500 +@@ -239,11 +239,11 @@ + dnl generals files which could be included in every makefile + + AC_SUBST_FILE(COMMENCE) COMMENCE=adm_local/unix/make_commence +-AC_SUBST_FILE(CONCLUDE) CONCLUDE=salome_adm/unix/make_conclude +-AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/make_module ++AC_SUBST_FILE(CONCLUDE) CONCLUDE=salome_adm/unix/DEPRECATED/make_conclude ++AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/DEPRECATED/make_module + + dnl les dependences +-AC_SUBST_FILE(DEPEND) DEPEND=salome_adm/unix/depend ++AC_SUBST_FILE(DEPEND) DEPEND=salome_adm/unix/DEPRECATED/depend + + dnl We don t need to say when we re entering directories if we re using + dnl GNU make becuase make does it for us. +@@ -282,7 +282,7 @@ + done + cd $ROOT_BUILDDIR + +-AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=salome_adm/unix/envScript ++AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=salome_adm/unix/DEPRECATED/envScript + + echo + echo --------------------------------------------- +--- salome-3.2.6.orig/CALCULATOR_SRC_3.2.6/adm_local/unix/make_commence.in 2007-04-24 12:41:05.000000000 -0400 ++++ salome-3.2.6/CALCULATOR_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-14 13:40:27.000000000 -0500 +@@ -240,11 +240,11 @@ + #LOCAL_MAKE = make_commence make_omniorb + LOCAL_MAKE = make_commence make_conclude make_omniorb + +-KERNEL_MAKE = make_module depend SALOMEconfig.h F77config.h sstream envScript ++KERNEL_MAKE = make_module depend F77config.h sstream envScript + + $(top_builddir)/config.status: $(top_srcdir)/configure \ + $(LOCAL_MAKE:%=$(top_srcdir)/adm_local/unix/%.in) \ +- $(KERNEL_MAKE:%=$(KERNEL_ROOT_DIR)/salome_adm/unix/%.in) ++ $(KERNEL_MAKE:%=$(KERNEL_ROOT_DIR)/salome_adm/unix/DEPRECATED/%.in) + cd $(top_builddir) ; ./config.status --recheck + + # VPATH contain $(srcdir), so make configure is good in top_srcdir and we must add target configure otherwise :-) +--- salome-3.2.6.orig/PYCALCULATOR_SRC_3.2.6/build_configure 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/PYCALCULATOR_SRC_3.2.6/build_configure 2008-01-14 14:37:42.000000000 -0500 +@@ -122,14 +122,13 @@ + # Attention, l'ordre d'entrée des fichiers doit être choisi avec + # précision + # +-echo " ./salome_adm/unix/SALOMEconfig.h \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/F77config.h \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/sstream \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/F77config.h \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/sstream \\" >> configure.in_tmp1 + +-echo " ./salome_adm/unix/depend \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/depend \\" >> configure.in_tmp1 + echo " ./adm_local/unix/make_omniorb:${ABS_CONF_DIR}/adm_local/unix/make_omniorb.in \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/envScript \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/make_module \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/envScript \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/make_module \\" >> configure.in_tmp1 + + # _CS_gbo Pour assurer ls construction correct de la chaîne de + # dépendance, il apparaît nécessaire de surcharger le make_conclude +@@ -138,7 +137,7 @@ + # c'est à dire le make_conclude (resp. make_commence) du répertoire + # adm_local + echo " ./adm_local/unix/make_commence:${ABS_CONF_DIR}/adm_local/unix/make_commence.in \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/make_conclude \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/make_conclude \\" >> configure.in_tmp1 + + \rm -f configure.in_tmp2 configure.in_tmp3 + touch configure.in_tmp2 +--- salome-3.2.6.orig/PYCALCULATOR_SRC_3.2.6/configure.in.base 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/PYCALCULATOR_SRC_3.2.6/configure.in.base 2008-01-14 14:37:52.000000000 -0500 +@@ -231,11 +231,11 @@ + dnl generals files which could be included in every makefile + + AC_SUBST_FILE(COMMENCE) COMMENCE=adm_local/unix/make_commence +-AC_SUBST_FILE(CONCLUDE) CONCLUDE=salome_adm/unix/make_conclude +-AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/make_module ++AC_SUBST_FILE(CONCLUDE) CONCLUDE=salome_adm/unix/DEPRECATED/make_conclude ++AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/DEPRECATED/make_module + + dnl les dependences +-AC_SUBST_FILE(DEPEND) DEPEND=salome_adm/unix/depend ++AC_SUBST_FILE(DEPEND) DEPEND=salome_adm/unix/DEPRECATED/depend + + dnl We don t need to say when we re entering directories if we re using + dnl GNU make becuase make does it for us. +@@ -292,7 +292,7 @@ + done + cd $ROOT_BUILDDIR + +-AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=salome_adm/unix/envScript ++AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=salome_adm/unix/DEPRECATED/envScript + + dnl copy xml files to the build tree (lib directory) + dnl pourquoi ???? +--- salome-3.2.6.orig/PYCALCULATOR_SRC_3.2.6/adm_local/unix/make_commence.in 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/PYCALCULATOR_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-14 14:38:22.000000000 -0500 +@@ -161,11 +161,11 @@ + + LOCAL_MAKE = make_commence make_omniorb + +-KERNEL_MAKE = make_module make_conclude depend SALOMEconfig.h F77config.h sstream envScript ++KERNEL_MAKE = make_module make_conclude depend F77config.h sstream envScript + + $(top_builddir)/config.status: $(top_srcdir)/configure \ + $(LOCAL_MAKE:%=$(top_srcdir)/adm_local/unix/%.in) \ +- $(KERNEL_MAKE:%=$(KERNEL_ROOT_DIR)/salome_adm/unix/%.in) ++ $(KERNEL_MAKE:%=$(KERNEL_ROOT_DIR)/salome_adm/unix/DEPRECATED/%.in) + cd $(top_builddir) ; ./config.status --recheck + + # VPATH contain $(srcdir), so make configure is good in top_srcdir and we must add target configure otherwise :-) +--- salome-3.2.6.orig/NETGENPLUGIN_SRC_3.2.6/build_configure 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/NETGENPLUGIN_SRC_3.2.6/build_configure 2008-01-14 14:42:21.000000000 -0500 +@@ -153,15 +153,14 @@ + # put them "manually" + # + +-echo " ./salome_adm/unix/SALOMEconfig.h \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/F77config.h \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/sstream \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/depend \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/F77config.h \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/sstream \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/depend \\" >> configure.in_tmp1 + echo " ./adm_local/unix/make_omniorb:${ABS_CONF_DIR}/adm_local/unix/make_omniorb.in \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/envScript \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/envScript \\" >> configure.in_tmp1 + echo " ./adm_local/unix/make_commence:${ABS_CONF_DIR}/adm_local/unix/make_commence.in \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/make_conclude \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/make_module \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/make_conclude \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/make_module \\" >> configure.in_tmp1 + + \rm -f configure.in_tmp2 configure.in_tmp3 + touch configure.in_tmp2 +--- salome-3.2.6.orig/NETGENPLUGIN_SRC_3.2.6/configure.in.base 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/NETGENPLUGIN_SRC_3.2.6/configure.in.base 2008-01-14 14:42:30.000000000 -0500 +@@ -362,11 +362,11 @@ + dnl generals files which could be included in every makefile + + AC_SUBST_FILE(COMMENCE) COMMENCE=adm_local/unix/make_commence +-AC_SUBST_FILE(CONCLUDE) CONCLUDE=salome_adm/unix/make_conclude +-AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/make_module ++AC_SUBST_FILE(CONCLUDE) CONCLUDE=salome_adm/unix/DEPRECATED/make_conclude ++AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/DEPRECATED/make_module + + dnl les dependences +-AC_SUBST_FILE(DEPEND) DEPEND=salome_adm/unix/depend ++AC_SUBST_FILE(DEPEND) DEPEND=salome_adm/unix/DEPRECATED/depend + + dnl We don t need to say when we re entering directories if we re using + dnl GNU make becuase make does it for us. +@@ -423,7 +423,7 @@ + #done + #cd $ROOT_BUILDDIR + +-AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=salome_adm/unix/envScript ++AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=salome_adm/unix/DEPRECATED/envScript + + dnl copy xml files to the build tree (lib directory) + dnl pourquoi ???? +--- salome-3.2.6.orig/NETGENPLUGIN_SRC_3.2.6/adm_local/unix/make_commence.in 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/NETGENPLUGIN_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-14 14:43:33.000000000 -0500 +@@ -248,11 +248,11 @@ + + LOCAL_MAKE = make_commence make_omniorb + +-KERNEL_MAKE = make_module make_conclude depend SALOMEconfig.h F77config.h sstream envScript ++KERNEL_MAKE = make_module make_conclude depend F77config.h sstream envScript + + $(top_builddir)/config.status: $(top_srcdir)/configure \ + $(LOCAL_MAKE:%=$(top_srcdir)/adm_local/unix/%.in) \ +- $(KERNEL_MAKE:%=$(KERNEL_ROOT_DIR)/salome_adm/unix/%.in) ++ $(KERNEL_MAKE:%=$(KERNEL_ROOT_DIR)/salome_adm/unix/DEPRECATED/%.in) + cd $(top_builddir) ; ./config.status --recheck + + # VPATH contain $(srcdir), so make configure is good in top_srcdir and we must add target configure otherwise :-) +--- salome-3.2.6.orig/SIERPINSKY_SRC_3.2.6/build_configure 2006-05-06 05:02:02.000000000 -0400 ++++ salome-3.2.6/SIERPINSKY_SRC_3.2.6/build_configure 2008-01-14 14:46:54.000000000 -0500 +@@ -155,14 +155,13 @@ + # Attention, l'ordre d'entrée des fichiers doit être choisi avec + # précision + # +-echo " ./salome_adm/unix/SALOMEconfig.h \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/F77config.h \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/sstream \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/F77config.h \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/sstream \\" >> configure.in_tmp1 + +-echo " ./salome_adm/unix/depend \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/depend \\" >> configure.in_tmp1 + echo " ./adm_local/unix/make_omniorb:${ABS_CONF_DIR}/adm_local/unix/make_omniorb.in \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/envScript \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/make_module \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/envScript \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/make_module \\" >> configure.in_tmp1 + + # _CS_gbo Pour assurer ls construction correct de la chaîne de + # dépendance, il apparaît nécessaire de surcharger le make_conclude +@@ -171,7 +170,7 @@ + # c'est à dire le make_conclude (resp. make_commence) du répertoire + # adm_local + echo " ./adm_local/unix/make_commence:${ABS_CONF_DIR}/adm_local/unix/make_commence.in \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/make_conclude \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/make_conclude \\" >> configure.in_tmp1 + + \rm -f configure.in_tmp2 configure.in_tmp3 + touch configure.in_tmp2 +--- salome-3.2.6.orig/SIERPINSKY_SRC_3.2.6/configure.in.base 2007-03-02 08:59:12.000000000 -0500 ++++ salome-3.2.6/SIERPINSKY_SRC_3.2.6/configure.in.base 2008-01-14 14:47:21.000000000 -0500 +@@ -362,11 +362,11 @@ + dnl generals files which could be included in every makefile + + AC_SUBST_FILE(COMMENCE) COMMENCE=adm_local/unix/make_commence +-AC_SUBST_FILE(CONCLUDE) CONCLUDE=salome_adm/unix/make_conclude +-AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/make_module ++AC_SUBST_FILE(CONCLUDE) CONCLUDE=salome_adm/unix/DEPRECATED/make_conclude ++AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/DEPRECATED/make_module + + dnl les dependences +-AC_SUBST_FILE(DEPEND) DEPEND=salome_adm/unix/depend ++AC_SUBST_FILE(DEPEND) DEPEND=salome_adm/unix/DEPRECATED/depend + + dnl We don t need to say when we re entering directories if we re using + dnl GNU make becuase make does it for us. +@@ -423,7 +423,7 @@ + done + cd $ROOT_BUILDDIR + +-AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=salome_adm/unix/envScript ++AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=salome_adm/unix/DEPRECATED/envScript + + dnl copy xml files to the build tree (lib directory) + dnl pourquoi ???? +--- salome-3.2.6.orig/SIERPINSKY_SRC_3.2.6/adm_local/unix/make_commence.in 2006-06-27 03:48:19.000000000 -0400 ++++ salome-3.2.6/SIERPINSKY_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-14 14:48:19.000000000 -0500 +@@ -273,11 +273,11 @@ + + LOCAL_MAKE = make_commence make_omniorb + +-KERNEL_MAKE = make_module make_conclude depend SALOMEconfig.h F77config.h sstream envScript ++KERNEL_MAKE = make_module make_conclude depend F77config.h sstream envScript + + $(top_builddir)/config.status: $(top_srcdir)/configure \ + $(LOCAL_MAKE:%=$(top_srcdir)/adm_local/unix/%.in) \ +- $(KERNEL_MAKE:%=$(KERNEL_ROOT_DIR)/salome_adm/unix/%.in) ++ $(KERNEL_MAKE:%=$(KERNEL_ROOT_DIR)/salome_adm/unix/DEPRECATED/%.in) + cd $(top_builddir) ; ./config.status --recheck + + # VPATH contain $(srcdir), so make configure is good in top_srcdir and we must add target configure otherwise :-) +--- salome-3.2.6.orig/GHS3DPLUGIN_SRC_3.2.6/build_configure 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GHS3DPLUGIN_SRC_3.2.6/build_configure 2008-01-14 14:50:45.000000000 -0500 +@@ -146,15 +146,14 @@ + # put them "manually" + # + +-echo " ./salome_adm/unix/SALOMEconfig.h \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/F77config.h \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/sstream \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/depend \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/F77config.h \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/sstream \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/depend \\" >> configure.in_tmp1 + echo " ./adm_local/unix/make_omniorb:${ABS_CONF_DIR}/adm_local/unix/make_omniorb.in \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/envScript \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/envScript \\" >> configure.in_tmp1 + echo " ./adm_local/unix/make_commence:${ABS_CONF_DIR}/adm_local/unix/make_commence.in \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/make_conclude \\" >> configure.in_tmp1 +-echo " ./salome_adm/unix/make_module \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/make_conclude \\" >> configure.in_tmp1 ++echo " ./salome_adm/unix/DEPRECATED/make_module \\" >> configure.in_tmp1 + + \rm -f configure.in_tmp2 configure.in_tmp3 + touch configure.in_tmp2 +--- salome-3.2.6.orig/GHS3DPLUGIN_SRC_3.2.6/configure.in.base 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/GHS3DPLUGIN_SRC_3.2.6/configure.in.base 2008-01-14 14:50:54.000000000 -0500 +@@ -345,11 +345,11 @@ + dnl generals files which could be included in every makefile + + AC_SUBST_FILE(COMMENCE) COMMENCE=adm_local/unix/make_commence +-AC_SUBST_FILE(CONCLUDE) CONCLUDE=salome_adm/unix/make_conclude +-AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/make_module ++AC_SUBST_FILE(CONCLUDE) CONCLUDE=salome_adm/unix/DEPRECATED/make_conclude ++AC_SUBST_FILE(MODULE) MODULE=salome_adm/unix/DEPRECATED/make_module + + dnl les dependences +-AC_SUBST_FILE(DEPEND) DEPEND=salome_adm/unix/depend ++AC_SUBST_FILE(DEPEND) DEPEND=salome_adm/unix/DEPRECATED/depend + + dnl We don t need to say when we re entering directories if we re using + dnl GNU make becuase make does it for us. +@@ -407,7 +407,7 @@ + #done + #cd $ROOT_BUILDDIR + +-AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=salome_adm/unix/envScript ++AC_SUBST_FILE(ENVSCRIPT) ENVSCRIPT=salome_adm/unix/DEPRECATED/envScript + + dnl copy xml files to the build tree (lib directory) + dnl pourquoi ???? +--- salome-3.2.6.orig/GHS3DPLUGIN_SRC_3.2.6/adm_local/unix/make_commence.in 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/GHS3DPLUGIN_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-14 14:51:26.000000000 -0500 +@@ -251,11 +251,11 @@ + + LOCAL_MAKE = make_commence make_omniorb + +-KERNEL_MAKE = make_module make_conclude depend SALOMEconfig.h F77config.h sstream envScript ++KERNEL_MAKE = make_module make_conclude depend F77config.h sstream envScript + + $(top_builddir)/config.status: $(top_srcdir)/configure \ + $(LOCAL_MAKE:%=$(top_srcdir)/adm_local/unix/%.in) \ +- $(KERNEL_MAKE:%=$(KERNEL_ROOT_DIR)/salome_adm/unix/%.in) ++ $(KERNEL_MAKE:%=$(KERNEL_ROOT_DIR)/salome_adm/unix/DEPRECATED/%.in) + cd $(top_builddir) ; ./config.status --recheck + + # VPATH contain $(srcdir), so make configure is good in top_srcdir and we must add target configure otherwise :-) --- salome-3.2.6.orig/debian/patch-missing-aclocal +++ salome-3.2.6/debian/patch-missing-aclocal @@ -0,0 +1,221 @@ +--- salome-3.2.6/GEOM_SRC_3.2.6/adm_local/unix/make_commence.in~ 2008-01-14 15:10:26.000000000 -0500 ++++ salome-3.2.6/GEOM_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-14 15:45:06.000000000 -0500 +@@ -258,16 +258,16 @@ + + + ACLOCAL_KERNEL = \ +-ac_cxx_bool.m4 check_corba.m4 \ ++ check_corba.m4 \ + ac_cxx_depend_flag.m4 check_hdf5.m4 enable_pthreads.m4 \ +-ac_cxx_mutable.m4 check_mico.m4 libtool.m4 \ ++ \ + ac_cxx_namespaces.m4 check_omniorb.m4 pyembed.m4 \ +-ac_cxx_partial_specialization.m4 python.m4 \ +-ac_cxx_typename.m4 check_pthreads.m4 check_cas.m4 \ +-ac_cc_warnings.m4 check_swig.m4 ++ python.m4 \ ++ check_cas.m4 \ ++ check_swig.m4 check_opengl.m4 + + ACLOCAL_GUI = \ +-check_vtk.m4 check_opengl.m4 check_qt.m4 \ ++check_vtk.m4 check_qt.m4 \ + check_GUI.m4 check_corba_in_GUI.m4 + + $(top_srcdir)/aclocal.m4: $(ACLOCAL_KERNEL:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) \ +--- salome-3.2.6/RANDOMIZER_SRC_3.2.6/adm_local/unix/make_commence.in~ 2006-06-27 03:47:49.000000000 -0400 ++++ salome-3.2.6/RANDOMIZER_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-14 16:14:55.000000000 -0500 +@@ -165,16 +165,16 @@ + + + ACLOCAL_KERNEL = \ +-ac_cxx_bool.m4 check_corba.m4 \ ++ check_corba.m4 \ + ac_cxx_depend_flag.m4 check_hdf5.m4 enable_pthreads.m4 \ +-ac_cxx_mutable.m4 check_mico.m4 libtool.m4 \ ++ \ + ac_cxx_namespaces.m4 check_omniorb.m4 pyembed.m4 \ +-ac_cxx_partial_specialization.m4 python.m4 \ +-ac_cxx_typename.m4 check_pthreads.m4 check_cas.m4 \ +-ac_cc_warnings.m4 check_swig.m4 ++ python.m4 \ ++ check_cas.m4 \ ++ check_swig.m4 check_opengl.m4 + + ACLOCAL_GUI = \ +-check_vtk.m4 check_opengl.m4 check_qt.m4 \ ++check_vtk.m4 check_qt.m4 \ + check_GUI.m4 check_corba_in_GUI.m4 + + $(top_srcdir)/aclocal.m4: $(ACLOCAL_KERNEL:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) \ +--- salome-3.2.6/SUPERV_SRC_3.2.6/adm_local/unix/make_commence.in~ 2008-01-14 19:10:07.000000000 -0500 ++++ salome-3.2.6/SUPERV_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-14 19:12:28.000000000 -0500 +@@ -267,16 +267,15 @@ + + + ACLOCAL_SRC = \ +-ac_cxx_bool.m4 check_corba.m4 \ ++ check_corba.m4 \ + ac_cxx_depend_flag.m4 check_hdf5.m4 enable_pthreads.m4 \ +-ac_cxx_mutable.m4 check_mico.m4 libtool.m4 \ + ac_cxx_namespaces.m4 check_omniorb.m4 pyembed.m4 \ +-ac_cxx_partial_specialization.m4 python.m4 \ +-ac_cxx_typename.m4 check_pthreads.m4 check_cas.m4 \ +-ac_cc_warnings.m4 check_swig.m4 ++ python.m4 \ ++ check_cas.m4 \ ++ check_swig.m4 check_opengl.m4 + + ACLOCAL_GUI = \ +-check_vtk.m4 check_opengl.m4 check_qt.m4 \ ++check_vtk.m4 check_qt.m4 \ + check_GUI.m4 check_corba_in_GUI.m4 + + $(top_srcdir)/aclocal.m4: $(ACLOCAL_SRC:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) \ +--- salome-3.2.6/HELLO_SRC_3.2.6/adm_local/unix/make_commence.in~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/HELLO_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-14 16:20:16.000000000 -0500 +@@ -260,16 +260,15 @@ + + + ACLOCAL_KERNEL = \ +-ac_cxx_bool.m4 check_corba.m4 \ ++ check_corba.m4 \ + ac_cxx_depend_flag.m4 check_hdf5.m4 enable_pthreads.m4 \ +-ac_cxx_mutable.m4 check_mico.m4 libtool.m4 \ + ac_cxx_namespaces.m4 check_omniorb.m4 pyembed.m4 \ +-ac_cxx_partial_specialization.m4 python.m4 \ +-ac_cxx_typename.m4 check_pthreads.m4 check_cas.m4 \ +-ac_cc_warnings.m4 check_swig.m4 ++ python.m4 \ ++ check_cas.m4 \ ++ check_swig.m4 check_opengl.m4 + + ACLOCAL_GUI = \ +-check_vtk.m4 check_opengl.m4 check_qt.m4 \ ++check_vtk.m4 check_qt.m4 \ + check_GUI.m4 check_corba_in_GUI.m4 + + $(top_srcdir)/aclocal.m4: $(ACLOCAL_KERNEL:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) \ +--- salome-3.2.6/PYHELLO_SRC_3.2.6/adm_local/unix/make_commence.in~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/PYHELLO_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-14 16:22:25.000000000 -0500 +@@ -247,16 +247,15 @@ + + + ACLOCAL_KERNEL = \ +-ac_cxx_bool.m4 check_corba.m4 \ ++ check_corba.m4 \ + ac_cxx_depend_flag.m4 check_hdf5.m4 enable_pthreads.m4 \ +-ac_cxx_mutable.m4 check_mico.m4 libtool.m4 \ + ac_cxx_namespaces.m4 check_omniorb.m4 pyembed.m4 \ +-ac_cxx_partial_specialization.m4 python.m4 \ +-ac_cxx_typename.m4 check_pthreads.m4 check_cas.m4 \ +-ac_cc_warnings.m4 check_swig.m4 ++ python.m4 \ ++ check_cas.m4 \ ++ check_swig.m4 check_opengl.m4 + + ACLOCAL_GUI = \ +-check_vtk.m4 check_opengl.m4 check_qt.m4 \ ++check_vtk.m4 check_qt.m4 \ + check_GUI.m4 check_corba_in_GUI.m4 + + $(top_srcdir)/aclocal.m4: $(ACLOCAL_KERNEL:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) \ +--- salome-3.2.6/VISU_SRC_3.2.6/adm_local/unix/make_commence.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/VISU_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-14 16:24:55.000000000 -0500 +@@ -268,16 +268,15 @@ + + + ACLOCAL_KERNEL = \ +-ac_cxx_bool.m4 check_corba.m4 \ ++ check_corba.m4 \ + ac_cxx_depend_flag.m4 check_hdf5.m4 enable_pthreads.m4 \ +-ac_cxx_mutable.m4 check_mico.m4 libtool.m4 \ + ac_cxx_namespaces.m4 check_omniorb.m4 pyembed.m4 \ +-ac_cxx_partial_specialization.m4 python.m4 \ +-ac_cxx_typename.m4 check_pthreads.m4 check_cas.m4 \ +-ac_cc_warnings.m4 check_swig.m4 ++ python.m4 \ ++ check_cas.m4 \ ++ check_swig.m4 check_opengl.m4 + + ACLOCAL_GUI = \ +-check_vtk.m4 check_opengl.m4 check_qt.m4 \ ++check_vtk.m4 check_qt.m4 \ + check_GUI.m4 check_corba_in_GUI.m4 + + ACLOCAL_MED = check_Med.m4 +--- salome-3.2.6/SMESH_SRC_3.2.6/adm_local/unix/make_commence.in~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-14 16:27:18.000000000 -0500 +@@ -278,28 +278,21 @@ + + + ACLOCAL_KERNEL = \ +- ac_cxx_bool.m4 \ + check_corba.m4 \ + ac_cxx_depend_flag.m4 \ + check_hdf5.m4 \ + enable_pthreads.m4 \ +- ac_cxx_mutable.m4 \ +- check_mico.m4 \ + ac_cxx_namespaces.m4 \ + check_omniorb.m4 \ + pyembed.m4 \ +- ac_cxx_partial_specialization.m4 \ + python.m4 \ +- ac_cxx_typename.m4 \ +- check_pthreads.m4 \ + check_cas.m4 \ +- ac_cc_warnings.m4 \ + check_boost.m4 \ ++ check_opengl.m4 \ + check_swig.m4 + + ACLOCAL_GUI = \ + check_vtk.m4 \ +- check_opengl.m4 \ + check_qt.m4 \ + check_GUI.m4 \ + check_corba_in_GUI.m4 +--- salome-3.2.6/PYCALCULATOR_SRC_3.2.6/adm_local/unix/make_commence.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/PYCALCULATOR_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-14 16:33:08.000000000 -0500 +@@ -181,13 +181,10 @@ + + + ACLOCAL_KERNEL = \ +-ac_cxx_bool.m4 check_corba.m4 \ ++ check_corba.m4 \ + ac_cxx_depend_flag.m4 enable_pthreads.m4 \ +-ac_cxx_mutable.m4 check_mico.m4 \ +-libtool.m4 ac_cxx_namespaces.m4 \ ++ ac_cxx_namespaces.m4 \ + check_omniorb.m4 pyembed.m4 \ +-ac_cxx_partial_specialization.m4 ac_cxx_typename.m4 \ +-check_pthreads.m4 ac_cc_warnings.m4 \ + python.m4 + + $(top_srcdir)/aclocal.m4: $(ACLOCAL_KERNEL:%=@KERNEL_ROOT_DIR@/salome_adm/unix/config_files/%) +--- salome-3.2.6/SIERPINSKY_SRC_3.2.6/adm_local/unix/make_commence.in~ 2006-06-27 03:48:19.000000000 -0400 ++++ salome-3.2.6/SIERPINSKY_SRC_3.2.6/adm_local/unix/make_commence.in 2008-01-14 16:36:00.000000000 -0500 +@@ -293,16 +293,16 @@ + + + ACLOCAL_KERNEL = \ +-ac_cxx_bool.m4 check_corba.m4 \ ++ check_corba.m4 \ + ac_cxx_depend_flag.m4 check_hdf5.m4 enable_pthreads.m4 \ +-ac_cxx_mutable.m4 check_mico.m4 libtool.m4 \ + ac_cxx_namespaces.m4 check_omniorb.m4 pyembed.m4 \ +-ac_cxx_partial_specialization.m4 python.m4 \ +-ac_cxx_typename.m4 check_pthreads.m4 check_cas.m4 \ +-ac_cc_warnings.m4 check_swig.m4 check_boost.m4 ++ python.m4 \ ++ check_cas.m4 \ ++ check_swig.m4 check_boost.m4 \ ++check_opengl.m4 + + ACLOCAL_GUI = \ +-check_vtk.m4 check_opengl.m4 check_qt.m4 \ ++check_vtk.m4 check_qt.m4 \ + check_GUI.m4 check_corba_in_GUI.m4 + + ACLOCAL_MED = check_Med.m4 check_Med2.m4 --- salome-3.2.6.orig/debian/patch-occ-includes +++ salome-3.2.6/debian/patch-occ-includes @@ -0,0 +1,20 @@ +--- salome-3.2.6.orig/KERNEL_SRC_3.2.6/salome_adm/unix/config_files/check_cas.m4 2007-04-24 11:34:20.000000000 -0400 ++++ salome-3.2.6/KERNEL_SRC_3.2.6/salome_adm/unix/config_files/check_cas.m4 2008-01-11 14:10:37.000000000 -0500 +@@ -108,7 +108,7 @@ + OCC_VERSION_MAJOR=0 + OCC_VERSION_MINOR=0 + OCC_VERSION_MAINTENANCE=0 +- ff=$CASROOT/inc/Standard_Version.hxx ++ ff=$CASROOT/include/opencascade/Standard_Version.hxx + if test -f $ff ; then + grep "define OCC_VERSION_MAJOR" $ff > /dev/null + if test $? = 0 ; then +@@ -151,7 +151,7 @@ + CAS_CPPFLAGS="$CAS_CPPFLAGS -DOCC_CONVERT_SIGNALS" + ;; + esac +- CAS_CPPFLAGS="$CAS_CPPFLAGS -I$CASROOT/inc" ++ CAS_CPPFLAGS="$CAS_CPPFLAGS -I$CASROOT/include/opencascade" + ;; + osf*) + CAS_CPPFLAGS="-DOCC_VERSION_MAJOR=$OCC_VERSION_MAJOR -DOCC_VERSION_MINOR=$OCC_VERSION_MINOR -DOCC_VERSION_MAINTENANCE=$OCC_VERSION_MAINTENANCE -DLIN -DLINTEL -DCSFDB -DNo_exception -DHAVE_CONFIG_H -DHAVE_LIMITS_H -DHAVE_WOK_CONFIG_H -I$CASROOT/inc" --- salome-3.2.6.orig/debian/patch-geom-check-trick +++ salome-3.2.6/debian/patch-geom-check-trick @@ -0,0 +1,11 @@ +--- salome-3.2.6/GEOM_SRC_3.2.6/adm_local/unix/config_files/check_GEOM.m4~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/adm_local/unix/config_files/check_GEOM.m4 2008-01-14 07:14:27.000000000 -0500 +@@ -38,7 +38,7 @@ + # + fi + +-if test -f ${GEOM_DIR}/bin/salome/libGEOM_Swig.py ; then ++if test -f ${GEOM_DIR}/configure.in.base ; then + Geom_ok=yes + AC_MSG_RESULT(Using Geom module distribution in ${GEOM_DIR}) + --- salome-3.2.6.orig/debian/patch-gui-check-trick +++ salome-3.2.6/debian/patch-gui-check-trick @@ -0,0 +1,21 @@ +--- salome-3.2.6/GUI_SRC_3.2.6/adm_local/unix/config_files/check_GUI.m4~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/adm_local/unix/config_files/check_GUI.m4 2008-01-13 15:30:03.000000000 -0500 +@@ -58,6 +58,6 @@ + ])dnl + + AC_DEFUN([CHECK_SALOME_GUI],[ +- CHECK_GUI([SUITApp], ++ CHECK_GUI([runLightSalome.sh], + [SALOME GUI]) + ])dnl +--- salome-3.2.6/GUI_SRC_3.2.6/adm_local/unix/config_files/check_corba_in_GUI.m4~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/adm_local/unix/config_files/check_corba_in_GUI.m4 2008-01-13 15:32:11.000000000 -0500 +@@ -4,7 +4,7 @@ + #------------------------------------------------------------ + + AC_DEFUN([CHECK_CORBA_IN_GUI],[ +- CHECK_GUI([SALOME_Session_Server], ++ CHECK_GUI([runLightSalome.sh], + [CORBA SALOME GUI]) + CORBA_IN_GUI=${SalomeGUI_ok} + AC_SUBST(CORBA_IN_GUI) --- salome-3.2.6.orig/debian/patch-hdf5-safe-include +++ salome-3.2.6/debian/patch-hdf5-safe-include @@ -0,0 +1,99 @@ +--- salome-3.2.6/KERNEL_SRC_3.2.6/src/HDFPersist/HDFtypes.h~ 2007-04-24 11:34:17.000000000 -0400 ++++ salome-3.2.6/KERNEL_SRC_3.2.6/src/HDFPersist/HDFtypes.h 2008-01-13 16:12:20.000000000 -0500 +@@ -25,7 +25,9 @@ + #ifndef HDFTYPES_H + #define HDFTYPES_H + ++#define OMPI_SKIP_MPICXX + #include ++#undef OMPI_SKIP_MPICXX + + /* max length of a HDF object */ + #define HDF_NAME_MAX_LEN 100 +--- salome-3.2.6/MED_SRC_3.2.6/src/MEDWrapper/Base/MED_Common.hxx~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/MED_SRC_3.2.6/src/MEDWrapper/Base/MED_Common.hxx 2008-01-14 19:37:17.000000000 -0500 +@@ -33,10 +33,7 @@ + #include + #include + +-extern "C" +-{ + #include +-} + + #include + +--- salome-3.2.6/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/med.hxx~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/MED_SRC_3.2.6/src/MEDWrapper/V2_1/Core/med.hxx 2008-01-14 21:06:42.000000000 -0500 +@@ -19,9 +19,7 @@ + #ifndef MED_H + #define MED_H + +-extern "C"{ + #include +-} + + namespace med_2_1{ + +--- salome-3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_define.hxx~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_define.hxx 2008-01-14 22:01:39.000000000 -0500 +@@ -26,9 +26,7 @@ + #include + + // UTILE AUX DEUX NAMESPACES +-extern "C"{ + #include +-} + + + namespace MED_EN { +--- salome-3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_medimport_src.hxx~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_medimport_src.hxx 2008-01-14 22:27:31.000000000 -0500 +@@ -41,6 +41,7 @@ + #include "MEDMEM_STRING.hxx" + #include "MEDMEM_Exception.hxx" + // #include "MEDMEM_define.hxx" ++#include + + + /* +--- salome-3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_MEDMEMgaussEcr.hxx~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_MEDMEMgaussEcr.hxx 2008-01-14 22:29:19.000000000 -0500 +@@ -22,6 +22,7 @@ + * En attendant une correction de la gestion du mode d'accès au fichier dans MEDfichier + * on intègre la correction ici. + */ ++#include + namespace med_2_2 { + extern "C" { + +--- salome-3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_MEDMEMprofilEcr.hxx~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_MEDMEMprofilEcr.hxx 2008-01-14 22:31:15.000000000 -0500 +@@ -22,6 +22,7 @@ + * En attendant une correction de la gestion du mode d'accès au fichier dans MEDfichier + * on intègre la correction ici. + */ ++#include + namespace med_2_2 { + extern "C" { + +--- salome-3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_MEDMEMchampLire.hxx~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/MED_SRC_3.2.6/src/MEDMEM/MEDMEM_MEDMEMchampLire.hxx 2008-01-14 22:37:15.000000000 -0500 +@@ -22,6 +22,7 @@ + * En attendant une correction de la gestion du mode d'accès au fichier dans MEDfichier + * on intègre la correction ici. + */ ++#include + namespace med_2_2 { + extern "C" { + +--- salome-3.2.6/MED_SRC_3.2.6/src/MEDWrapper/Factory/mprint_version.cxx~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/MED_SRC_3.2.6/src/MEDWrapper/Factory/mprint_version.cxx 2008-01-16 17:26:28.000000000 -0500 +@@ -18,6 +18,7 @@ + // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com + // + ++#include + extern "C"{ + #include + } --- salome-3.2.6.orig/debian/patch-mpi-libs +++ salome-3.2.6/debian/patch-mpi-libs @@ -0,0 +1,11 @@ +--- salome-3.2.6.orig/KERNEL_SRC_3.2.6/salome_adm/unix/config_files/check_mpi.m4 2007-04-24 11:34:20.000000000 -0400 ++++ salome-3.2.6/KERNEL_SRC_3.2.6/salome_adm/unix/config_files/check_mpi.m4 2008-01-11 15:25:06.000000000 -0500 +@@ -69,7 +69,7 @@ + + if test "$WITHMPI" = "yes";then + mpi_ok=yes +- MPI_LIBS="$MPI_LIBS -lmpi" ++ MPI_LIBS="$MPI_LIBS -lmpi -lmpi++" + else + mpi_ok=no + fi --- salome-3.2.6.orig/debian/patch-destdir +++ salome-3.2.6/debian/patch-destdir @@ -0,0 +1,2146 @@ +--- salome-3.2.6.orig/KERNEL_SRC_3.2.6/idl/Makefile.am 2008-01-11 09:04:39.000000000 -0500 ++++ salome-3.2.6/KERNEL_SRC_3.2.6/idl/Makefile.am 2008-01-11 09:21:05.000000000 -0500 +@@ -119,9 +119,9 @@ + + + install-exec-local: $(IDL_FILES:%=$(top_srcdir)/idl/%) +- $(INSTALL) -d $(pkgpythondir) ++ $(INSTALL) -d $(DESTDIR)$(pkgpythondir) + ls $^ | while read file; do \ +- $(OMNIORB_IDL) $(IDLPYFLAGS) -C$(pkgpythondir) $$file ; \ ++ $(OMNIORB_IDL) $(IDLPYFLAGS) -C$(DESTDIR)$(pkgpythondir) $$file ; \ + done + + # uninstall-local removes too much, but it works in distcheck +--- salome-3.2.6.orig/KERNEL_SRC_3.2.6/doc/salome/Makefile.am 2007-04-24 11:35:24.000000000 -0400 ++++ salome-3.2.6/KERNEL_SRC_3.2.6/doc/salome/Makefile.am 2008-01-11 10:47:04.000000000 -0500 +@@ -30,7 +30,7 @@ + SUBDIRSTUI= tui + + index_html: +- $(INSTALL) -d $(docdir); ++ $(INSTALL) -d $(DESTDIR)$(docdir); + + usr_docs: index_html + list='$(SUBDIRSGUI)'; for subdir in $$list; do \ +@@ -48,4 +48,4 @@ + info_TEXINFOS = Batch.texi + + install-data-local: html usr_docs +- cp -rp $(top_builddir)/doc/salome/Batch.html $(docdir) ++ cp -rp $(top_builddir)/doc/salome/Batch.html $(DESTDIR)$(docdir) +--- salome-3.2.6.orig/KERNEL_SRC_3.2.6/doc/salome/tui/Makefile.am 2007-04-24 11:35:24.000000000 -0400 ++++ salome-3.2.6/KERNEL_SRC_3.2.6/doc/salome/tui/Makefile.am 2008-01-11 11:09:11.000000000 -0500 +@@ -48,13 +48,13 @@ + fi; \ + $(DOXYGEN) ./doxyuser1; \ + cd ..; +- $(INSTALL) -d $(docdir)/tui/KERNEL; +- cp -fr KERNEL $(docdir)/tui +- cp -fr $(srcdir)/KERNEL/sources/static/*.* $(docdir)/tui/KERNEL; +- cp -fr $(srcdir)/KERNEL/sources/ $(docdir)/tui/KERNEL; +- cp -fr $(srcdir)/KERNEL/HTML/ $(docdir)/tui/KERNEL; +- cp -f $(srcdir)/pythfilter.py $(docdir)/tui/KERNEL; +- cp -fr $(srcdir)/KERNEL/exemple/ $(docdir)/tui/KERNEL; ++ $(INSTALL) -d $(DESTDIR)$(docdir)/tui/KERNEL; ++ cp -fr KERNEL $(DESTDIR)$(docdir)/tui ++ cp -fr $(srcdir)/KERNEL/sources/static/*.* $(DESTDIR)$(docdir)/tui/KERNEL; ++ cp -fr $(srcdir)/KERNEL/sources/ $(DESTDIR)$(docdir)/tui/KERNEL; ++ cp -fr $(srcdir)/KERNEL/HTML/ $(DESTDIR)$(docdir)/tui/KERNEL; ++ cp -f $(srcdir)/pythfilter.py $(DESTDIR)$(docdir)/tui/KERNEL; ++ cp -fr $(srcdir)/KERNEL/exemple/ $(DESTDIR)$(docdir)/tui/KERNEL; + + dev_docs: + cp -fr $(srcdir)/KERNEL/* ./INPUT; \ +@@ -74,7 +74,7 @@ + fi; \ + $(DOXYGEN) ./doxydev1; \ + cd ..; +- $(INSTALL) -d $(docdir)/tui/KERNEL; ++ $(INSTALL) -d $(DESTDIR)$(docdir)/tui/KERNEL; + # cp -fr KERNEL $(docdir)/tui + # cp -fr $(srcdir)/KERNEL/sources/static/*.* $(docdir)/tui/KERNEL; + # cp -fr $(srcdir)/KERNEL/sources/ $(docdir)/tui/KERNEL; +--- salome-3.2.6.orig/KERNEL_SRC_3.2.6/bin/Makefile.am 2007-04-24 11:35:23.000000000 -0400 ++++ salome-3.2.6/KERNEL_SRC_3.2.6/bin/Makefile.am 2008-01-11 11:25:40.000000000 -0500 +@@ -73,10 +73,10 @@ + + # This is an ugly target to avoid exploring the appliskel subdirectory. + install-exec-local: +- $(INSTALL) -d $(salomescriptdir) +- $(RM) -rf $(salomescriptdir)/appliskel 1> /dev/null 2>&1 +- cp -r $(srcdir)/appliskel $(salomescriptdir) +- find $(salomescriptdir) -name CVS -prune -exec rm -rf {} \; ++ $(INSTALL) -d $(DESTDIR)$(salomescriptdir) ++ $(RM) -rf $(DESTDIR)$(salomescriptdir)/appliskel 1> /dev/null 2>&1 ++ cp -r $(srcdir)/appliskel $(DESTDIR)$(salomescriptdir) ++ find $(DESTDIR)$(salomescriptdir) -name CVS -prune -exec rm -rf {} \; + + uninstall-local: + find $(salomescriptdir)/appliskel -exec chmod +w {} \; +--- salome-3.2.6/KERNEL_SRC_3.2.6/salome_adm/unix/DEPRECATED/make_module.in~ 2007-04-24 11:34:20.000000000 -0400 ++++ salome-3.2.6/KERNEL_SRC_3.2.6/salome_adm/unix/DEPRECATED/make_module.in 2008-01-14 19:28:08.000000000 -0500 +@@ -109,10 +109,10 @@ + + install-resources: resources-cp + # one resources directory for all salome modules +- $(INSTALL) -d $(datadir)/resources/$(MODULE_NAME) ++ $(INSTALL) -d $(DESTDIR)$(datadir)/resources/$(MODULE_NAME) + @for f in X $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%); do \ + if test $$f != X; then \ +- ($(INSTALL_DATA) $$f $(datadir)/resources/$(MODULE_NAME)/. || exit 1); \ ++ ($(INSTALL_DATA) $$f $(DESTDIR)$(datadir)/resources/$(MODULE_NAME)/. || exit 1); \ + fi; \ + done + +@@ -120,7 +120,7 @@ + uninstall-resources: + @for f in X $(RESOURCES_FILES); do \ + if test $$f != X; then \ +- $(LT_UNINSTALL) $(datadir)/resources/$(MODULE_NAME)/$$f ; \ ++ $(LT_UNINSTALL) $(DESTDIR)$(datadir)/resources/$(MODULE_NAME)/$$f ; \ + fi; \ + done + +--- salome-3.2.6/KERNEL_SRC_3.2.6/salome_adm/unix/DEPRECATED/make_conclude.in~ 2007-04-24 11:34:20.000000000 -0400 ++++ salome-3.2.6/KERNEL_SRC_3.2.6/salome_adm/unix/DEPRECATED/make_conclude.in 2008-01-16 00:07:53.000000000 -0500 +@@ -172,14 +172,14 @@ + cp -fr $< $@; + + # Make installation directories if they don't exist. +-$(libdir) $(includedir) $(bindir) $(datadir) $(idldir) $(sharedpydir): ++$(DESTDIR)$(libdir) $(DESTDIR)$(includedir) $(DESTDIR)$(bindir) $(DESTDIR)$(datadir) $(DESTDIR)$(idldir) $(DESTDIR)$(sharedpydir): + $(INSTALL) -d $@ && chmod 755 $@ + + # Install the library, the public header files, and programs. +-install: $(LIB) $(BIN) $(TEST_PROGS) $(libdir) $(includedir) $(bindir) $(datadir) $(idldir) install-python install-sharedpyqt install-qm install-res ++install: $(LIB) $(BIN) $(TEST_PROGS) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) $(DESTDIR)$(bindir) $(DESTDIR)$(datadir) $(DESTDIR)$(idldir) install-python install-sharedpyqt install-qm install-res + @for f in X $(LIB); do \ + if test $$f != X; then \ +- ($(LT_INSTALL_LIB) $$f $(libdir)/. || exit 1); \ ++ ($(LT_INSTALL_LIB) $$f $(DESTDIR)$(libdir) || exit 1); \ + fi; \ + done + @if test "X$(LIB_SWIG)" != "X"; then \ +@@ -187,30 +187,30 @@ + fi; + @for f in X $(BIN); do \ + if test $$f != X; then \ +- ($(LT_INSTALL_PROG) $$f $(bindir)/. || exit 1); \ ++ ($(LT_INSTALL_PROG) $$f $(DESTDIR)$(bindir)/. || exit 1); \ + fi; \ + done + # Install tests programmes in bindir + @for f in X $(TEST_PROGS); do \ + if test $$f != X; then \ +- ($(LT_INSTALL_PROG) $$f $(bindir)/. || exit 1); \ ++ ($(LT_INSTALL_PROG) $$f $(DESTDIR)$(bindir)/. || exit 1); \ + fi; \ + done + # Install exported includes in includedir + @for f in X $(EXPORT_HEADERS:%=$(srcdir)/%); do \ + if test $$f != X; then \ +- (cp -p -f $$f $(includedir) || exit 1); \ ++ (cp -p -f $$f $(DESTDIR)$(includedir) || exit 1); \ + fi; \ + done + + # Install python script in $(bindir) +-install-python: $(bindir) $(EXPORT_PYSCRIPTS:%=install-%) $(UI_PY_FILES:%=install-%) ++install-python: $(DESTDIR)$(bindir) $(EXPORT_PYSCRIPTS:%=install-%) $(UI_PY_FILES:%=install-%) + + $(UI_PY_FILES:%=install-%): install-%: % +- $(INSTALL_PROGRAM) $< $(bindir)/. ++ $(INSTALL_PROGRAM) $< $(DESTDIR)$(bindir)/. + + $(EXPORT_PYSCRIPTS:%=install-%): install-%: % +- $(INSTALL_PROGRAM) $< $(bindir)/. ++ $(INSTALL_PROGRAM) $< $(DESTDIR)$(bindir)/. + + #install-python: $(bindir) $(EXPORT_PYSCRIPTS) + # @for f in X $(EXPORT_PYSCRIPTS); do \ +@@ -220,27 +220,27 @@ + # done + + # Install pyqt script in $(install-sharedpyqt) +-install-sharedpyqt: $(sharedpydir) $(EXPORT_SHAREDPYSCRIPTS:%=install-%) ++install-sharedpyqt: $(DESTDIR)$(sharedpydir) $(EXPORT_SHAREDPYSCRIPTS:%=install-%) + + $(EXPORT_SHAREDPYSCRIPTS:%=install-%): install-%: % +- $(INSTALL_PROGRAM) $< $(sharedpydir)/. ++ $(INSTALL_PROGRAM) $< $(DESTDIR)$(sharedpydir)/. + + + # generic rule to install .qm files : + install-qm: resources +- $(INSTALL) -d $(datadir)/resources/$(MODULE_NAME) ++ $(INSTALL) -d $(DESTDIR)$(datadir)/resources/$(MODULE_NAME) + @for f in X $(PO_FILES:%.po=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%.qm); do \ + if test $$f != X; then \ +- ($(INSTALL_DATA) $$f $(datadir)/resources/$(MODULE_NAME)/. || exit 1); \ ++ ($(INSTALL_DATA) $$f $(DESTDIR)$(datadir)/resources/$(MODULE_NAME)/. || exit 1); \ + fi; \ + done + + # generic rule to install resources files (png, ini ...): + install-res: resources +- $(INSTALL) -d $(datadir)/resources/$(MODULE_NAME) ++ $(INSTALL) -d $(DESTDIR)$(datadir)/resources/$(MODULE_NAME) + @for f in X $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%); do \ + if test $$f != X; then \ +- ($(INSTALL_DATA) $$f $(datadir)/resources/$(MODULE_NAME)/. || exit 1); \ ++ ($(INSTALL_DATA) $$f $(DESTDIR)$(datadir)/resources/$(MODULE_NAME)/. || exit 1); \ + fi; \ + done + +@@ -248,50 +248,50 @@ + uninstall: + @if test "X$(LIB)" != X; then \ + for f in $(LIB); do \ +- $(LT_UNINSTALL) $(libdir)/$$f; \ ++ $(LT_UNINSTALL) $(DESTDIR)$(libdir)/$$f; \ + done; \ + fi + @if test "X$(BIN)" != X; then \ + for f in $(BIN); do \ +- $(LT_UNINSTALL) $(bindir)/$$f; \ ++ $(LT_UNINSTALL) $(DESTDIR)$(bindir)/$$f; \ + done; \ + fi + @for f in X $(TEST_PROGS); do \ + if test $$f != X; then \ +- $(LT_UNINSTALL) $(bindir)/$$f; \ ++ $(LT_UNINSTALL) $(DESTDIR)$(bindir)/$$f; \ + fi; \ + done + # Uninstall exported includes in includedir + @for f in X $(EXPORT_HEADERS); do \ + if test $$f != X; then \ +- $(LT_UNINSTALL) $(includedir)/$$f; \ ++ $(LT_UNINSTALL) $(DESTDIR)$(includedir)/$$f; \ + fi; \ + done + # Uninstall python script in $(bindir) + @for f in X $(EXPORT_PYSCRIPTS); do \ + if test $$f != X; then \ +- $(LT_UNINSTALL) $(bindir)/$$f ; \ ++ $(LT_UNINSTALL) $(DESTDIR)$(bindir)/$$f ; \ + fi; \ + done + + # Uninstall python script in $(bindir) + @for f in X $(UI_PY_FILES); do \ + if test $$f != X; then \ +- $(LT_UNINSTALL) $(bindir)/$$f ; \ ++ $(LT_UNINSTALL) $(DESTDIR)$(bindir)/$$f ; \ + fi; \ + done + + # Uninstall pyqt script in $(sharedpydir) + @for f in X $(EXPORT_SHAREDPYSCRIPTS); do \ + if test $$f != X; then \ +- $(LT_UNINSTALL) $(sharedpydir)/$$f ; \ ++ $(LT_UNINSTALL) $(DESTDIR)$(sharedpydir)/$$f ; \ + fi; \ + done + + # Uninstall qm files + @for f in X $(PO_FILES:%.po=%.qm); do \ + if test $$f != X; then \ +- $(LT_UNINSTALL) $(datadir)/resources/$(MODULE_NAME)/$$f ; \ ++ $(LT_UNINSTALL) $(DESTDIR)$(datadir)/resources/$(MODULE_NAME)/$$f ; \ + fi; \ + done + +--- salome-3.2.6/HXX2SALOME_3.2.6/scripts/Makefile.am~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/HXX2SALOME_3.2.6/scripts/Makefile.am 2008-01-14 19:24:29.000000000 -0500 +@@ -12,4 +12,4 @@ + cpp_compo_template.tgz + + install-data-hook: +- \cp -f ${srcdir}/template_src.tgz ${exec_prefix}/bin ++ \cp -f ${srcdir}/template_src.tgz $(DESTDIR)${exec_prefix}/bin +--- salome-3.2.6.orig/GUI_SRC_3.2.6/Makefile.in 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/Makefile.in 2008-01-11 15:35:15.000000000 -0500 +@@ -154,8 +154,8 @@ + + # Install make_commence make_conclude ... for other modules + install-make: +- ($(INSTALL) -d $(incmakedir) || exit 1); +- (sed 's/^prefix=/#prefix=/' $(top_builddir)/adm_local/unix/make_commence > $(incmakedir)/make_commence || exit 1); ++ ($(INSTALL) -d $(DESTDIR)$(incmakedir) || exit 1); ++ (sed 's/^prefix=/#prefix=/' $(top_builddir)/adm_local/unix/make_commence > $(DESTDIR)$(incmakedir)/make_commence || exit 1); + + + install-end: +@@ -163,17 +163,17 @@ + # @$(LT) --mode=finish $(libdir) + + install-include: $(include_list) +- $(INSTALL) -d $(includedir) ++ $(INSTALL) -d $(DESTDIR)$(includedir) + @for f in X $(include_list); do \ + if test $$f != X; then \ +- (cp -p $$f $(includedir) || exit 1); \ ++ (cp -p $$f $(DESTDIR)$(includedir) || exit 1); \ + fi; \ + done + + # install script in $(bindir) : + install-bin: $(BIN_SCRIPT) +- $(INSTALL) -d $(bindir) +- $(INSTALL_PROGRAM) $^ $(bindir) ++ $(INSTALL) -d $(DESTDIR)$(bindir) ++ $(INSTALL_PROGRAM) $^ $(DESTDIR)$(bindir) + + uninstall: + #uninstall: uninstall-idl +--- salome-3.2.6/GUI_SRC_3.2.6/adm_local/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/adm_local/Makefile.in 2008-01-15 23:40:14.000000000 -0500 +@@ -26,7 +26,7 @@ + all: resources + + install: +- cp -rf @top_srcdir@/adm_local @prefix@ ++ cp -rf @top_srcdir@/adm_local $(DESTDIR)@prefix@ + + bin: + +--- salome-3.2.6.orig/GUI_SRC_3.2.6/doc/salome/tui/Makefile.in 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/doc/salome/tui/Makefile.in 2008-01-11 15:38:47.000000000 -0500 +@@ -63,9 +63,9 @@ + rm -fr INPUT + + install: +- $(INSTALL) -d $(docdir); \ +- mkdir -p $(docdir)/tui +- cp -fr GUI $(docdir)/tui ++ $(INSTALL) -d $(DESTDIR)$(docdir); \ ++ mkdir -p $(DESTDIR)$(docdir)/tui ++ cp -fr GUI $(DESTDIR)$(docdir)/tui + + uninstall: +- rm -fr $(docdir)/tui/GUI ++ rm -fr $(DESTDIR)$(docdir)/tui/GUI +--- salome-3.2.6.orig/GUI_SRC_3.2.6/doc/salome/gui/Makefile.in 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/doc/salome/gui/Makefile.in 2008-01-11 15:40:27.000000000 -0500 +@@ -40,9 +40,9 @@ + rm -fr GUI + + install: +- mkdir -p $(docdir)/gui +- cp -rf GUI $(docdir)/gui ++ mkdir -p $(DESTDIR)$(docdir)/gui ++ cp -rf GUI $(DESTDIR)$(docdir)/gui + -find $(PWD) -name CVS -prune -exec rm -rf {} \; + + uninstall: +- rm -rf $(docdir)/gui/GUI ++ rm -rf $(DESTDIR)$(docdir)/gui/GUI +--- salome-3.2.6.orig/GUI_SRC_3.2.6/adm_local/unix/make_conclude.in 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/adm_local/unix/make_conclude.in 2008-01-11 15:49:05.000000000 -0500 +@@ -199,45 +199,45 @@ + cp -fr $< $@; + + # Make installation directories if they don't exist. +-$(libdir) $(includedir) $(bindir) $(datadir) $(idldir) $(sharedpydir): ++$(DESTDIR)$(libdir) $(DESTDIR)$(includedir) $(DESTDIR)$(bindir) $(DESTDIR)$(datadir) $(DESTDIR)$(idldir) $(DESTDIR)$(sharedpydir): + $(INSTALL) -d $@ && chmod 755 $@ + + # Install the library, the public header files, and programs. +-install: $(LIB) $(BIN) $(TEST_PROGS) $(libdir) $(includedir) $(bindir) $(datadir) $(idldir) install-python install-sharedpyqt install-qm install-res ++install: $(LIB) $(BIN) $(TEST_PROGS) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) $(DESTDIR)$(bindir) $(DESTDIR)$(datadir) $(DESTDIR)$(idldir) install-python install-sharedpyqt install-qm install-res + @for f in X $(LIB); do \ + if test $$f != X; then \ +- ($(LT_INSTALL_LIB) $$f $(libdir)/. || exit 1); \ ++ ($(LT_INSTALL_LIB) $$f $(DESTDIR)$(libdir)/. || exit 1); \ + fi; \ + done + @if ! test -z $(LIB_SWIG) ; then \ +- (cd $(libdir); ln -sf $(patsubst %.so, %cmodule.so, $(LIB_SWIG)) _$(LIB_SWIG) || true); \ ++ (cd $(DESTDIR)$(libdir); ln -sf $(patsubst %.so, %cmodule.so, $(LIB_SWIG)) _$(LIB_SWIG) || true); \ + fi; + @for f in X $(BIN); do \ + if test $$f != X; then \ +- ($(LT_INSTALL_PROG) $$f $(bindir)/. || exit 1); \ ++ ($(LT_INSTALL_PROG) $$f $(DESTDIR)$(bindir)/. || exit 1); \ + fi; \ + done + # Install tests programmes in bindir + @for f in X $(TEST_PROGS); do \ + if test $$f != X; then \ +- ($(LT_INSTALL_PROG) $$f $(bindir)/. || exit 1); \ ++ ($(LT_INSTALL_PROG) $$f $(DESTDIR)$(bindir)/. || exit 1); \ + fi; \ + done + # Install exported includes in includedir + @for f in X $(EXPORT_HEADERS:%=$(srcdir)/%); do \ + if test $$f != X; then \ +- (cp -p -f $$f $(includedir) || exit 1); \ ++ (cp -p -f $$f $(DESTDIR)$(includedir) || exit 1); \ + fi; \ + done + +-# Install python script in $(bindir) +-install-python: $(bindir) $(EXPORT_PYSCRIPTS:%=install-%) $(UI_PY_FILES:%=install-%) ++# Install python script in $(DESTDIR)$(bindir) ++install-python: $(DESTDIR)$(bindir) $(EXPORT_PYSCRIPTS:%=install-%) $(UI_PY_FILES:%=install-%) + + $(UI_PY_FILES:%=install-%): install-%: % +- $(INSTALL_PROGRAM) $< $(bindir)/. ++ $(INSTALL_PROGRAM) $< $(DESTDIR)$(bindir)/. + + $(EXPORT_PYSCRIPTS:%=install-%): install-%: % +- $(INSTALL_PROGRAM) $< $(bindir)/. ++ $(INSTALL_PROGRAM) $< $(DESTDIR)$(bindir)/. + + #install-python: $(bindir) $(EXPORT_PYSCRIPTS) + # @for f in X $(EXPORT_PYSCRIPTS); do \ +@@ -247,27 +247,27 @@ + # done + + # Install pyqt script in $(install-sharedpyqt) +-install-sharedpyqt: $(sharedpydir) $(EXPORT_SHAREDPYSCRIPTS:%=install-%) ++install-sharedpyqt: $(DESTDIR)$(sharedpydir) $(EXPORT_SHAREDPYSCRIPTS:%=install-%) + + $(EXPORT_SHAREDPYSCRIPTS:%=install-%): install-%: % +- $(INSTALL_PROGRAM) $< $(sharedpydir)/. ++ $(INSTALL_PROGRAM) $< $(DESTDIR)$(sharedpydir)/. + + + # generic rule to install .qm files : + install-qm: resources +- $(INSTALL) -d $(datadir)/resources/$(MODULE_NAME) ++ $(INSTALL) -d $(DESTDIR)$(datadir)/resources/$(MODULE_NAME) + @for f in X $(PO_FILES:%.po=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%.qm); do \ + if test $$f != X; then \ +- ($(INSTALL_DATA) $$f $(datadir)/resources/$(MODULE_NAME)/. || exit 1); \ ++ ($(INSTALL_DATA) $$f $(DESTDIR)$(datadir)/resources/$(MODULE_NAME)/. || exit 1); \ + fi; \ + done + + # generic rule to install resources files (png, ini ...): + install-res: resources +- $(INSTALL) -d $(datadir)/resources/$(MODULE_NAME) ++ $(INSTALL) -d $(DESTDIR)$(datadir)/resources/$(MODULE_NAME) + @for f in X $(RESOURCES_FILES:%=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%); do \ + if test $$f != X; then \ +- ($(INSTALL_DATA) $$f $(datadir)/resources/$(MODULE_NAME)/. || exit 1); \ ++ ($(INSTALL_DATA) $$f $(DESTDIR)$(datadir)/resources/$(MODULE_NAME)/. || exit 1); \ + fi; \ + done + +@@ -275,50 +275,50 @@ + uninstall: + @if test "X$(LIB)" != X; then \ + for f in $(LIB); do \ +- $(LT_UNINSTALL) $(libdir)/$$f; \ ++ $(LT_UNINSTALL) $(DESTDIR)$(libdir)/$$f; \ + done; \ + fi + @if test "X$(BIN)" != X; then \ + for f in $(BIN); do \ +- $(LT_UNINSTALL) $(bindir)/$$f; \ ++ $(LT_UNINSTALL) $(DESTDIR)$(bindir)/$$f; \ + done; \ + fi + @for f in X $(TEST_PROGS); do \ + if test $$f != X; then \ +- $(LT_UNINSTALL) $(bindir)/$$f; \ ++ $(LT_UNINSTALL) $(DESTDIR)$(bindir)/$$f; \ + fi; \ + done + # Uninstall exported includes in includedir + @for f in X $(EXPORT_HEADERS); do \ + if test $$f != X; then \ +- $(LT_UNINSTALL) $(includedir)/$$f; \ ++ $(LT_UNINSTALL) $(DESTDIR)$(includedir)/$$f; \ + fi; \ + done + # Uninstall python script in $(bindir) + @for f in X $(EXPORT_PYSCRIPTS); do \ + if test $$f != X; then \ +- $(LT_UNINSTALL) $(bindir)/$$f ; \ ++ $(LT_UNINSTALL) $(DESTDIR)$(bindir)/$$f ; \ + fi; \ + done + + # Uninstall python script in $(bindir) + @for f in X $(UI_PY_FILES); do \ + if test $$f != X; then \ +- $(LT_UNINSTALL) $(bindir)/$$f ; \ ++ $(LT_UNINSTALL) $(DESTDIR)$(bindir)/$$f ; \ + fi; \ + done + + # Uninstall pyqt script in $(sharedpydir) + @for f in X $(EXPORT_SHAREDPYSCRIPTS); do \ + if test $$f != X; then \ +- $(LT_UNINSTALL) $(sharedpydir)/$$f ; \ ++ $(LT_UNINSTALL) $(DESTDIR)$(sharedpydir)/$$f ; \ + fi; \ + done + + # Uninstall qm files + @for f in X $(PO_FILES:%.po=%.qm); do \ + if test $$f != X; then \ +- $(LT_UNINSTALL) $(datadir)/resources/$(MODULE_NAME)/$$f ; \ ++ $(LT_UNINSTALL) $(DESTDIR)$(datadir)/resources/$(MODULE_NAME)/$$f ; \ + fi; \ + done + +--- salome-3.2.6/RANDOMIZER_SRC_3.2.6/adm_local/Makefile.in~ 2006-05-06 05:01:22.000000000 -0400 ++++ salome-3.2.6/RANDOMIZER_SRC_3.2.6/adm_local/Makefile.in 2008-01-15 08:06:22.000000000 -0500 +@@ -27,7 +27,7 @@ + all: resources + + install: +- cp -rf @top_srcdir@/adm_local @prefix@ ++ cp -rf @top_srcdir@/adm_local $(DESTDIR)@prefix@ + + bin: + +--- salome-3.2.6/GUI_SRC_3.2.6/src/Style/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/src/Style/Makefile.in 2008-01-15 15:10:25.000000000 -0500 +@@ -71,7 +71,7 @@ + ln -sf $(CURDIR)/$< $@ || true + + # do the same in install step +-INSTALL_PLUGINDIR = $(bindir)/styles ++INSTALL_PLUGINDIR = $(DESTDIR)$(bindir)/styles + INSTALL_COPYLIB = $(patsubst %.la, $(INSTALL_PLUGINDIR)/%.so, $(filter %.la, $(LIB))) + + install: $(INSTALL_PLUGINDIR) $(INSTALL_COPYLIB) +--- salome-3.2.6/GEOM_SRC_3.2.6/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/Makefile.in 2008-01-15 17:43:58.000000000 -0500 +@@ -257,18 +257,18 @@ + # @$(LT) --mode=finish $(libdir) + + install-include: $(include_list) +- $(INSTALL) -d $(includedir) ++ $(INSTALL) -d $(DESTDIR)$(includedir) + @for f in X $(include_list); do \ + if test $$f != X; then \ +- ($(INSTALL_DATA) -p $$f $(includedir)/. || exit 1); \ ++ ($(INSTALL_DATA) -p $$f $(DESTDIR)$(includedir)/. || exit 1);\ + fi; \ + done + + # install script in $(bindir) : + install-bin: $(BIN_SCRIPT) +- $(INSTALL) -d $(bindir) ++ $(INSTALL) -d $(DESTDIR)$(bindir) + if test $(BIN_SCRIPT)X != X; then \ +- $(INSTALL_PROGRAM) $^ $(bindir); \ ++ $(INSTALL_PROGRAM) $^ $(DESTDIR)$(bindir); \ + fi + + uninstall: uninstall-idl +--- salome-3.2.6/GEOM_SRC_3.2.6/idl/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/idl/Makefile.in 2008-01-15 23:47:58.000000000 -0500 +@@ -66,15 +66,15 @@ + + # create directory $(idldir) and copy idl files into it + install-idl: $(IDL_FILES:%=$(top_builddir)/idl/salome/%) +- $(INSTALL) -d $(idldir) +- $(INSTALL_DATA) $^ $(idldir) ++ $(INSTALL) -d $(DESTDIR)$(idldir) ++ $(INSTALL_DATA) $^ $(DESTDIR)$(idldir) + + + install-pyidl: $(IDL_FILES:%=$(top_builddir)/idl/salome/%) +- $(INSTALL) -d $(PYTHON_SITE_INSTALL) ++ $(INSTALL) -d $(DESTDIR)$(PYTHON_SITE_INSTALL) + @for file in $^ dummy; do \ + if [ $$file != "dummy" ]; then \ +- $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(PYTHON_SITE_INSTALL) $$file ; \ ++ $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(DESTDIR)$(PYTHON_SITE_INSTALL) $$file ; \ + fi ; \ + done ; + +--- salome-3.2.6/GEOM_SRC_3.2.6/doc/salome/gui/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/doc/salome/gui/Makefile.in 2008-01-16 11:12:28.000000000 -0500 +@@ -41,9 +41,9 @@ + rm -fr GEOM + + install: +- mkdir -p $(docdir)/gui +- cp -rf GEOM $(docdir)/gui ++ mkdir -p $(DESTDIR)$(docdir)/gui ++ cp -rf GEOM $(DESTDIR)$(docdir)/gui + -find $(PWD) -name CVS -prune -exec rm -rf {} \; + + uninstall: +- rm -rf $(docdir)/gui/GEOM ++ rm -rf $(DESTDIR)$(docdir)/gui/GEOM +--- salome-3.2.6/GEOM_SRC_3.2.6/adm_local/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/adm_local/Makefile.in 2008-01-16 11:24:26.000000000 -0500 +@@ -27,7 +27,7 @@ + all: resources + + install: +- cp -rf @top_srcdir@/adm_local @prefix@ ++ cp -rf @top_srcdir@/adm_local $(DESTDIR)@prefix@ + + bin: + +--- salome-3.2.6/GEOM_SRC_3.2.6/doc/salome/tui/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/doc/salome/tui/Makefile.in 2008-01-18 14:50:21.000000000 -0500 +@@ -87,9 +87,9 @@ + rm -fr INPUT + + install: +- $(INSTALL) -d $(docdir); \ +- mkdir -p $(docdir)/tui +- cp -fr GEOM $(docdir)/tui ++ $(INSTALL) -d $(DESTDIR)$(docdir); \ ++ mkdir -p $(DESTDIR)$(docdir)/tui ++ cp -fr GEOM $(DESTDIR)$(docdir)/tui + + uninstall: +- rm -fr $(docdir)/tui/GEOM ++ rm -fr $(DESTDIR)$(docdir)/tui/GEOM +--- salome-3.2.6/MED_SRC_3.2.6/Makefile.in~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/MED_SRC_3.2.6/Makefile.in 2008-01-15 19:42:02.000000000 -0500 +@@ -237,26 +237,26 @@ + # @$(LT) --mode=finish $(libdir) + + install-include: $(include_list) +- $(INSTALL) -d $(includedir) ++ $(INSTALL) -d $(DESTDIR)$(includedir) + @for f in X $(include_list); do \ + if test $$f != X; then \ +- (cp -p $$f $(includedir) || exit 1); \ ++ (cp -p $$f $(DESTDIR)$(includedir) || exit 1); \ + fi; \ + done + + # install script in $(bindir) : + install-bin: $(BIN_SCRIPT) +- $(INSTALL) -d $(bindir) ++ $(INSTALL) -d $(DESTDIR)$(bindir) + for f in X $(BIN_SCRIPT); do \ + if test $$f != X; then \ +- (cp -p -f ./bin/salome/$$f $(bindir) || exit 1); \ ++ (cp -p -f ./bin/salome/$$f $(DESTDIR)$(bindir) || exit 1); \ + fi; \ + done + + uninstall: uninstall-idl + + uninstall-idl: +- $(RM) $(idldir)/*.idl ++ $(RM) $(DESTDIR)$(idldir)/*.idl + + distclean: distclean-other + +--- salome-3.2.6/MED_SRC_3.2.6/adm_local/unix/make_conclude.in~ 2008-01-15 19:59:11.000000000 -0500 ++++ salome-3.2.6/MED_SRC_3.2.6/adm_local/unix/make_conclude.in 2008-01-16 00:19:39.000000000 -0500 +@@ -190,43 +190,43 @@ + resources: $(PO_FILES:%.po=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%.qm) + + # Make installation directories if they don't exist. +-$(libdir) $(includedir) $(bindir) $(datadir) $(idldir) $(sharedpydir): ++$(DESTDIR)$(libdir) $(DESTDIR)$(includedir) $(DESTDIR)$(bindir) $(DESTDIR)$(datadir) $(DESTDIR)$(idldir) $(DESTDIR)$(sharedpydir): + $(INSTALL) -d $@ && chmod 755 $@ + + # Install the library, the public header files, and programs. +-install: $(LIB) $(BIN) $(TEST_PROGS) $(libdir) $(includedir) $(bindir) $(datadir) $(idldir) install-python install-sharedpyqt install-qm ++install: $(LIB) $(BIN) $(TEST_PROGS) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) $(DESTDIR)$(bindir) $(DESTDIR)$(datadir) $(DESTDIR)$(idldir) install-python install-sharedpyqt install-qm + #install: $(LIB) $(BIN) $(libdir) $(includedir) $(bindir) $(datadir) $(idldir) install-python install-sharedpyqt install-qm + @for f in X $(LIB); do \ + if test $$f != X; then \ +- ($(LT_INSTALL_LIB) $$f $(libdir)/. || exit 1); \ ++ ($(LT_INSTALL_LIB) $$f $(DESTDIR)$(libdir) || exit 1); \ + fi; \ + done + @if test "X$(LIB_SWIG)" != X ; then \ +- (cd $(libdir); ln -sf $(patsubst %.so, %cmodule.so, $(LIB_SWIG)) _$(LIB_SWIG) || true); \ ++ (cd $(DESTDIR)$(libdir); ln -sf $(patsubst %.so, %cmodule.so, $(LIB_SWIG)) _$(LIB_SWIG) || true); \ + fi; + @for f in X $(BIN); do \ + if test $$f != X; then \ +- ($(LT_INSTALL_PROG) $$f $(bindir)/. || exit 1); \ ++ ($(LT_INSTALL_PROG) $$f $(DESTDIR)$(bindir)/. || exit 1); \ + fi; \ + done + # Install tests programmes in bindir + @for f in X $(TEST_PROGS); do \ + if test $$f != X; then \ +- ($(LT_INSTALL_PROG) $$f $(bindir)/. || exit 1); \ ++ ($(LT_INSTALL_PROG) $$f $(DESTDIR)$(bindir)/. || exit 1); \ + fi; \ + done + # Install exported includes in includedir + @for f in X $(EXPORT_HEADERS:%=$(srcdir)/%); do \ + if test $$f != X; then \ +- (cp -p -f $$f $(includedir) || exit 1); \ ++ (cp -p -f $$f $(DESTDIR)$(includedir) || exit 1); \ + fi; \ + done + + # Install python script in $(bindir) +-install-python: $(bindir) $(EXPORT_PYSCRIPTS:%=install-%) ++install-python: $(DESTDIR)$(bindir) $(EXPORT_PYSCRIPTS:%=install-%) + + $(EXPORT_PYSCRIPTS:%=install-%): install-%: % +- $(INSTALL_PROGRAM) $< $(bindir)/. ++ $(INSTALL_PROGRAM) $< $(DESTDIR)$(bindir)/. + + #install-python: $(bindir) $(EXPORT_PYSCRIPTS) + # @for f in X $(EXPORT_PYSCRIPTS); do \ +@@ -236,18 +236,18 @@ + # done + + # Install pyqt script in $(install-sharedpyqt) +-install-sharedpyqt: $(sharedpydir) $(EXPORT_SHAREDPYSCRIPTS:%=install-%) ++install-sharedpyqt: $(DESTDIR)$(sharedpydir) $(EXPORT_SHAREDPYSCRIPTS:%=install-%) + + $(EXPORT_SHAREDPYSCRIPTS:%=install-%): install-%: % +- $(INSTALL_PROGRAM) $< $(sharedpydir)/. ++ $(INSTALL_PROGRAM) $< $(DESTDIR)$(sharedpydir)/. + + + # generic rule to install .qm files : + install-qm: resources +- $(INSTALL) -d $(datadir)/resources/$(MODULE_NAME) ++ $(INSTALL) -d $(DESTDIR)$(datadir)/resources/$(MODULE_NAME) + @for f in X $(PO_FILES:%.po=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%.qm); do \ + if test $$f != X; then \ +- ($(INSTALL_DATA) $$f $(datadir)/resources/$(MODULE_NAME)/. || exit 1); \ ++ ($(INSTALL_DATA) $$f $(DESTDIR)$(datadir)/resources/$(MODULE_NAME)/. || exit 1); \ + fi; \ + done + +@@ -255,43 +255,43 @@ + uninstall: + @if test "X$(LIB)" != X; then \ + for f in $(LIB); do \ +- $(LT_UNINSTALL) $(libdir)/$$f; \ ++ $(LT_UNINSTALL) $(DESTDIR)$(libdir)/$$f; \ + done; \ + fi + @if test "X$(BIN)" != X; then \ + for f in $(BIN); do \ +- $(LT_UNINSTALL) $(bindir)/$$f; \ ++ $(LT_UNINSTALL) $(DESTDIR)$(bindir)/$$f; \ + done; \ + fi + @for f in X $(TEST_PROGS); do \ + if test $$f != X; then \ +- $(LT_UNINSTALL) $(bindir)/$$f; \ ++ $(LT_UNINSTALL) $(DESTDIR)$(bindir)/$$f; \ + fi; \ + done + # Uninstall exported includes in includedir + @for f in X $(EXPORT_HEADERS); do \ + if test $$f != X; then \ +- $(LT_UNINSTALL) $(includedir)/$$f; \ ++ $(LT_UNINSTALL) $(DESTDIR)$(includedir)/$$f; \ + fi; \ + done + # Uninstall python script in $(bindir) + @for f in X $(EXPORT_PYSCRIPTS); do \ + if test $$f != X; then \ +- $(LT_UNINSTALL) $(bindir)/$$f ; \ ++ $(LT_UNINSTALL) $(DESTDIR)$(bindir)/$$f ; \ + fi; \ + done + + # Uninstall pyqt script in $(sharedpydir) + @for f in X $(EXPORT_SHAREDPYSCRIPTS); do \ + if test $$f != X; then \ +- $(LT_UNINSTALL) $(sharedpydir)/$$f ; \ ++ $(LT_UNINSTALL) $(DESTDIR)$(sharedpydir)/$$f ; \ + fi; \ + done + + # Uninstall qm files + @for f in X $(PO_FILES:%.po=%.qm); do \ + if test $$f != X; then \ +- $(LT_UNINSTALL) $(datadir)/resources/$(MODULE_NAME)/$$f ; \ ++ $(LT_UNINSTALL) $(DESTDIR)$(datadir)/resources/$(MODULE_NAME)/$$f ; \ + fi; \ + done + +--- salome-3.2.6/MED_SRC_3.2.6/src/MedClient/test/environ/Makefile.in~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/MED_SRC_3.2.6/src/MedClient/test/environ/Makefile.in 2008-01-16 19:41:36.000000000 -0500 +@@ -52,12 +52,12 @@ + chmod +x runContainer stopContainer runEnvironTests + chmod +x csh/* + +-install: +- mkdir -p @prefix@/Tests/environ +- cp -rf ${BIN} csh @prefix@/Tests/environ +- cd @prefix@/Tests/environ ; chmod u+x ${BIN} +- cp -f ${top_builddir}/bin/runTestMedCorba @prefix@/bin +- chmod +x @prefix@/bin/runTestMedCorba ++install: bin ++ mkdir -p $(DESTDIR)@prefix@/Tests/environ ++ cp -rf ${BIN} csh $(DESTDIR)@prefix@/Tests/environ ++ cd $(DESTDIR)@prefix@/Tests/environ ; chmod u+x ${BIN} ++ cp -f ${top_builddir}/bin/runTestMedCorba $(DESTDIR)@prefix@/bin ++ chmod +x $(DESTDIR)@prefix@/bin/runTestMedCorba + + ./%: @srcdir@/%.in + cd $(top_builddir) ; \ +--- salome-3.2.6/MED_SRC_3.2.6/src/MedClient/test/test1/Makefile.in~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/MED_SRC_3.2.6/src/MedClient/test/test1/Makefile.in 2008-01-16 19:44:39.000000000 -0500 +@@ -59,10 +59,10 @@ + cp -f $< $@ + + # Install python script in $(bindir) +-install-python: $(bindir) $(EXPORT_PYSCRIPTS:%=install-%) ++install-python: $(DESTDIR)$(bindir) $(EXPORT_PYSCRIPTS:%=install-%) + + $(EXPORT_PYSCRIPTS:%=install-%): install-%: % +- $(INSTALL_PROGRAM) $< $(bindir)/. ++ $(INSTALL_PROGRAM) $< $(DESTDIR)$(bindir)/. + + # _CS_gbo_240504 Il s'agit d'un répertoire feuille + @CONCLUDE@ +--- salome-3.2.6/MED_SRC_3.2.6/idl/Makefile.in~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/MED_SRC_3.2.6/idl/Makefile.in 2008-01-16 20:38:46.000000000 -0500 +@@ -50,13 +50,13 @@ + + PYTHON_BUILD_SITE=$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/@PACKAGE@ + +-pyidl: $(PYTHON_BUILD_SITE) $(IDL_FILES:%.idl=$(PYTHON_BUILD_SITE)/%_idl.py) ++pyidl: $(DESTDIR)$(PYTHON_BUILD_SITE) $(IDL_FILES:%.idl=$(DESTDIR)$(PYTHON_BUILD_SITE)/%_idl.py) + +-$(PYTHON_BUILD_SITE): ++$(DESTDIR)$(PYTHON_BUILD_SITE): + $(INSTALL) -d $@ + +-$(PYTHON_BUILD_SITE)/%_idl.py: $(top_builddir)/idl/salome/%.idl +- $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(PYTHON_BUILD_SITE) $< ++$(DESTDIR)$(PYTHON_BUILD_SITE)/%_idl.py: $(top_builddir)/idl/salome/%.idl ++ $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(DESTDIR)$(PYTHON_BUILD_SITE) $< + + + # install python client (generated from idl file +@@ -64,15 +64,15 @@ + + # create directory $(idldir) and copy idl files into it + install-idl: $(IDL_FILES:%=$(top_builddir)/idl/salome/%) +- $(INSTALL) -d $(idldir) +- $(INSTALL_DATA) $^ $(idldir) ++ $(INSTALL) -d $(DESTDIR)$(idldir) ++ $(INSTALL_DATA) $^ $(DESTDIR)$(idldir) + + + install-pyidl: $(IDL_FILES:%=$(top_builddir)/idl/salome/%) +- $(INSTALL) -d $(PYTHON_SITE_INSTALL) ++ $(INSTALL) -d $(DESTDIR)$(PYTHON_SITE_INSTALL) + @for file in $^ dummy; do \ + if [ $$file != "dummy" ]; then \ +- $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(PYTHON_SITE_INSTALL) $$file ; \ ++ $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(DESTDIR)$(PYTHON_SITE_INSTALL) $$file ; \ + fi ; \ + done ; + +--- salome-3.2.6/MED_SRC_3.2.6/doc/salome/tui/Makefile.in~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/MED_SRC_3.2.6/doc/salome/tui/Makefile.in 2008-01-16 20:42:07.000000000 -0500 +@@ -48,9 +48,9 @@ + rm -fr INPUT + + install: +- $(INSTALL) -d $(docdir); \ +- mkdir -p $(docdir)/tui +- cp -fr MED $(docdir)/tui ++ $(INSTALL) -d $(DESTDIR)$(docdir); \ ++ mkdir -p $(DESTDIR)$(docdir)/tui ++ cp -fr MED $(DESTDIR)$(docdir)/tui + + uninstall: +- rm -fr $(docdir)/tui/MED ++ rm -fr $(DESTDIR)$(docdir)/tui/MED +--- salome-3.2.6/MED_SRC_3.2.6/adm_local/Makefile.in~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/MED_SRC_3.2.6/adm_local/Makefile.in 2008-01-16 20:49:02.000000000 -0500 +@@ -26,7 +26,7 @@ + all: resources + + install: +- cp -rf @top_srcdir@/adm_local @prefix@ ++ cp -rf @top_srcdir@/adm_local $(DESTDIR)@prefix@ + + bin: + +--- salome-3.2.6/RANDOMIZER_SRC_3.2.6/Makefile.in~ 2006-06-27 03:47:49.000000000 -0400 ++++ salome-3.2.6/RANDOMIZER_SRC_3.2.6/Makefile.in 2008-01-15 19:43:15.000000000 -0500 +@@ -34,13 +34,13 @@ + + # install script in $(bindir) : + install-bin: $(BIN_SCRIPT) +- $(INSTALL) -d $(bindir) +- $(INSTALL_PROGRAM) $^ $(bindir) ++ $(INSTALL) -d $(DESTDIR)$(bindir) ++ $(INSTALL_PROGRAM) $^ $(DESTDIR)$(bindir) + + uninstall: uninstall-idl + + uninstall-idl: +- $(RM) $(idldir)/*.idl ++ $(RM) $(DESTDIR)$(idldir)/*.idl + + distclean: distclean-other + +--- salome-3.2.6/RANDOMIZER_SRC_3.2.6/idl/Makefile.in~ 2006-06-01 07:49:24.000000000 -0400 ++++ salome-3.2.6/RANDOMIZER_SRC_3.2.6/idl/Makefile.in 2008-01-16 00:23:21.000000000 -0500 +@@ -46,15 +46,15 @@ + + # create directory $(idldir) and copy idl files into it + install-idl: $(IDL_FILES:%=$(top_builddir)/idl/salome/%) +- $(INSTALL) -d $(idldir) +- $(INSTALL_DATA) $^ $(idldir) ++ $(INSTALL) -d $(DESTDIR)$(idldir) ++ $(INSTALL_DATA) $^ $(DESTDIR)$(idldir) + + + install-pyidl: $(IDL_FILES:%=$(top_builddir)/idl/salome/%) +- $(INSTALL) -d $(PYTHON_SITE_INSTALL) ++ $(INSTALL) -d $(DESTDIR)$(PYTHON_SITE_INSTALL) + @for file in $^ dummy; do \ + if [ $$file != "dummy" ]; then \ +- $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(PYTHON_SITE_INSTALL) $$file ; \ ++ $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(DESTDIR)$(PYTHON_SITE_INSTALL) $$file ; \ + fi ; \ + done ; + +--- salome-3.2.6/SUPERV_SRC_3.2.6/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/SUPERV_SRC_3.2.6/Makefile.in 2008-01-15 19:44:49.000000000 -0500 +@@ -110,24 +110,24 @@ + # @$(LT) --mode=finish $(libdir) + + install-include: $(include_list) +- $(INSTALL) -d $(includedir) ++ $(INSTALL) -d $(DESTDIR)$(includedir) + @for f in X $(include_list); do \ + if test $$f != X; then \ +- ($(INSTALL_DATA) -p $$f $(includedir)/. || exit 1); \ ++ ($(INSTALL_DATA) -p $$f $(DESTDIR)$(includedir)/. || exit 1); \ + fi; \ + done + + # install script in $(bindir) : + install-bin: $(BIN_SCRIPT) +- $(INSTALL) -d $(bindir) ++ $(INSTALL) -d $(DESTDIR)$(bindir) + if test $(BIN_SCRIPT)X != X; then \ +- $(INSTALL_PROGRAM) $^ $(bindir); \ ++ $(INSTALL_PROGRAM) $^ $(DESTDIR)$(bindir); \ + fi + + uninstall: uninstall-idl + + uninstall-idl: +- $(RM) $(idldir)/*.idl ++ $(RM) $(DESTDIR)$(idldir)/*.idl + + distclean: distclean-other + +--- salome-3.2.6/SUPERV_SRC_3.2.6/idl/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/SUPERV_SRC_3.2.6/idl/Makefile.in 2008-01-16 00:25:18.000000000 -0500 +@@ -64,15 +64,15 @@ + + # create directory $(idldir) and copy idl files into it + install-idl: $(IDL_FILES:%=$(top_builddir)/idl/salome/%) +- $(INSTALL) -d $(idldir) +- $(INSTALL_DATA) $^ $(idldir) ++ $(INSTALL) -d $(DESTDIR)$(idldir) ++ $(INSTALL_DATA) $^ $(DESTDIR)$(idldir) + + + install-pyidl: $(IDL_FILES:%=$(top_builddir)/idl/salome/%) +- $(INSTALL) -d $(PYTHON_SITE_INSTALL) ++ $(INSTALL) -d $(DESTDIR)$(PYTHON_SITE_INSTALL) + @for file in $^ dummy; do \ + if [ $$file != "dummy" ]; then \ +- $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(PYTHON_SITE_INSTALL) $$file ; \ ++ $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(DESTDIR)$(PYTHON_SITE_INSTALL) $$file ; \ + fi ; \ + done ; + +--- salome-3.2.6/SUPERV_SRC_3.2.6/adm_local/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/SUPERV_SRC_3.2.6/adm_local/Makefile.in 2008-01-17 08:16:06.000000000 -0500 +@@ -27,7 +27,7 @@ + all: resources + + install: +- cp -rf @top_srcdir@/adm_local @prefix@ ++ cp -rf @top_srcdir@/adm_local $(DESTDIR)@prefix@ + + bin: + +--- salome-3.2.6/SUPERV_SRC_3.2.6/doc/salome/gui/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/SUPERV_SRC_3.2.6/doc/salome/gui/Makefile.in 2008-01-17 08:14:36.000000000 -0500 +@@ -41,9 +41,9 @@ + rm -fr SUPERV + + install: +- mkdir -p $(docdir)/gui +- cp -rf SUPERV $(docdir)/gui ++ mkdir -p $(DESTDIR)$(docdir)/gui ++ cp -rf SUPERV $(DESTDIR)$(docdir)/gui + -find $(PWD) -name CVS -prune -exec rm -rf {} \; + + uninstall: +- rm -rf $(docdir)/gui/SUPERV ++ rm -rf $(DESTDIR)$(docdir)/gui/SUPERV +--- salome-3.2.6/SUPERV_SRC_3.2.6/doc/salome/tui/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/SUPERV_SRC_3.2.6/doc/salome/tui/Makefile.in 2008-01-18 15:51:04.000000000 -0500 +@@ -66,9 +66,9 @@ + rm -fr INPUT + + install: +- $(INSTALL) -d $(docdir); \ +- mkdir -p $(docdir)/tui +- cp -fr SUPERV $(docdir)/tui ++ $(INSTALL) -d $(DESTDIR)$(docdir); \ ++ mkdir -p $(DESTDIR)$(docdir)/tui ++ cp -fr SUPERV $(DESTDIR)$(docdir)/tui + + uninstall: +- rm -fr $(docdir)/tui/SUPERV ++ rm -fr $(DESTDIR)$(docdir)/tui/SUPERV +--- salome-3.2.6/HELLO_SRC_3.2.6/Makefile.in~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/HELLO_SRC_3.2.6/Makefile.in 2008-01-15 19:45:52.000000000 -0500 +@@ -90,22 +90,22 @@ + # @$(LT) --mode=finish $(libdir) + + install-include: $(include_list) +- $(INSTALL) -d $(includedir) ++ $(INSTALL) -d $(DESTDIR)$(includedir) + @for f in X $(include_list); do \ + if test $$f != X; then \ +- ($(INSTALL_DATA) $$f $(includedir)/. || exit 1); \ ++ ($(INSTALL_DATA) $$f $(DESTDIR)$(includedir)/. || exit 1); \ + fi; \ + done + + # install script in $(bindir) : + install-bin: $(BIN_SCRIPT) +- $(INSTALL) -d $(bindir) +- $(INSTALL_PROGRAM) $^ $(bindir) ++ $(INSTALL) -d $(DESTDIR)$(bindir) ++ $(INSTALL_PROGRAM) $^ $(DESTDIR)$(bindir) + + uninstall: uninstall-idl + + uninstall-idl: +- $(RM) $(idldir)/*.idl ++ $(RM) $(DESTDIR)$(idldir)/*.idl + + distclean: distclean-other + +--- salome-3.2.6/HELLO_SRC_3.2.6/idl/Makefile.in~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/HELLO_SRC_3.2.6/idl/Makefile.in 2008-01-16 00:27:12.000000000 -0500 +@@ -56,14 +56,14 @@ + + # create directory $(idldir) and copy idl files into it + install-idl: $(IDL_FILES) +- $(INSTALL) -d $(idldir) +- cp -p $^ $(idldir) ++ $(INSTALL) -d $(DESTDIR)$(idldir) ++ cp -p $^ $(DESTDIR)$(idldir) + + install-pyidl: $(IDL_FILES) +- $(INSTALL) -d $(PYTHON_SITE_INSTALL) ++ $(INSTALL) -d $(DESTDIR)$(PYTHON_SITE_INSTALL) + @for file in $^ dummy; do \ + if [ $$file != "dummy" ]; then \ +- $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(PYTHON_SITE_INSTALL) $$file ; \ ++ $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(DESTDIR)$(PYTHON_SITE_INSTALL) $$file ; \ + fi ; \ + done ; + +--- salome-3.2.6/HELLO_SRC_3.2.6/adm_local/Makefile.in~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/HELLO_SRC_3.2.6/adm_local/Makefile.in 2008-01-17 08:42:35.000000000 -0500 +@@ -26,7 +26,7 @@ + all: resources + + install: +- cp -rf @top_srcdir@/adm_local @prefix@ ++ cp -rf @top_srcdir@/adm_local $(DESTDIR)@prefix@ + + bin: + +--- salome-3.2.6/PYHELLO_SRC_3.2.6/Makefile.in~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/PYHELLO_SRC_3.2.6/Makefile.in 2008-01-15 19:46:59.000000000 -0500 +@@ -83,13 +83,13 @@ + + # install script in $(bindir) : + install-bin: $(BIN_SCRIPT) +- $(INSTALL) -d $(bindir) +- $(INSTALL_PROGRAM) $^ $(bindir) ++ $(INSTALL) -d $(DESTDIR)$(bindir) ++ $(INSTALL_PROGRAM) $^ $(DESTDIR)$(bindir) + + uninstall: uninstall-idl + + uninstall-idl: +- $(RM) $(idldir)/*.idl ++ $(RM) $(DESTDIR)$(idldir)/*.idl + + distclean: distclean-other + +--- salome-3.2.6/PYHELLO_SRC_3.2.6/idl/Makefile.in~ 2008-01-16 23:23:00.000000000 -0500 ++++ salome-3.2.6/PYHELLO_SRC_3.2.6/idl/Makefile.in 2008-01-16 23:24:35.000000000 -0500 +@@ -56,14 +56,14 @@ + + # create directory $(idldir) and copy idl files into it + install-idl: $(IDL_FILES) +- $(INSTALL) -d $(idldir) +- cp -p $^ $(idldir) ++ $(INSTALL) -d $(DESTDIR)$(idldir) ++ cp -p $^ $(DESTDIR)$(idldir) + + install-pyidl: $(IDL_FILES) +- $(INSTALL) -d $(PYTHON_SITE_INSTALL) ++ $(INSTALL) -d $(DESTDIR)$(PYTHON_SITE_INSTALL) + @for file in $^ dummy; do \ + if [ $$file != "dummy" ]; then \ +- $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(PYTHON_SITE_INSTALL) $$file ; \ ++ $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(DESTDIR)$(PYTHON_SITE_INSTALL) $$file ; \ + fi ; \ + done ; + +--- salome-3.2.6/PYHELLO_SRC_3.2.6/adm_local/Makefile.in~ 2008-01-16 11:32:34.000000000 -0500 ++++ salome-3.2.6/PYHELLO_SRC_3.2.6/adm_local/Makefile.in 2008-01-16 20:51:00.000000000 -0500 +@@ -26,7 +26,7 @@ + all: resources + + install: +- cp -rf @top_srcdir@/adm_local @prefix@ ++ cp -rf @top_srcdir@/adm_local $(DESTDIR)@prefix@ + + bin: + +--- salome-3.2.6/VISU_SRC_3.2.6/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/VISU_SRC_3.2.6/Makefile.in 2008-01-15 19:48:01.000000000 -0500 +@@ -95,24 +95,24 @@ + # @$(LT) --mode=finish $(libdir) + + install-include: $(include_list) +- $(INSTALL) -d $(includedir) ++ $(INSTALL) -d $(DESTDIR)$(includedir) + @for f in X $(include_list); do \ + if test $$f != X; then \ +- ($(INSTALL_DATA) -p $$f $(includedir)/. || exit 1); \ ++ ($(INSTALL_DATA) -p $$f $(DESTDIR)$(includedir)/. || exit 1); \ + fi; \ + done + + # install script in $(bindir) : + install-bin: $(BIN_SCRIPT) +- $(INSTALL) -d $(bindir) ++ $(INSTALL) -d $(DESTDIR)$(bindir) + if test $(BIN_SCRIPT)X != X; then \ +- $(INSTALL_PROGRAM) $^ $(bindir); \ ++ $(INSTALL_PROGRAM) $^ $(DESTDIR)$(bindir); \ + fi + + uninstall: uninstall-idl + + uninstall-idl: +- $(RM) $(idldir)/*.idl ++ $(RM) $(DESTDIR)$(idldir)/*.idl + + distclean: distclean-other + +@@ -129,5 +129,5 @@ + install-resources: install-catalog + + install-catalog: share/salome/resources/visu/VISUCatalog.xml +- $(INSTALL) -d $(datadir)/resources/visu +- $(INSTALL_DATA) $< $(datadir)/resources/visu/. ++ $(INSTALL) -d $(DESTDIR)$(datadir)/resources/visu ++ $(INSTALL_DATA) $< $(DESTDIR)$(datadir)/resources/visu/. +--- salome-3.2.6/VISU_SRC_3.2.6/idl/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/VISU_SRC_3.2.6/idl/Makefile.in 2008-01-16 00:32:47.000000000 -0500 +@@ -65,15 +65,15 @@ + + # create directory $(idldir) and copy idl files into it + install-idl: $(IDL_FILES:%=$(top_builddir)/idl/salome/%) +- $(INSTALL) -d $(idldir) +- $(INSTALL_DATA) $^ $(idldir) ++ $(INSTALL) -d $(DESTDIR)$(idldir) ++ $(INSTALL_DATA) $^ $(DESTDIR)$(idldir) + + + install-pyidl: $(IDL_FILES:%=$(top_builddir)/idl/salome/%) +- $(INSTALL) -d $(PYTHON_SITE_INSTALL) ++ $(INSTALL) -d $(DESTDIR)$(PYTHON_SITE_INSTALL) + @for file in $^ dummy; do \ + if [ $$file != "dummy" ]; then \ +- $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(PYTHON_SITE_INSTALL) $$file ; \ ++ $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(DESTDIR)$(PYTHON_SITE_INSTALL) $$file ; \ + fi ; \ + done ; + +--- salome-3.2.6/VISU_SRC_3.2.6/adm_local/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/VISU_SRC_3.2.6/adm_local/Makefile.in 2008-01-17 23:44:29.000000000 -0500 +@@ -27,7 +27,7 @@ + all: resources + + install: +- cp -rf @top_srcdir@/adm_local @prefix@ ++ cp -rf @top_srcdir@/adm_local $(DESTDIR)@prefix@ + + bin: + +--- salome-3.2.6/VISU_SRC_3.2.6/doc/salome/gui/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/VISU_SRC_3.2.6/doc/salome/gui/Makefile.in 2008-01-17 23:49:12.000000000 -0500 +@@ -42,9 +42,9 @@ + rm -fr VISU + + install: +- mkdir -p $(docdir)/gui +- cp -rf VISU $(docdir)/gui ++ mkdir -p $(DESTDIR)$(docdir)/gui ++ cp -rf VISU $(DESTDIR)$(docdir)/gui + -find $(PWD) -name CVS -prune -exec rm -rf {} \; + + uninstall: +- rm -rf $(docdir)/gui/VISU ++ rm -rf $(DESTDIR)$(docdir)/gui/VISU +--- salome-3.2.6/VISU_SRC_3.2.6/doc/salome/tui/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/VISU_SRC_3.2.6/doc/salome/tui/Makefile.in 2008-01-18 15:52:45.000000000 -0500 +@@ -67,9 +67,9 @@ + rm -fr INPUT + + install: +- $(INSTALL) -d $(docdir); \ +- mkdir -p $(docdir)/tui +- cp -fr VISU $(docdir)/tui ++ $(INSTALL) -d $(DESTDIR)$(docdir); \ ++ mkdir -p $(DESTDIR)$(docdir)/tui ++ cp -fr VISU $(DESTDIR)$(docdir)/tui + + uninstall: +- rm -fr $(docdir)/tui/VISU ++ rm -fr $(DESTDIR)$(docdir)/tui/VISU +--- salome-3.2.6/SMESH_SRC_3.2.6/Makefile.in~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/Makefile.in 2008-01-15 19:49:28.000000000 -0500 +@@ -236,24 +236,24 @@ + # @$(LT) --mode=finish $(libdir) + + install-include: $(include_list) +- $(INSTALL) -d $(includedir) ++ $(INSTALL) -d $(DESTDIR)$(includedir) + @for f in X $(include_list); do \ + if test $$f != X; then \ +- ($(INSTALL_DATA) -p $$f $(includedir)/. || exit 1); \ ++ ($(INSTALL_DATA) -p $$f $(DESTDIR)$(includedir)/. || exit 1); \ + fi; \ + done + + # install script in $(bindir) : + install-bin: $(BIN_SCRIPT) +- $(INSTALL) -d $(bindir) ++ $(INSTALL) -d $(DESTDIR)$(bindir) + if test $(BIN_SCRIPT)X != X; then \ +- $(INSTALL_PROGRAM) $^ $(bindir); \ ++ $(INSTALL_PROGRAM) $^ $(DESTDIR)$(bindir); \ + fi + + uninstall: uninstall-idl + + uninstall-idl: +- $(RM) $(idldir)/*.idl ++ $(RM) $(DESTDIR)$(idldir)/*.idl + + distclean: distclean-other + +--- salome-3.2.6/SMESH_SRC_3.2.6/idl/Makefile.in~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/idl/Makefile.in 2008-01-16 00:33:31.000000000 -0500 +@@ -70,15 +70,15 @@ + + # create directory $(idldir) and copy idl files into it + install-idl: $(IDL_FILES:%=$(top_builddir)/idl/salome/%) +- $(INSTALL) -d $(idldir) +- $(INSTALL_DATA) $^ $(idldir) ++ $(INSTALL) -d $(DESTDIR)$(idldir) ++ $(INSTALL_DATA) $^ $(DESTDIR)$(idldir) + + + install-pyidl: $(IDL_FILES:%=$(top_builddir)/idl/salome/%) +- $(INSTALL) -d $(PYTHON_SITE_INSTALL) ++ $(INSTALL) -d $(DESTDIR)$(PYTHON_SITE_INSTALL) + @for file in $^ dummy; do \ + if [ $$file != "dummy" ]; then \ +- $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(PYTHON_SITE_INSTALL) $$file ; \ ++ $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(DESTDIR)$(PYTHON_SITE_INSTALL) $$file ; \ + fi ; \ + done ; + +--- salome-3.2.6/SMESH_SRC_3.2.6/adm_local/unix/make_conclude.in~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/adm_local/unix/make_conclude.in 2008-01-16 21:07:09.000000000 -0500 +@@ -108,12 +108,12 @@ + # + PYTHON_SHARED_SITE=$(top_builddir)/lib@LIB_LOCATION_SUFFIX@/python$(PYTHON_VERSION)/site-packages/salome/shared_modules + +-$(PYTHON_SHARED_SITE): ++$(DESTDIR)$(PYTHON_SHARED_SITE): + $(INSTALL) -d $@ + +-DEST_SHAREDPYSCRIPTS = $(EXPORT_SHAREDPYSCRIPTS:%=$(PYTHON_SHARED_SITE)/%) +-sharedpyscripts: $(PYTHON_SHARED_SITE) $(DEST_SHAREDPYSCRIPTS) +-$(DEST_SHAREDPYSCRIPTS): $(PYTHON_SHARED_SITE)/%: % ++DEST_SHAREDPYSCRIPTS = $(EXPORT_SHAREDPYSCRIPTS:%=$(DESTDIR)$(PYTHON_SHARED_SITE)/%) ++sharedpyscripts: $(DESTDIR)$(PYTHON_SHARED_SITE) $(DEST_SHAREDPYSCRIPTS) ++$(DEST_SHAREDPYSCRIPTS): $(DESTDIR)$(PYTHON_SHARED_SITE)/%: % + cp -f $< $@ + + check: test +@@ -134,42 +134,42 @@ + resources: $(PO_FILES:%.po=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%.qm) + + # Make installation directories if they don't exist. +-$(libdir) $(includedir) $(bindir) $(datadir) $(idldir) $(sharedpydir): ++$(DESTDIR)$(libdir) $(DESTDIR)$(includedir) $(DESTDIR)$(bindir) $(DESTDIR)$(datadir) $(DESTDIR)$(idldir) $(DESTDIR)$(sharedpydir): + $(INSTALL) -d $@ && chmod 755 $@ + + # Install the library, the public header files, and programs. +-install: $(LIB) $(BIN) $(TEST_PROGS) $(libdir) $(includedir) $(bindir) $(datadir) $(idldir) install-python install-sharedpyqt install-qm ++install: $(LIB) $(BIN) $(TEST_PROGS) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) $(DESTDIR)$(bindir) $(DESTDIR)$(datadir) $(DESTDIR)$(idldir) install-python install-sharedpyqt install-qm + @for f in X $(LIB); do \ + if test $$f != X; then \ +- ($(LT_INSTALL_LIB) $$f $(libdir)/. || exit 1); \ ++ ($(LT_INSTALL_LIB) $$f $(DESTDIR)$(libdir)/. || exit 1); \ + fi; \ + done + @if ! test -z $(LIB_SWIG) ; then \ +- (cd $(libdir); ln -sf $(patsubst %.so, %cmodule.so, $(LIB_SWIG)) _$(LIB_SWIG) || true); \ ++ (cd $(DESTDIR)$(libdir); ln -sf $(patsubst %.so, %cmodule.so, $(LIB_SWIG)) _$(LIB_SWIG) || true); \ + fi; + @for f in X $(BIN); do \ + if test $$f != X; then \ +- ($(LT_INSTALL_PROG) $$f $(bindir)/. || exit 1); \ ++ ($(LT_INSTALL_PROG) $$f $(DESTDIR)$(bindir)/. || exit 1); \ + fi; \ + done + # Install tests programmes in bindir + @for f in X $(TEST_PROGS); do \ + if test $$f != X; then \ +- ($(LT_INSTALL_PROG) $$f $(bindir)/. || exit 1); \ ++ ($(LT_INSTALL_PROG) $$f $(DESTDIR)$(bindir)/. || exit 1); \ + fi; \ + done + # Install exported includes in includedir + @for f in X $(EXPORT_HEADERS:%=$(srcdir)/%); do \ + if test $$f != X; then \ +- (cp -p -f $$f $(includedir) || exit 1); \ ++ (cp -p -f $$f $(DESTDIR)$(includedir) || exit 1); \ + fi; \ + done + + # Install python script in $(bindir) +-install-python: $(bindir) $(EXPORT_PYSCRIPTS:%=install-%) ++install-python: $(DESTDIR)$(bindir) $(EXPORT_PYSCRIPTS:%=install-%) + + $(EXPORT_PYSCRIPTS:%=install-%): install-%: % +- $(INSTALL_PROGRAM) $< $(bindir)/. ++ $(INSTALL_PROGRAM) $< $(DESTDIR)$(bindir)/. + + #install-python: $(bindir) $(EXPORT_PYSCRIPTS) + # @for f in X $(EXPORT_PYSCRIPTS); do \ +@@ -179,18 +179,18 @@ + # done + + # Install pyqt script in $(install-sharedpyqt) +-install-sharedpyqt: $(sharedpydir) $(EXPORT_SHAREDPYSCRIPTS:%=install-%) ++install-sharedpyqt: $(DESTDIR)$(sharedpydir) $(EXPORT_SHAREDPYSCRIPTS:%=install-%) + + $(EXPORT_SHAREDPYSCRIPTS:%=install-%): install-%: % +- $(INSTALL_PROGRAM) $< $(sharedpydir)/. ++ $(INSTALL_PROGRAM) $< $(DESTDIR)$(sharedpydir)/. + + + # generic rule to install .qm files : + install-qm: resources +- $(INSTALL) -d $(datadir)/resources/$(MODULE_NAME) ++ $(INSTALL) -d $(DESTDIR)$(datadir)/resources/$(MODULE_NAME) + @for f in X $(PO_FILES:%.po=$(top_builddir)/share/salome/resources/$(MODULE_NAME)/%.qm); do \ + if test $$f != X; then \ +- ($(INSTALL_DATA) $$f $(datadir)/resources/$(MODULE_NAME)/. || exit 1); \ ++ ($(INSTALL_DATA) $$f $(DESTDIR)$(datadir)/resources/$(MODULE_NAME)/. || exit 1); \ + fi; \ + done + +@@ -198,43 +198,43 @@ + uninstall: + @if test "X$(LIB)" != X; then \ + for f in $(LIB); do \ +- $(LT_UNINSTALL) $(libdir)/$$f; \ ++ $(LT_UNINSTALL) $(DESTDIR)$(libdir)/$$f; \ + done; \ + fi + @if test "X$(BIN)" != X; then \ + for f in $(BIN); do \ +- $(LT_UNINSTALL) $(bindir)/$$f; \ ++ $(LT_UNINSTALL) $(DESTDIR)$(bindir)/$$f; \ + done; \ + fi + @for f in X $(TEST_PROGS); do \ + if test $$f != X; then \ +- $(LT_UNINSTALL) $(bindir)/$$f; \ ++ $(LT_UNINSTALL) $(DESTDIR)$(bindir)/$$f; \ + fi; \ + done + # Uninstall exported includes in includedir + @for f in X $(EXPORT_HEADERS); do \ + if test $$f != X; then \ +- $(LT_UNINSTALL) $(includedir)/$$f; \ ++ $(LT_UNINSTALL) $(DESTDIR)$(includedir)/$$f; \ + fi; \ + done + # Uninstall python script in $(bindir) + @for f in X $(EXPORT_PYSCRIPTS); do \ + if test $$f != X; then \ +- $(LT_UNINSTALL) $(bindir)/$$f ; \ ++ $(LT_UNINSTALL) $(DESTDIR)$(bindir)/$$f ; \ + fi; \ + done + + # Uninstall pyqt script in $(sharedpydir) + @for f in X $(EXPORT_SHAREDPYSCRIPTS); do \ + if test $$f != X; then \ +- $(LT_UNINSTALL) $(sharedpydir)/$$f ; \ ++ $(LT_UNINSTALL) $(DESTDIR)$(sharedpydir)/$$f ; \ + fi; \ + done + + # Uninstall qm files + @for f in X $(PO_FILES:%.po=%.qm); do \ + if test $$f != X; then \ +- $(LT_UNINSTALL) $(datadir)/resources/$(MODULE_NAME)/$$f ; \ ++ $(LT_UNINSTALL) $(DESTDIR)$(datadir)/resources/$(MODULE_NAME)/$$f ; \ + fi; \ + done + +--- salome-3.2.6/SMESH_SRC_3.2.6/doc/salome/gui/Makefile.in~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/doc/salome/gui/Makefile.in 2008-01-18 09:04:46.000000000 -0500 +@@ -42,9 +42,9 @@ + rm -fr SMESH + + install: +- mkdir -p $(docdir)/gui +- cp -rf SMESH $(docdir)/gui ++ mkdir -p $(DESTDIR)$(docdir)/gui ++ cp -rf SMESH $(DESTDIR)$(docdir)/gui + -find $(PWD) -name CVS -prune -exec rm -rf {} \; + + uninstall: +- rm -rf $(docdir)/gui/SMESH ++ rm -rf $(DESTDIR)$(docdir)/gui/SMESH +--- salome-3.2.6/SMESH_SRC_3.2.6/adm_local/Makefile.in~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/adm_local/Makefile.in 2008-01-18 09:08:55.000000000 -0500 +@@ -27,7 +27,7 @@ + all: resources + + install: +- cp -rf @top_srcdir@/adm_local @prefix@ ++ cp -rf @top_srcdir@/adm_local $(DESTDIR)@prefix@ + + bin: + +--- salome-3.2.6/SMESH_SRC_3.2.6/doc/salome/tui/Makefile.in~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/doc/salome/tui/Makefile.in 2008-01-18 15:53:59.000000000 -0500 +@@ -85,9 +85,9 @@ + rm -fr INPUT + + install: +- $(INSTALL) -d $(docdir); \ +- mkdir -p $(docdir)/tui +- cp -fr SMESH $(docdir)/tui ++ $(INSTALL) -d $(DESTDIR)$(docdir); \ ++ mkdir -p $(DESTDIR)$(docdir)/tui ++ cp -fr SMESH $(DESTDIR)$(docdir)/tui + + uninstall: +- rm -fr $(docdir)/tui/SMESH ++ rm -fr $(DESTDIR)$(docdir)/tui/SMESH +--- salome-3.2.6/COMPONENT_SRC_3.2.6/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/COMPONENT_SRC_3.2.6/Makefile.in 2008-01-15 19:50:34.000000000 -0500 +@@ -89,22 +89,22 @@ + # @$(LT) --mode=finish $(libdir) + + install-include: $(include_list) +- $(INSTALL) -d $(includedir) ++ $(INSTALL) -d $(DESTDIR)$(includedir) + @for f in X $(include_list); do \ + if test $$f != X; then \ +- ($(INSTALL_DATA) -p $$f $(includedir)/. || exit 1); \ ++ ($(INSTALL_DATA) -p $$f $(DESTDIR)$(includedir)/. || exit 1); \ + fi; \ + done + + # install script in $(bindir) : + install-bin: $(BIN_SCRIPT) +- $(INSTALL) -d $(bindir) +- $(INSTALL_PROGRAM) $^ $(bindir) ++ $(INSTALL) -d $(DESTDIR)$(bindir) ++ $(INSTALL_PROGRAM) $^ $(DESTDIR)$(bindir) + + uninstall: uninstall-idl + + uninstall-idl: +- $(RM) $(idldir)/*.idl ++ $(RM) $(DESTDIR)$(idldir)/*.idl + + distclean: distclean-other + +--- salome-3.2.6/COMPONENT_SRC_3.2.6/idl/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/COMPONENT_SRC_3.2.6/idl/Makefile.in 2008-01-16 00:34:23.000000000 -0500 +@@ -74,15 +74,15 @@ + + # create directory $(idldir) and copy idl files into it + install-idl: $(IDL_FILES:%=$(top_builddir)/idl/salome/%) +- $(INSTALL) -d $(idldir) +- $(INSTALL_DATA) $^ $(idldir) ++ $(INSTALL) -d $(DESTDIR)$(idldir) ++ $(INSTALL_DATA) $^ $(DESTDIR)$(idldir) + + + install-pyidl: $(IDL_FILES:%=$(top_builddir)/idl/salome/%) +- $(INSTALL) -d $(PYTHON_SITE_INSTALL) ++ $(INSTALL) -d $(DESTDIR)$(PYTHON_SITE_INSTALL) + @for file in $^ dummy; do \ + if [ $$file != "dummy" ]; then \ +- $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(PYTHON_SITE_INSTALL) $$file ; \ ++ $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(DESTDIR)$(PYTHON_SITE_INSTALL) $$file ; \ + fi ; \ + done ; + +--- salome-3.2.6/COMPONENT_SRC_3.2.6/adm_local/unix/make_conclude.in~ 2008-01-17 13:29:12.000000000 -0500 ++++ salome-3.2.6/COMPONENT_SRC_3.2.6/adm_local/unix/make_conclude.in 2008-01-17 13:29:50.000000000 -0500 +@@ -134,42 +134,42 @@ + resources: $(PO_FILES:%.po=$(top_builddir)/share/salome/resources/${MODULE_NAME}/%.qm) + + # Make installation directories if they don't exist. +-$(libdir) $(includedir) $(bindir) $(datadir) $(idldir) $(sharedpydir): ++$(DESTDIR)$(libdir) $(DESTDIR)$(includedir) $(DESTDIR)$(bindir) $(DESTDIR)$(datadir) $(DESTDIR)$(idldir) $(DESTDIR)$(sharedpydir): + $(INSTALL) -d $@ && chmod 755 $@ + + # Install the library, the public header files, and programs. +-install: $(LIB) $(BIN) $(TEST_PROGS) $(libdir) $(includedir) $(bindir) $(datadir) $(idldir) install-python install-sharedpyqt install-qm ++install: $(LIB) $(BIN) $(TEST_PROGS) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) $(DESTDIR)$(bindir) $(DESTDIR)$(datadir) $(DESTDIR)$(idldir) install-python install-sharedpyqt install-qm + @for f in X $(LIB); do \ + if test $$f != X; then \ +- ($(LT_INSTALL_LIB) $$f $(libdir)/. || exit 1); \ ++ ($(LT_INSTALL_LIB) $$f $(DESTDIR)$(libdir)/. || exit 1); \ + fi; \ + done + @if test "X$(LIB_SWIG)" != "X"; then \ +- (cd $(libdir); ln -sf $(patsubst %.so, %cmodule.so, $(LIB_SWIG)) _$(LIB_SWIG) || true); \ ++ (cd $(DESTDIR)$(libdir); ln -sf $(patsubst %.so, %cmodule.so, $(LIB_SWIG)) _$(LIB_SWIG) || true); \ + fi; + @for f in X $(BIN); do \ + if test $$f != X; then \ +- ($(LT_INSTALL_PROG) $$f $(bindir)/. || exit 1); \ ++ ($(LT_INSTALL_PROG) $$f $(DESTDIR)$(bindir)/. || exit 1); \ + fi; \ + done + # Install tests programmes in bindir + @for f in X $(TEST_PROGS); do \ + if test $$f != X; then \ +- ($(LT_INSTALL_PROG) $$f $(bindir)/. || exit 1); \ ++ ($(LT_INSTALL_PROG) $$f $(DESTDIR)$(bindir)/. || exit 1); \ + fi; \ + done + # Install exported includes in includedir + @for f in X $(EXPORT_HEADERS:%=$(srcdir)/%); do \ + if test $$f != X; then \ +- (cp -p -f $$f $(includedir) || exit 1); \ ++ (cp -p -f $$f $(DESTDIR)$(includedir) || exit 1); \ + fi; \ + done + + # Install python script in $(bindir) +-install-python: $(bindir) $(EXPORT_PYSCRIPTS:%=install-%) ++install-python: $(DESTDIR)$(bindir) $(EXPORT_PYSCRIPTS:%=install-%) + + $(EXPORT_PYSCRIPTS:%=install-%): install-%: % +- $(INSTALL_PROGRAM) $< $(bindir)/. ++ $(INSTALL_PROGRAM) $< $(DESTDIR)$(bindir)/. + + #install-python: $(bindir) $(EXPORT_PYSCRIPTS) + # @for f in X $(EXPORT_PYSCRIPTS); do \ +@@ -179,18 +179,18 @@ + # done + + # Install pyqt script in $(install-sharedpyqt) +-install-sharedpyqt: $(sharedpydir) $(EXPORT_SHAREDPYSCRIPTS:%=install-%) ++install-sharedpyqt: $(DESTDIR)$(sharedpydir) $(EXPORT_SHAREDPYSCRIPTS:%=install-%) + + $(EXPORT_SHAREDPYSCRIPTS:%=install-%): install-%: % +- $(INSTALL_PROGRAM) $< $(sharedpydir)/. ++ $(INSTALL_PROGRAM) $< $(DESTDIR)$(sharedpydir)/. + + + # generic rule to install .qm files : + install-qm: resources +- $(INSTALL) -d $(datadir)/resources/${MODULE_NAME} ++ $(INSTALL) -d $(DESTDIR)$(datadir)/resources/${MODULE_NAME} + @for f in X $(PO_FILES:%.po=$(top_builddir)/share/salome/resources/${MODULE_NAME}/%.qm); do \ + if test $$f != X; then \ +- ($(INSTALL_DATA) $$f $(datadir)/resources/${MODULE_NAME}/. || exit 1); \ ++ ($(INSTALL_DATA) $$f $(DESTDIR)$(datadir)/resources/${MODULE_NAME}/. || exit 1); \ + fi; \ + done + +@@ -198,43 +198,43 @@ + uninstall: + @if test "X$(LIB)" != X; then \ + for f in $(LIB); do \ +- $(LT_UNINSTALL) $(libdir)/$$f; \ ++ $(LT_UNINSTALL) $(DESTDIR)$(libdir)/$$f; \ + done; \ + fi + @if test "X$(BIN)" != X; then \ + for f in $(BIN); do \ +- $(LT_UNINSTALL) $(bindir)/$$f; \ ++ $(LT_UNINSTALL) $(DESTDIR)$(bindir)/$$f; \ + done; \ + fi + @for f in X $(TEST_PROGS); do \ + if test $$f != X; then \ +- $(LT_UNINSTALL) $(bindir)/$$f; \ ++ $(LT_UNINSTALL) $(DESTDIR)$(bindir)/$$f; \ + fi; \ + done + # Uninstall exported includes in includedir + @for f in X $(EXPORT_HEADERS); do \ + if test $$f != X; then \ +- $(LT_UNINSTALL) $(includedir)/$$f; \ ++ $(LT_UNINSTALL) $(DESTDIR)$(includedir)/$$f; \ + fi; \ + done + # Uninstall python script in $(bindir) + @for f in X $(EXPORT_PYSCRIPTS); do \ + if test $$f != X; then \ +- $(LT_UNINSTALL) $(bindir)/$$f ; \ ++ $(LT_UNINSTALL) $(DESTDIR)$(bindir)/$$f ; \ + fi; \ + done + + # Uninstall pyqt script in $(sharedpydir) + @for f in X $(EXPORT_SHAREDPYSCRIPTS); do \ + if test $$f != X; then \ +- $(LT_UNINSTALL) $(sharedpydir)/$$f ; \ ++ $(LT_UNINSTALL) $(DESTDIR)$(sharedpydir)/$$f ; \ + fi; \ + done + + # Uninstall qm files + @for f in X $(PO_FILES:%.po=%.qm); do \ + if test $$f != X; then \ +- $(LT_UNINSTALL) $(datadir)/resources/$(MODULE_NAME)/$$f ; \ ++ $(LT_UNINSTALL) $(DESTDIR)$(datadir)/resources/$(MODULE_NAME)/$$f ; \ + fi; \ + done + +--- salome-3.2.6/COMPONENT_SRC_3.2.6/adm_local/Makefile.in~ 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/COMPONENT_SRC_3.2.6/adm_local/Makefile.in 2008-01-17 14:14:12.000000000 -0500 +@@ -26,7 +26,7 @@ + all: resources + + install: +- cp -rf @top_srcdir@/adm_local @prefix@ ++ cp -rf @top_srcdir@/adm_local $(DESTDIR)@prefix@ + + bin: + +--- salome-3.2.6/CALCULATOR_SRC_3.2.6/Makefile.in~ 2007-04-24 12:41:05.000000000 -0400 ++++ salome-3.2.6/CALCULATOR_SRC_3.2.6/Makefile.in 2008-01-15 19:51:29.000000000 -0500 +@@ -91,22 +91,22 @@ + # @$(LT) --mode=finish $(libdir) + + install-include: $(include_list) +- $(INSTALL) -d $(includedir) ++ $(INSTALL) -d $(DESTDIR)$(includedir) + @for f in X $(include_list); do \ + if test $$f != X; then \ +- ($(INSTALL_DATA) $$f $(includedir)/. || exit 1); \ ++ ($(INSTALL_DATA) $$f $(DESTDIR)$(includedir)/. || exit 1); \ + fi; \ + done + + # install script in $(bindir) : + install-bin: $(BIN_SCRIPT) +- $(INSTALL) -d $(bindir) +- $(INSTALL_PROGRAM) $^ $(bindir) ++ $(INSTALL) -d $(DESTDIR)$(bindir) ++ $(INSTALL_PROGRAM) $^ $(DESTDIR)$(bindir) + + uninstall: uninstall-idl + + uninstall-idl: +- $(RM) $(idldir)/*.idl ++ $(RM) $(DESTDIR)$(idldir)/*.idl + + distclean: distclean-other + +--- salome-3.2.6/CALCULATOR_SRC_3.2.6/idl/Makefile.in~ 2007-04-24 12:41:05.000000000 -0400 ++++ salome-3.2.6/CALCULATOR_SRC_3.2.6/idl/Makefile.in 2008-01-16 00:35:16.000000000 -0500 +@@ -56,17 +56,17 @@ + + # create directory $(idldir) and copy idl files into it + install-idl: $(IDL_FILES) +- $(INSTALL) -d $(idldir) +- cp -fp $^ $(idldir) ++ $(INSTALL) -d $(DESTDIR)$(idldir) ++ cp -fp $^ $(DESTDIR)$(idldir) + + OMNIORB_IDLCXXFLAGS+=-I${MED_ROOT_DIR}/idl/salome + OMNIORB_IDLPYFLAGS+=-I${MED_ROOT_DIR}/idl/salome + + install-pyidl: $(IDL_FILES) +- $(INSTALL) -d $(PYTHON_SITE_INSTALL) ++ $(INSTALL) -d $(DESTDIR)$(PYTHON_SITE_INSTALL) + @for file in $^ dummy; do \ + if [ $$file != "dummy" ]; then \ +- $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(PYTHON_SITE_INSTALL) $$file ; \ ++ $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(DESTDIR)$(PYTHON_SITE_INSTALL) $$file ; \ + fi ; \ + done ; + +--- salome-3.2.6/CALCULATOR_SRC_3.2.6/adm_local/Makefile.in~ 2007-04-24 12:41:05.000000000 -0400 ++++ salome-3.2.6/CALCULATOR_SRC_3.2.6/adm_local/Makefile.in 2008-01-17 09:33:29.000000000 -0500 +@@ -26,7 +26,7 @@ + all: resources + + install: +- cp -rf @top_srcdir@/adm_local @prefix@ ++ cp -rf @top_srcdir@/adm_local $(DESTDIR)@prefix@ + + bin: + +--- salome-3.2.6/PYCALCULATOR_SRC_3.2.6/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/PYCALCULATOR_SRC_3.2.6/Makefile.in 2008-01-15 19:52:29.000000000 -0500 +@@ -88,24 +88,24 @@ + # @$(LT) --mode=finish $(libdir) + + install-include: $(include_list) +- $(INSTALL) -d $(includedir) ++ $(INSTALL) -d $(DESTDIR)$(includedir) + @for f in X $(include_list); do \ + if test $$f != X; then \ +- ($(INSTALL_DATA) $$f $(includedir)/. || exit 1); \ ++ ($(INSTALL_DATA) $$f $(DESTDIR)$(includedir)/. || exit 1); \ + fi; \ + done + + # install script in $(bindir) : + install-bin: $(BIN_SCRIPT) +- $(INSTALL) -d $(bindir) ++ $(INSTALL) -d $(DESTDIR)$(bindir) + if test $(BIN_SCRIPT)X != X; then \ +- $(INSTALL_PROGRAM) $^ $(bindir); \ ++ $(INSTALL_PROGRAM) $^ $(DESTDIR)$(bindir); \ + fi + + uninstall: uninstall-idl + + uninstall-idl: +- $(RM) $(idldir)/*.idl ++ $(RM) $(DESTDIR)$(idldir)/*.idl + + distclean: distclean-other + +--- salome-3.2.6/PYCALCULATOR_SRC_3.2.6/idl/Makefile.in~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/PYCALCULATOR_SRC_3.2.6/idl/Makefile.in 2008-01-16 00:36:04.000000000 -0500 +@@ -59,15 +59,15 @@ + + # create directory $(idldir) and copy idl files into it + install-idl: $(IDL_FILES) +- $(INSTALL) -d $(idldir) +- $(INSTALL_DATA) $^ $(idldir) ++ $(INSTALL) -d $(DESTDIR)$(idldir) ++ $(INSTALL_DATA) $^ $(DESTDIR)$(idldir) + + + install-pyidl: $(IDL_FILES) +- $(INSTALL) -d $(PYTHON_SITE_INSTALL) ++ $(INSTALL) -d $(DESTDIR)$(PYTHON_SITE_INSTALL) + @for file in $^ dummy; do \ + if [ $$file != "dummy" ]; then \ +- $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(PYTHON_SITE_INSTALL) $$file ; \ ++ $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(DESTDIR)$(PYTHON_SITE_INSTALL) $$file ; \ + fi ; \ + done ; + +--- salome-3.2.6/SIERPINSKY_SRC_3.2.6/Makefile.in~ 2006-06-01 07:50:02.000000000 -0400 ++++ salome-3.2.6/SIERPINSKY_SRC_3.2.6/Makefile.in 2008-01-15 19:53:35.000000000 -0500 +@@ -78,22 +78,22 @@ + # @$(LT) --mode=finish $(libdir) + + install-include: $(include_list) +- $(INSTALL) -d $(includedir) ++ $(INSTALL) -d $(DESTDIR)$(includedir) + @for f in X $(include_list); do \ + if test $$f != X; then \ +- ($(INSTALL_DATA) -p $$f $(includedir)/. || exit 1); \ ++ ($(INSTALL_DATA) -p $$f $(DESTDIR)$(includedir)/. || exit 1); \ + fi; \ + done + + # install script in $(bindir) : + install-bin: $(BIN_SCRIPT) +- $(INSTALL) -d $(bindir) +- $(INSTALL_PROGRAM) $^ $(bindir) ++ $(INSTALL) -d $(DESTDIR)$(bindir) ++ $(INSTALL_PROGRAM) $^ $(DESTDIR)$(bindir) + + uninstall: uninstall-idl + + uninstall-idl: +- $(RM) $(idldir)/*.idl ++ $(RM) $(DESTDIR)$(idldir)/*.idl + + distclean: distclean-other + +--- salome-3.2.6/SIERPINSKY_SRC_3.2.6/idl/Makefile.in~ 2006-06-01 07:50:03.000000000 -0400 ++++ salome-3.2.6/SIERPINSKY_SRC_3.2.6/idl/Makefile.in 2008-01-16 00:36:51.000000000 -0500 +@@ -46,15 +46,15 @@ + + # create directory $(idldir) and copy idl files into it + install-idl: $(IDL_FILES:%=$(top_builddir)/idl/salome/%) +- $(INSTALL) -d $(idldir) +- $(INSTALL_DATA) $^ $(idldir) ++ $(INSTALL) -d $(DESTDIR)$(idldir) ++ $(INSTALL_DATA) $^ $(DESTDIR)$(idldir) + + + install-pyidl: $(IDL_FILES:%=$(top_builddir)/idl/salome/%) +- $(INSTALL) -d $(PYTHON_SITE_INSTALL) ++ $(INSTALL) -d $(DESTDIR)$(PYTHON_SITE_INSTALL) + @for file in $^ dummy; do \ + if [ $$file != "dummy" ]; then \ +- $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(PYTHON_SITE_INSTALL) $$file ; \ ++ $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(DESTDIR)$(PYTHON_SITE_INSTALL) $$file ; \ + fi ; \ + done ; + +--- salome-3.2.6/SIERPINSKY_SRC_3.2.6/adm_local/Makefile.in~ 2006-05-06 05:02:02.000000000 -0400 ++++ salome-3.2.6/SIERPINSKY_SRC_3.2.6/adm_local/Makefile.in 2008-01-17 14:47:50.000000000 -0500 +@@ -27,7 +27,7 @@ + all: resources + + install: +- cp -rf @top_srcdir@/adm_local @prefix@ ++ cp -rf @top_srcdir@/adm_local $(DESTDIR)@prefix@ + + bin: + +--- salome-3.2.6/GHS3DPLUGIN_SRC_3.2.6/Makefile.in~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/GHS3DPLUGIN_SRC_3.2.6/Makefile.in 2008-01-15 19:54:41.000000000 -0500 +@@ -77,18 +77,18 @@ + $(LN_S) ../../$< $@ + + install-include: $(include_list) +- $(INSTALL) -d $(includedir) ++ $(INSTALL) -d $(DESTDIR)$(includedir) + @for f in X $(include_list); do \ + if test $$f != X; then \ +- ($(INSTALL_DATA) -p $$f $(includedir)/. || exit 1); \ ++ ($(INSTALL_DATA) -p $$f $(DESTDIR)$(includedir)/. || exit 1); \ + fi; \ + done + + # install script in $(bindir) : + install-bin: $(BIN_SCRIPT) +- $(INSTALL) -d $(bindir) ++ $(INSTALL) -d $(DESTDIR)$(bindir) + if test $(BIN_SCRIPT)X != X; then \ +- $(INSTALL_PROGRAM) $^ $(bindir); \ ++ $(INSTALL_PROGRAM) $^ $(DESTDIR)$(bindir); \ + fi + + # CLEAN -------------------- +--- salome-3.2.6/xdata-0.5.49/adm/unix/make_end.am~ 2008-01-15 19:59:11.000000000 -0500 ++++ salome-3.2.6/xdata-0.5.49/adm/unix/make_end.am 2008-01-16 21:12:44.000000000 -0500 +@@ -173,17 +173,17 @@ + # copy idl compilation in $(pkgpythondir) + # --------------------------------------------- + +-install-idl: $(prefix)/idl/salome $(IDL_LIST:%=$(prefix)/idl/salome/%); ++install-idl: $(DESTDIR)$(prefix)/idl/salome $(IDL_LIST:%=$(DESTDIR)$(prefix)/idl/salome/%); + +-$(prefix)/idl/salome: ++$(DESTDIR)$(prefix)/idl/salome: + $(INSTALL) -d $@ + +-$(IDL_LIST:%=$(prefix)/idl/salome/%): $(prefix)/idl/salome/%: % ++$(IDL_LIST:%=$(DESTDIR)$(prefix)/idl/salome/%): $(DESTDIR)$(prefix)/idl/salome/%: % + cp -f $< $@ + + install-compiled-idl: + @if test -d .idls ; then \ +- cp -rf .idls/* $(pkgpythondir)/. ;\ ++ cp -rf .idls/* $(DESTDIR)$(pkgpythondir)/. ;\ + fi + + # ------------------------------------------------------------------- +@@ -193,15 +193,15 @@ + SALOME_RESOURCES_INSTALL_DIR = $(prefix)/share/salome/resources + SALOME_RESOURCES_LIST = $(RESOURCES_LIST) $(XDATA_RESOURCES) + +-install-salome-resources: $(SALOME_RESOURCES_INSTALL_DIR) \ ++install-salome-resources: $(DESTDIR)$(SALOME_RESOURCES_INSTALL_DIR) \ + xdata-png-qm \ +- $(SALOME_RESOURCES_LIST:%=$(SALOME_RESOURCES_INSTALL_DIR)/%) \ ++ $(SALOME_RESOURCES_LIST:%=$(DESTDIR)$(SALOME_RESOURCES_INSTALL_DIR)/%) \ + salome-app-xml ; + +-$(SALOME_RESOURCES_INSTALL_DIR): ++$(DESTDIR)$(SALOME_RESOURCES_INSTALL_DIR): + $(INSTALL) -d $@ + +-$(SALOME_RESOURCES_LIST:%=$(SALOME_RESOURCES_INSTALL_DIR)/%): $(SALOME_RESOURCES_INSTALL_DIR)/%: % ++$(SALOME_RESOURCES_LIST:%=$(DESTDIR)$(SALOME_RESOURCES_INSTALL_DIR)/%): $(DESTDIR)$(SALOME_RESOURCES_INSTALL_DIR)/%: % + cp -rf $< $@ + + xdata-png-qm: +@@ -219,15 +219,15 @@ + fff=$(top_srcdir)/xdata2salome/XDATA$$suffix ; \ + fi ; \ + fi ; \ +- cp -f $$fff $(SALOME_RESOURCES_INSTALL_DIR)/$$f ; \ ++ cp -f $$fff $(DESTDIR)$(SALOME_RESOURCES_INSTALL_DIR)/$$f ; \ + done ; \ + done + + salome-app-xml: + @if test X = X ; then \ +- target=$(SALOME_RESOURCES_INSTALL_DIR)/SalomeApp.xml ; \ ++ target=$(DESTDIR)$(SALOME_RESOURCES_INSTALL_DIR)/SalomeApp.xml ; \ + suffix="_en.xml" ; \ +- l=`ls -1 $(SALOME_RESOURCES_INSTALL_DIR)/*$${suffix} | awk -F "/" '{print $$NF}' | awk -F "$${suffix}" '{print $$1}'` ; \ ++ l=`ls -1 $(DESTDIR)$(SALOME_RESOURCES_INSTALL_DIR)/*$${suffix} | awk -F "/" '{print $$NF}' | awk -F "$${suffix}" '{print $$1}'` ; \ + echo "" > $$target ; \ + echo "" >> $$target ; \ + for mod in X $$l ; do \ +@@ -252,14 +252,14 @@ + # in $(pkgpythondir)/shared_modules + # ------------------------------------------------------------------- + +-$(pkgpythondir)/shared_modules: ++$(DESTDIR)$(pkgpythondir)/shared_modules: + $(INSTALL) -d $@ + +-$(XDATA_SALOME_SHARED_MODULES_PY_FILES:%=$(pkgpythondir)/shared_modules/%): $(pkgpythondir)/shared_modules/%: % ++$(XDATA_SALOME_SHARED_MODULES_PY_FILES:%=$(DESTDIR)$(pkgpythondir)/shared_modules/%): $(DESTDIR)$(pkgpythondir)/shared_modules/%: % + cp -f $< $@ + +-install-salome-shared-modules-files: $(pkgpythondir)/shared_modules \ +- $(XDATA_SALOME_SHARED_MODULES_PY_FILES:%=$(pkgpythondir)/shared_modules/%) ++install-salome-shared-modules-files: $(DESTDIR)$(pkgpythondir)/shared_modules \ ++ $(XDATA_SALOME_SHARED_MODULES_PY_FILES:%=$(DESTDIR)$(pkgpythondir)/shared_modules/%) + + # ----------------------------------------------------------------- + # Automake "make install" targets +@@ -306,7 +306,7 @@ + # -- + # Remove the .dummy.py installation part + # -- +- @rm -f $(pkgpythondir)/.dummy.* ++ @rm -f $(DESTDIR)$(pkgpythondir)/.dummy.* + + # --------------------------------------------- + # --------------------------------------------- +@@ -325,7 +325,7 @@ + cp -f $(srcdir)/$@.py . > /dev/null ; \ + fi ; \ + cmd='' ; \ +- cmd=$$cmd"env PYTHONPATH=$(pkgpythondir):$(PYTHONPATH)" ; \ ++ cmd=$$cmd"env PYTHONPATH=$(DESTDIR)$(pkgpythondir):$(PYTHONPATH)" ; \ + for f in X $(XDATA_FILES_NOTDIR) ; do \ + if test $$f = X ; then continue ; fi ; \ + component_name=`basename $$f _xdata.py` ; \ +--- salome-3.2.6/xdata-0.5.49/src/XDATA/Makefile.am~ 2005-09-15 11:24:37.000000000 -0400 ++++ salome-3.2.6/xdata-0.5.49/src/XDATA/Makefile.am 2008-01-16 21:09:46.000000000 -0500 +@@ -28,7 +28,7 @@ + @if test $(PYTHON_VERSION) = 2.2 ; then \ + python_minor_release=`$(PYTHON) -c "import sys ; print sys.version.split()[0].split('.')[2]"` ; \ + if test $$python_minor_release -ge 3 ; then \ +- rm -f $(pkgpythondir)/copy.* ; \ ++ rm -f $(DESTDIR)$(pkgpythondir)/copy.* ; \ + fi ; \ + fi + +--- salome-3.2.6/xdata-0.5.49/src/XDATA2SALOME/Makefile.am~ 2005-09-15 11:24:39.000000000 -0400 ++++ salome-3.2.6/xdata-0.5.49/src/XDATA2SALOME/Makefile.am 2008-01-17 12:27:13.000000000 -0500 +@@ -18,21 +18,21 @@ + XDATA2SALOME_DIR = $(prefix)/share/$(PACKAGE)/salome + SRCDIR_LIST = XDATA_icons.qm XDATA_msg_en.qm XDATA.png + +-INSTALL_DATA_LOCAL = $(XDATA2SALOME_DIR) +-INSTALL_DATA_LOCAL += $(SRCDIR_LIST:%=$(XDATA2SALOME_DIR)/%) ++INSTALL_DATA_LOCAL = $(DESTDIR)$(XDATA2SALOME_DIR) ++INSTALL_DATA_LOCAL += $(SRCDIR_LIST:%=$(DESTDIR)$(XDATA2SALOME_DIR)/%) + +-$(XDATA2SALOME_DIR): ++$(DESTDIR)$(XDATA2SALOME_DIR): + $(INSTALL) -d $@ + +-$(SRCDIR_LIST:%=$(XDATA2SALOME_DIR)/%): $(XDATA2SALOME_DIR)/%: % ++$(SRCDIR_LIST:%=$(DESTDIR)$(XDATA2SALOME_DIR)/%): $(DESTDIR)$(XDATA2SALOME_DIR)/%: % + cp -f $< $@ + + DIST_HOOK = dist-copy + + dist-copy: +- cp -f $(srcdir)/*.idl $(distdir)/. ++ cp -f $(srcdir)/*.idl $(DESTDIR)$(distdir)/. + for f in $(SRCDIR_LIST) ; do \ +- cp -f $(srcdir)/$$f $(distdir)/. ; \ ++ cp -f $(srcdir)/$$f $(DESTDIR)$(distdir)/. ; \ + done + + # +--- salome-3.2.6/xdata-0.5.49/templates/Makefile.am~ 2005-09-15 11:24:41.000000000 -0400 ++++ salome-3.2.6/xdata-0.5.49/templates/Makefile.am 2008-01-17 18:53:43.000000000 -0500 +@@ -39,34 +39,34 @@ + # INSTALL + + INSTALL_DATA_LOCAL = install-templates +-INSTALL_DATA_LOCAL += $(XDATA2SALOME_DIR) +-INSTALL_DATA_LOCAL += $(SRCDIR_FILES:%=$(XDATA2SALOME_DIR)/%) +-INSTALL_DATA_LOCAL += $(TOP_SRCDIR_LIST:%=$(XDATA2SALOME_DIR)/%) +-INSTALL_DATA_LOCAL += $(AM_LIST:%=$(XDATA2SALOME_DIR)/%) +-INSTALL_DATA_LOCAL += $(M4_LIST:%=$(XDATA2SALOME_DIR)/%) ++INSTALL_DATA_LOCAL += $(DESTDIR)$(XDATA2SALOME_DIR) ++INSTALL_DATA_LOCAL += $(SRCDIR_FILES:%=$(DESTDIR)$(XDATA2SALOME_DIR)/%) ++INSTALL_DATA_LOCAL += $(TOP_SRCDIR_LIST:%=$(DESTDIR)$(XDATA2SALOME_DIR)/%) ++INSTALL_DATA_LOCAL += $(AM_LIST:%=$(DESTDIR)$(XDATA2SALOME_DIR)/%) ++INSTALL_DATA_LOCAL += $(M4_LIST:%=$(DESTDIR)$(XDATA2SALOME_DIR)/%) + +-$(prefix)/share/$(PACKAGE)/templates: ++$(DESTDIR)$(prefix)/share/$(PACKAGE)/templates: + $(INSTALL) -d $@ + +-$(XDATA2SALOME_DIR): ++$(DESTDIR)$(XDATA2SALOME_DIR): + $(INSTALL) -d $@ + +-$(SRCDIR_FILES:%=$(XDATA2SALOME_DIR)/%): $(XDATA2SALOME_DIR)/%: % ++$(SRCDIR_FILES:%=$(DESTDIR)$(XDATA2SALOME_DIR)/%): $(DESTDIR)$(XDATA2SALOME_DIR)/%: % + cp -f $< $@ + +-$(TOP_SRCDIR_LIST:%=$(XDATA2SALOME_DIR)/%): $(XDATA2SALOME_DIR)/%: $(top_srcdir)/% ++$(TOP_SRCDIR_LIST:%=$(DESTDIR)$(XDATA2SALOME_DIR)/%): $(DESTDIR)$(XDATA2SALOME_DIR)/%: $(top_srcdir)/% + cp -f $< $@ + +-$(AM_LIST:%=$(XDATA2SALOME_DIR)/%): $(XDATA2SALOME_DIR)/%: $(top_srcdir)/adm/unix/% ++$(AM_LIST:%=$(DESTDIR)$(XDATA2SALOME_DIR)/%): $(DESTDIR)$(XDATA2SALOME_DIR)/%: $(top_srcdir)/adm/unix/% + cp -f $< $@ + +-$(M4_LIST:%=$(XDATA2SALOME_DIR)/%): $(XDATA2SALOME_DIR)/%: $(top_srcdir)/adm/unix/config_files/% ++$(M4_LIST:%=$(DESTDIR)$(XDATA2SALOME_DIR)/%): $(DESTDIR)$(XDATA2SALOME_DIR)/%: $(top_srcdir)/adm/unix/config_files/% + cp -f $< $@ + +-install-templates: $(prefix)/share/$(PACKAGE)/templates ++install-templates: $(DESTDIR)$(prefix)/share/$(PACKAGE)/templates + for d in $(SRCDIR_LIST) ; do \ +- rm -rf $(prefix)/share/$(PACKAGE)/templates/$$d ; \ +- cp -rf $(srcdir)/$$d $(prefix)/share/$(PACKAGE)/templates/. ; \ ++ rm -rf $(DESTDIR)$(prefix)/share/$(PACKAGE)/templates/$$d ; \ ++ cp -rf $(srcdir)/$$d $(DESTDIR)$(prefix)/share/$(PACKAGE)/templates/. ; \ + done + + # DIST +--- salome-3.2.6/xdata-0.5.49/doc/Makefile.am~ 2006-10-03 06:47:41.000000000 -0400 ++++ salome-3.2.6/xdata-0.5.49/doc/Makefile.am 2008-01-17 18:55:38.000000000 -0500 +@@ -55,10 +55,10 @@ + INSTALL_DATA_LOCAL = install-doc + + install-doc: +- if test `( cd $(prefix) && pwd )` != `( cd @abs_top_builddir@ && pwd )` ; then \ +- rm -rf $(prefix)/share/doc/@PACKAGE@-@RELEASE@ ; \ +- mkdir -p $(prefix)/share/doc > /dev/null ; \ +- cp -r $(DOC_BUILD_SITE) $(prefix)/share/doc/. ; \ ++ if test `( cd $(DESTDIR)$(prefix) && pwd )` != `( cd @abs_top_builddir@ && pwd )` ; then \ ++ rm -rf $(DESTDIR)$(prefix)/share/doc/@PACKAGE@-@RELEASE@ ; \ ++ mkdir -p $(DESTDIR)$(prefix)/share/doc > /dev/null ; \ ++ cp -r $(DOC_BUILD_SITE) $(DESTDIR)$(prefix)/share/doc/. ; \ + fi + + DIST_HOOK = dist-doc +--- salome-3.2.6/xdata-0.5.49/Makefile.am~ 2006-10-16 06:40:00.000000000 -0400 ++++ salome-3.2.6/xdata-0.5.49/Makefile.am 2008-01-17 18:59:43.000000000 -0500 +@@ -18,9 +18,9 @@ + INSTALL_DATA_LOCAL = install-release-notes + + install-release-notes: +- if test `( cd $(prefix) && pwd )` != `( cd @abs_top_builddir@ && pwd )` ; then \ +- mkdir -p $(prefix)/share/doc/@PACKAGE@-@RELEASE@ > /dev/null ; \ +- cp -f $(srcdir)/ReleaseNotes $(prefix)/share/doc/@PACKAGE@-@RELEASE@/. ; \ ++ if test `( cd $(DESTDIR)$(prefix) && pwd )` != `( cd @abs_top_builddir@ && pwd )` ; then \ ++ mkdir -p $(DESTDIR)$(prefix)/share/doc/@PACKAGE@-@RELEASE@ > /dev/null ; \ ++ cp -f $(srcdir)/ReleaseNotes $(DESTDIR)$(prefix)/share/doc/@PACKAGE@-@RELEASE@/. ; \ + fi + + DIST_HOOK = xdata-dist-clean XDATA_ROOT-clean +--- salome-3.2.6/NETGENPLUGIN_SRC_3.2.6/Makefile.in~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/NETGENPLUGIN_SRC_3.2.6/Makefile.in 2008-01-21 10:27:17.000000000 -0500 +@@ -87,18 +87,18 @@ + $(LN_S) ../../$< $@ + + install-include: $(include_list) +- $(INSTALL) -d $(includedir) ++ $(INSTALL) -d $(DESTDIR)$(includedir) + @for f in X $(include_list); do \ + if test $$f != X; then \ +- ($(INSTALL_DATA) -p $$f $(includedir)/. || exit 1); \ ++ ($(INSTALL_DATA) -p $$f $(DESTDIR)$(includedir)/. || exit 1); \ + fi; \ + done + + # install script in $(bindir) : + install-bin: $(BIN_SCRIPT) +- $(INSTALL) -d $(bindir) ++ $(INSTALL) -d $(DESTDIR)$(bindir) + if test $(BIN_SCRIPT)X != X; then \ +- $(INSTALL_PROGRAM) $^ $(bindir); \ ++ $(INSTALL_PROGRAM) $^ $(DESTDIR)$(bindir); \ + fi + + # CLEAN -------------------- +--- salome-3.2.6/NETGENPLUGIN_SRC_3.2.6/idl/Makefile.in~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/NETGENPLUGIN_SRC_3.2.6/idl/Makefile.in 2008-01-21 10:28:24.000000000 -0500 +@@ -59,17 +59,17 @@ + + # install python client (generated from idl file) + install: $(IDL_FILES:%=$(top_builddir)/idl/salome/%) +- $(INSTALL) -d $(idldir) $(PYTHON_SITE_INSTALL) +- $(INSTALL_DATA) $^ $(idldir) ++ $(INSTALL) -d $(DESTDIR)$(idldir) $(DESTDIR)$(PYTHON_SITE_INSTALL) ++ $(INSTALL_DATA) $^ $(DESTDIR)$(idldir) + @for file in $^ dummy; do \ + if [ $$file != "dummy" ]; then \ +- $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(PYTHON_SITE_INSTALL) $$file ; \ ++ $(OMNIORB_IDL) $(OMNIORB_IDLPYFLAGS) -C$(DESTDIR)$(PYTHON_SITE_INSTALL) $$file ; \ + fi ; \ + done ; + + uninstall: +- -$(RM) $(IDL_FILES:%=$(idldir)/%) +- -$(RM) $(IDL_FILES:%.idl=$(PYTHON_SITE_INSTALL)/%_idl.py) ++ -$(RM) $(IDL_FILES:%=$(DESTDIR)$(idldir)/%) ++ -$(RM) $(IDL_FILES:%.idl=$(DESTDIR)$(PYTHON_SITE_INSTALL)/%_idl.py) + + # clean + cleandep: +--- salome-3.2.6/NETGENPLUGIN_SRC_3.2.6/adm_local/Makefile.in~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/NETGENPLUGIN_SRC_3.2.6/adm_local/Makefile.in 2008-01-21 11:40:30.000000000 -0500 +@@ -27,7 +27,7 @@ + all: resources + + install: +- cp -rf @top_srcdir@/adm_local @prefix@ ++ cp -rf @top_srcdir@/adm_local $(DESTDIR)@prefix@ + + bin: + --- salome-3.2.6.orig/debian/patch-med-check-fix +++ salome-3.2.6/debian/patch-med-check-fix @@ -0,0 +1,22 @@ +--- salome-3.2.6/MED_SRC_3.2.6/adm_local/unix/config_files/check_Med.m4~ 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/MED_SRC_3.2.6/adm_local/unix/config_files/check_Med.m4 2008-01-14 07:19:07.000000000 -0500 +@@ -29,7 +29,7 @@ + + fi + +-if test -f ${MED_DIR}/idl/salome/MED.idl ; then ++if test -f ${MED_DIR}/idl/MED.idl ; then + AC_MSG_RESULT(Using Med module distribution in ${MED_DIR}) + Med_ok=yes + +--- salome-3.2.6/PYCALCULATOR_SRC_3.2.6/adm_local/unix/config_files/check_Med.m4~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/PYCALCULATOR_SRC_3.2.6/adm_local/unix/config_files/check_Med.m4 2008-01-14 14:36:07.000000000 -0500 +@@ -26,7 +26,7 @@ + # + fi + +-if test -f ${MED_DIR}/idl/salome/MED.idl ; then ++if test -f ${MED_DIR}/idl/MED.idl ; then + Med_ok=yes + AC_MSG_RESULT(Using Med module distribution in ${MED_DIR}) + --- salome-3.2.6.orig/debian/patch-missing-ios-base-defs +++ salome-3.2.6/debian/patch-missing-ios-base-defs @@ -0,0 +1,12 @@ +--- salome-3.2.6.orig/KERNEL_SRC_3.2.6/src/Communication/SALOME_Comm_i.hxx 2007-04-24 11:34:19.000000000 -0400 ++++ salome-3.2.6/KERNEL_SRC_3.2.6/src/Communication/SALOME_Comm_i.hxx 2008-01-11 08:26:54.000000000 -0500 +@@ -21,6 +21,9 @@ + #define _SALOME_COMM_I_HXX_ + + #ifdef HAVE_MPI2 ++#define SEEK_SET 0 /* Seek from beginning of file. */ ++#define SEEK_CUR 1 /* Seek from current position. */ ++#define SEEK_END 2 /* Seek from end of file. */ + #include "mpi.h" + #endif + #include --- salome-3.2.6.orig/debian/patch-no-stomp-salome-adm +++ salome-3.2.6/debian/patch-no-stomp-salome-adm @@ -0,0 +1,165 @@ +--- salome-3.2.6.orig/GUI_SRC_3.2.6/configure.in.base 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/GUI_SRC_3.2.6/configure.in.base 2008-01-11 14:26:40.000000000 -0500 +@@ -518,7 +518,7 @@ + if test "$GUI_DISABLE_CORBA" == "yes"; then + dir_variables="salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME} idl" + else +- dir_variables="salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME}" ++ dir_variables="adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME}" + fi + + for rep in $dir_variables +--- salome-3.2.6.orig/GEOM_SRC_3.2.6/configure.in.base 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/GEOM_SRC_3.2.6/configure.in.base 2008-01-14 09:12:33.000000000 -0500 +@@ -329,7 +329,7 @@ + fi + + # make other build directories +-for rep in salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME} idl ++for rep in adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME} idl + do + # if test ! -d $rep ; then + # eval mkdir $rep +--- salome-3.2.6.orig/MED_SRC_3.2.6/configure.in.base 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/MED_SRC_3.2.6/configure.in.base 2008-01-14 09:15:13.000000000 -0500 +@@ -516,7 +516,7 @@ + fi + + # make other build directories +-for rep in salome_adm adm_local doc bin/salome include/salome lib lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME} idl ++for rep in adm_local doc bin/salome include/salome lib lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME} idl + do + # if test ! -d $rep ; then + # eval mkdir $rep +--- salome-3.2.6.orig/RANDOMIZER_SRC_3.2.6/configure.in.base 2007-03-02 08:58:14.000000000 -0500 ++++ salome-3.2.6/RANDOMIZER_SRC_3.2.6/configure.in.base 2008-01-14 09:16:56.000000000 -0500 +@@ -194,7 +194,7 @@ + fi + + # make other build directories +-for rep in salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME} share/salome/doc idl ++for rep in adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME} share/salome/doc idl + do + # if test ! -d $rep ; then + # eval mkdir $rep +--- salome-3.2.6.orig/SUPERV_SRC_3.2.6/configure.in.base 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/SUPERV_SRC_3.2.6/configure.in.base 2008-01-14 09:19:31.000000000 -0500 +@@ -333,7 +333,7 @@ + fi + + # make other build directories +-for rep in salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME} idl ++for rep in adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME} idl + do + # if test ! -d $rep ; then + # eval mkdir $rep +--- salome-3.2.6.orig/HELLO_SRC_3.2.6/configure.in.base 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/HELLO_SRC_3.2.6/configure.in.base 2008-01-14 09:20:57.000000000 -0500 +@@ -270,7 +270,7 @@ + fi + + # make other build directories +-for rep in salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME} share/salome/doc idl ++for rep in adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME} share/salome/doc idl + do + $INSTALL -d $rep + done +--- salome-3.2.6.orig/PYHELLO_SRC_3.2.6/configure.in.base 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/PYHELLO_SRC_3.2.6/configure.in.base 2008-01-14 09:22:30.000000000 -0500 +@@ -194,7 +194,7 @@ + fi + + # make other build directories +-for rep in salome_adm adm_local doc bin/salome include/salome lib/salome share/salome/resources/${MODULE_NAME} share/salome/doc idl ++for rep in adm_local doc bin/salome include/salome lib/salome share/salome/resources/${MODULE_NAME} share/salome/doc idl + do + $INSTALL -d $rep + done +--- salome-3.2.6.orig/SMESH_SRC_3.2.6/configure.in.base 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/configure.in.base 2008-01-14 09:24:04.000000000 -0500 +@@ -373,7 +373,7 @@ + fi + + # make other build directories +-for rep in salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME} idl ++for rep in adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME} idl + do + # if test ! -d $rep ; then + # eval mkdir $rep +--- salome-3.2.6.orig/VISU_SRC_3.2.6/configure.in.base 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/VISU_SRC_3.2.6/configure.in.base 2008-01-14 09:24:54.000000000 -0500 +@@ -347,7 +347,7 @@ + fi + + # make other build directories +-for rep in salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME} idl ++for rep in adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME} idl + do + # if test ! -d $rep ; then + # eval mkdir $rep +--- salome-3.2.6.orig/COMPONENT_SRC_3.2.6/configure.in.base 2007-04-24 12:40:50.000000000 -0400 ++++ salome-3.2.6/COMPONENT_SRC_3.2.6/configure.in.base 2008-01-14 09:25:40.000000000 -0500 +@@ -445,7 +445,7 @@ + fi + + # make other build directories +-for rep in salome_adm adm_local doc bin/salome include/salome lib lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME} share/salome/doc idl ++for rep in adm_local doc bin/salome include/salome lib lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME} share/salome/doc idl + do + # if test ! -d $rep ; then + # eval mkdir $rep +--- salome-3.2.6.orig/CALCULATOR_SRC_3.2.6/configure.in.base 2007-04-24 12:41:05.000000000 -0400 ++++ salome-3.2.6/CALCULATOR_SRC_3.2.6/configure.in.base 2008-01-14 09:27:44.000000000 -0500 +@@ -254,7 +254,7 @@ + fi + + # make other build directories +-for rep in salome_adm adm_local doc bin/salome include/salome lib lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME} share/salome/doc idl ++for rep in adm_local doc bin/salome include/salome lib lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME} share/salome/doc idl + do + $INSTALL -d $rep + done +--- salome-3.2.6.orig/PYCALCULATOR_SRC_3.2.6/configure.in.base 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/PYCALCULATOR_SRC_3.2.6/configure.in.base 2008-01-14 09:28:22.000000000 -0500 +@@ -246,7 +246,7 @@ + fi + + # make other build directories +-for rep in salome_adm adm_local doc bin/salome include/salome lib/salome share/salome/resources/${MODULE_NAME} share/salome/doc idl ++for rep in adm_local doc bin/salome include/salome lib/salome share/salome/resources/${MODULE_NAME} share/salome/doc idl + do + # if test ! -d $rep ; then + # eval mkdir $rep +--- salome-3.2.6.orig/NETGENPLUGIN_SRC_3.2.6/configure.in.base 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/NETGENPLUGIN_SRC_3.2.6/configure.in.base 2008-01-14 09:29:03.000000000 -0500 +@@ -377,7 +377,7 @@ + fi + + # make other build directories +-for rep in salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME} idl ++for rep in adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME} idl + do + # if test ! -d $rep ; then + # eval mkdir $rep +--- salome-3.2.6.orig/SIERPINSKY_SRC_3.2.6/configure.in.base 2007-03-02 08:59:12.000000000 -0500 ++++ salome-3.2.6/SIERPINSKY_SRC_3.2.6/configure.in.base 2008-01-14 09:30:15.000000000 -0500 +@@ -377,7 +377,7 @@ + fi + + # make other build directories +-for rep in salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME} share/salome/doc idl ++for rep in adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME} share/salome/doc idl + do + # if test ! -d $rep ; then + # eval mkdir $rep +--- salome-3.2.6.orig/GHS3DPLUGIN_SRC_3.2.6/configure.in.base 2007-04-24 12:40:51.000000000 -0400 ++++ salome-3.2.6/GHS3DPLUGIN_SRC_3.2.6/configure.in.base 2008-01-14 06:58:30.000000000 -0500 +@@ -361,7 +361,7 @@ + + # make other build directories + for rep in \ +- salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME} #idl ++ adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME} #idl + do + # if test ! -d $rep ; then + # eval mkdir $rep --- salome-3.2.6.orig/debian/patch-random-check-fix +++ salome-3.2.6/debian/patch-random-check-fix @@ -0,0 +1,11 @@ +--- salome-3.2.6/RANDOMIZER_SRC_3.2.6/adm_local/unix/config_files/check_RANDOMIZER.m4~ 2006-06-01 07:49:24.000000000 -0400 ++++ salome-3.2.6/RANDOMIZER_SRC_3.2.6/adm_local/unix/config_files/check_RANDOMIZER.m4 2008-01-14 07:25:51.000000000 -0500 +@@ -27,7 +27,7 @@ + fi + fi + +-if test -f ${RANDOMIZER_DIR}/idl/salome/Randomizer.idl ; then ++if test -f ${RANDOMIZER_DIR}/idl/Randomizer.idl ; then + Randomizer_ok=yes + AC_MSG_RESULT(Using Randomizer module distribution in ${RANDOMIZER_DIR}) + --- salome-3.2.6.orig/debian/patch-smesh-check-trick +++ salome-3.2.6/debian/patch-smesh-check-trick @@ -0,0 +1,11 @@ +--- salome-3.2.6/SMESH_SRC_3.2.6/adm_local/unix/config_files/check_SMESH.m4~ 2007-04-24 12:41:03.000000000 -0400 ++++ salome-3.2.6/SMESH_SRC_3.2.6/adm_local/unix/config_files/check_SMESH.m4 2008-01-14 07:22:11.000000000 -0500 +@@ -38,7 +38,7 @@ + # + fi + +-if test -f ${SMESH_DIR}/bin/salome/libSMESH_Swig.py ; then ++if test -f ${SMESH_DIR}/configure.in.base ; then + SMesh_ok=yes + AC_MSG_RESULT(Using SMesh module distribution in ${SMESH_DIR}) + --- salome-3.2.6.orig/debian/patch-visu-check-fix +++ salome-3.2.6/debian/patch-visu-check-fix @@ -0,0 +1,11 @@ +--- salome-3.2.6/VISU_SRC_3.2.6/adm_local/unix/config_files/check_VISU.m4~ 2007-04-24 12:41:04.000000000 -0400 ++++ salome-3.2.6/VISU_SRC_3.2.6/adm_local/unix/config_files/check_VISU.m4 2008-01-14 07:24:43.000000000 -0500 +@@ -28,7 +28,7 @@ + fi + fi + +-if test -f ${VISU_DIR}/idl/salome/VISU_Gen.idl ; then ++if test -f ${VISU_DIR}/idl/VISU_Gen.idl ; then + Visu_ok=yes + AC_MSG_RESULT(Using VISU module distribution in ${VISU_DIR}) + --- salome-3.2.6.orig/debian/compat +++ salome-3.2.6/debian/compat @@ -0,0 +1 @@ +5 --- salome-3.2.6.orig/debian/copyright +++ salome-3.2.6/debian/copyright @@ -0,0 +1,27 @@ +This package was debianized by Adam C. Powell, IV on +January 9, 2008. + +It was downloaded from http://www.salome-project.org/ + +The copyright notice is not in any single file but is in files like +KERNEL_SRC_3.2.6/Makefile.am which includes the following, and refers to the +GNU Lesser General Public License (LGPL) whose text can be found in: +/usr/share/common-licenses/LGPL-2.1 + +# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG +# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com