4 files changed, 177 insertions, 224 deletions

diff --git a/french/eficas/Makefile b/french/eficas/Makefile
index aeeee8cca653..b3a581f57ded 100644
--- a/french/eficas/Makefile
+++ b/french/eficas/Makefile
@@ -1,13 +1,8 @@
-# Ports collection Makefile for:	Eficas
-# Date created:				Jul 07 2003
-# Whom:					thierry@pompo.net
-#
+# Created by: thierry@pompo.net
 # $FreeBSD$
-#
 
 PORTNAME=	eficas
-DISTVERSION=	6.4.0-1
-PORTREVISION=	1
+DISTVERSION=	6.6.0-2
 CATEGORIES=	french cad
 
 MAINTAINER=	thierry@FreeBSD.org
@@ -17,6 +12,7 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/Pmw:${PORTSDIR}/x11-toolkits/py-Pmw	\
 		${PYTHON_SITELIBDIR}/mx:${PORTSDIR}/lang/py-mx-base		\
+		bash:${PORTSDIR}/shells/bash					\
 		${PYNUMPY}
 
 USE_PYTHON=	yes
@@ -28,7 +24,6 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 LEFICASDIR?=	apps/${PORTNAME}
 EFICASDIR=	${PREFIX}/${LEFICASDIR}
 PLIST_SUB=	EFICASDIR=${LEFICASDIR}
-SUB_FILES=	qtEficas
 SUB_LIST=	EFICASDIR=${EFICASDIR} PYTHON_CMD=${PYTHON_CMD}
 
 .if defined(LANG) && ${LANG:Mfr*} != ""
@@ -41,34 +36,39 @@ RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt
 		${PYTHON_SITELIBDIR}/PyQt4/QtAssistant.so:${PORTSDIR}/devel/py-qt4-assistant
 
 FIXSHQT4=	typeNode.py
-FIXBASH=	cataSTA9/Macro/macr_ecre_calc_ops.py	\
-		cataSTA10/Macro/macr_ecre_calc_ops.py
-FIXPMW=		Aster/editeur_salome.ini Aster/editeur.ini
+FIXBASH=	Aster/Cata/cataSTA9/Macro/macr_ecre_calc_ops.py	\
+		Aster/Cata/cataSTA10/Macro/macr_ecre_calc_ops.py
+FIXUBIN=	Openturns_Study/prefs_OPENTURNS_STUDY.py	\
+		Openturns_Study/prefs_OPENTURNS_STUDY.py.in	\
+		Openturns_Wrapper/prefs_OPENTURNS_WRAPPER.py	\
+		Openturns_Wrapper/prefs_OPENTURNS_WRAPPER.py.in	\
+		Aster/prefs_ASTER.py
 
 pre-configure:
-	${RM} ${WRKSRC}/convert/Parserv5/Translate.py.orig
-.for FILE in ${FIXPMX}
-	${REINPLACE_CMD} -e 's|../Pmw|${PYTHON_SITELIBDIR}/Pmw|' ${WRKSRC}/${FILE}
-.endfor
 .for FILE in ${FIXSHQT4}
 	${REINPLACE_CMD} -e "s|/usr/bin/sh|/bin/sh|" ${WRKSRC}/InterfaceQT4/${FILE}
 .endfor
-	${REINPLACE_CMD} -e "s#lang='fr'#lang='${EF_LANG}'#"			\
+	${REINPLACE_CMD} -e "s#lang='fr'#lang='${EF_LANG}'#"		\
 		${WRKSRC}/Aster/prefs.py
-	${REINPLACE_CMD} -e "s#os.path.join(rep_cata,'..','Doc')#\"${DOCSDIR}\"#"	\
-		${WRKSRC}/Aster/editeur.ini
 .for cata in ${FIXBASH}
 	${REINPLACE_CMD} -e "s|'/bin/bash'|'${LOCALBASE}/bin/bash'|"	\
-		${WRKSRC}/Aster/Cata/${cata}
+		${WRKSRC}/${cata}
+.endfor
+	${REINPLACE_CMD} -e "s|/bin/bash|${LOCALBASE}/bin/bash|" ${WRKSRC}/eficasQt
+.for FILE in ${FIXUBIN}
+	${REINPLACE_CMD} -e 's|/usr/bin|${LOCALBASE}/bin|' ${WRKSRC}/${FILE}
 .endfor
+	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|;s|%%PREFIX%%|${PREFIX}|'	\
+		-e 's|%%EFICASDIR%%|${EFICASDIR}|' ${WRKSRC}/eficasQt
 
 do-install:
 	${MKDIR} ${EFICASDIR}
 	${CP} -R ${WRKSRC}/* ${EFICASDIR}
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${EFICASDIR}
 	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${EFICASDIR}
-	${INSTALL_SCRIPT} ${WRKDIR}/qtEficas ${PREFIX}/bin
-	${LN} -sf ${PREFIX}/bin/qtEficas ${PREFIX}/bin/eficas
+	${RM} ${EFICASDIR}/convert/Parserv5/Translate.py.orig ${EFICASDIR}/eficasQt.orig
+	${INSTALL_SCRIPT} ${WRKSRC}/eficasQt ${PREFIX}/bin
+	${LN} -sf ${PREFIX}/bin/eficasQt ${PREFIX}/bin/eficas
 
 post-install:
 	@${ECHO_MSG}
diff --git a/french/eficas/files/patch-eficasQt b/french/eficas/files/patch-eficasQt
new file mode 100644
index 000000000000..1612545be4f5
--- /dev/null
+++ b/french/eficas/files/patch-eficasQt
@@ -0,0 +1,36 @@
+--- eficasQt.orig	2013-01-24 17:21:25.000000000 +0100
++++ eficasQt	2013-03-16 16:07:04.000000000 +0100
+@@ -18,21 +18,16 @@
+ # ==============================================================================
+ 
+ set_prefix() {
+-   local this=`readlink -n -f $1`
+-   eficasdir=`dirname $this`
+-   local public=`dirname $eficasdir`
+-   prefix=`dirname $public`
++   eficasdir=%%EFICASDIR%%
++   prefix=%%PREFIX%%
+ }
+ 
+ set_prefix $0
+ 
+-export ASTER_ROOT=$prefix
++export ASTER_ROOT=%%LOCALBASE%%/aster
+ # set environment
+-if [ -f /etc/codeaster/profile.sh ]; then
+-   . /etc/codeaster/profile.sh
+-fi
+-if [ -f $prefix/etc/codeaster/profile.sh ]; then
+-   . $prefix/etc/codeaster/profile.sh
++if [ -f $prefix/aster/etc/codeaster/profile.sh ]; then
++   . $prefix/aster/etc/codeaster/profile.sh
+ fi
+ 
+ # start Python interpreter
+@@ -44,5 +39,5 @@
+ PYTHONPATH=$PYTHONPATH:$EFICAS_ROOT/UiQT4
+ PYTHONPATH=$PYTHONPATH:$EFICAS_ROOT/Editeur
+ 
+-$PYTHONEXECUTABLE $eficasdir/Aster/qtEficas_aster.py $*
++$PYTHONEXECUTABLE $eficasdir/Aster/qtEficas_aster.pyo $*
+ 
diff --git a/french/eficas/files/qtEficas.in b/french/eficas/files/qtEficas.in
deleted file mode 100644
index 1ba4c9d1755a..000000000000
--- a/french/eficas/files/qtEficas.in
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# $1 = comm
-# $2 = com0
-# $3 = com1
-# $4 = com2
-
-cd %%EFICASDIR%%/Aster
-exec %%PYTHON_CMD%% qtEficas_aster.pyo $1 $2 $3 $4
diff --git a/french/eficas/pkg-plist b/french/eficas/pkg-plist
index 15d7e57e4c31..4226c128c95c 100644
--- a/french/eficas/pkg-plist
+++ b/french/eficas/pkg-plist
@@ -1,5 +1,5 @@
 bin/eficas
-bin/qtEficas
+bin/eficasQt
 %%EFICASDIR%%/Accas/A_ASSD.py
 %%EFICASDIR%%/Accas/A_ASSD.pyc
 %%EFICASDIR%%/Accas/A_ASSD.pyo
@@ -109,6 +109,7 @@ bin/qtEficas
 %%EFICASDIR%%/Aide/eficas_OPENTURNS_STUDY.adp
 %%EFICASDIR%%/Aide/fichiers_ASTER/INSTALL.txt
 %%EFICASDIR%%/Aide/fichiers_ASTER/NEWS.txt
+%%EFICASDIR%%/Aide/fichiers_ASTER/cata.txt
 %%EFICASDIR%%/Aide/fichiers_ASTER/faqs.txt
 %%EFICASDIR%%/Aide/fichiers_ASTER/includes.txt
 %%EFICASDIR%%/Aide/fichiers_ASTER/index.html
@@ -259,9 +260,6 @@ bin/qtEficas
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_fiab_impr_ops.py
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_fiab_impr_ops.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_fiab_impr_ops.pyo
-%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_fiabilite_ops.py
-%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_fiabilite_ops.pyc
-%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_fiabilite_ops.pyo
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_lign_coupe_ops.py
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_lign_coupe_ops.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_lign_coupe_ops.pyo
@@ -868,58 +866,7 @@ bin/qtEficas
 %%EFICASDIR%%/Aster/Cata/cataSTA10/cata.py
 %%EFICASDIR%%/Aster/Cata/cataSTA10/cata.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA10/cata.pyo
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/16MND5_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/18MND5_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/18MND5_REF_B.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/18MND5_REF_C.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/20CD4M_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/20M5M_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/20MN5M_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/20NCD1407_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/30M5_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/A37C1_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/A37_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/A37_REF_B.NOMI
 %%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/A42_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/A42_REF_B.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/A42_REF_C.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/A48_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/A48_REF_B.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/A48_REF_C.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/A52_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/A52_REF_B.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/ERNICRFE3_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/NC15FE_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/NC30FE_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/P355GH_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/P355GH_REF_B.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/Z10C13_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/Z12CN13_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/Z2CN1810_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/Z2CN1810_REF_B.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/Z2CN2010_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/Z2CN2412_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/Z2CND1712_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/Z3CN1810_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/Z3CN2009M_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/Z5CN1810_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/Z5CN1810_REF_B.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/Z5CND1304_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/Z5CND1712_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/Z5CND1712_REF_B.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/Z6CN1810_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/Z6CN1810_REF_B.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/Z6CND1712_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/Z6CND1712_REF_B.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/Z6CNNB1811_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/Z6CNNB1811_REF_B.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/Z6NCTDV2515_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/Z8CNDNB1812_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/Z8CNDNB1812_REF_B.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/Z8CNDT1812_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/Z8CNDT1812_REF_B.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/Z8CNT1811_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA10/materiau/Z8CNT1811_REF_B.NOMI
 %%EFICASDIR%%/Aster/Cata/cataSTA10/ops.py
 %%EFICASDIR%%/Aster/Cata/cataSTA10/ops.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA10/ops.pyo
@@ -935,74 +882,6 @@ bin/qtEficas
 %%EFICASDIR%%/Aster/Cata/cataSTA11/cata.py
 %%EFICASDIR%%/Aster/Cata/cataSTA11/cata.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA11/cata.pyo
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/16MND5_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/18MND5_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/18MND5_REF_B.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/18MND5_REF_C.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/20CD4M_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/20M5M_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/20MN5M_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/20NCD1407_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/30M5_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/A37C1_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/A37_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/A37_REF_B.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/A42_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/A42_REF_B.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/A42_REF_C.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/A48_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/A48_REF_B.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/A48_REF_C.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/A52_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/A52_REF_B.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/AF3G_CR_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/AF3G_DIL_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/AF3G_EI_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/AF3G_ES_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/AF3G_GC_EB_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/AF3G_GC_EH_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/AF3G_GC_ME_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/AF3G_TG_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/AFA_CR_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/AFA_DIL_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/AFA_EI_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/AFA_ES_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/AFA_GC_EB_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/AFA_GC_EH_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/AFA_GC_ME_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/AFA_TG_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/ERNICRFE3_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/NC15FE_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/NC30FE_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/P355GH_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/P355GH_REF_B.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/Z10C13_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/Z12CN13_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/Z2CN1810_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/Z2CN1810_REF_B.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/Z2CN2010_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/Z2CN2412_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/Z2CND1712_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/Z3CN1810_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/Z3CN2009M_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/Z5CN1810_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/Z5CN1810_REF_B.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/Z5CND1304_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/Z5CND1712_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/Z5CND1712_REF_B.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/Z6CN1810_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/Z6CN1810_REF_B.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/Z6CND1712_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/Z6CND1712_REF_B.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/Z6CNNB1811_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/Z6CNNB1811_REF_B.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/Z6NCTDV2515_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/Z8CNDNB1812_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/Z8CNDNB1812_REF_B.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/Z8CNDT1812_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/Z8CNDT1812_REF_B.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/Z8CNT1811_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA11/materiau/Z8CNT1811_REF_B.NOMI
 %%EFICASDIR%%/Aster/Cata/cataSTA11/ops.py
 %%EFICASDIR%%/Aster/Cata/cataSTA11/ops.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA11/ops.pyo
@@ -1669,91 +1548,28 @@ bin/qtEficas
 %%EFICASDIR%%/Aster/Cata/cataSTA9/cata.py
 %%EFICASDIR%%/Aster/Cata/cataSTA9/cata.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA9/cata.pyo
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/16MND5_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/18MND5_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/18MND5_REF_B.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/18MND5_REF_C.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/20CD4M_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/20M5M_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/20MN5M_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/20NCD1407_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/30M5_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/A37C1_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/A37_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/A37_REF_B.NOMI
 %%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/A42_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/A42_REF_B.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/A42_REF_C.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/A48_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/A48_REF_B.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/A48_REF_C.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/A52_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/A52_REF_B.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/ERNICRFE3_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/NC15FE_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/NC30FE_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/P355GH_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/P355GH_REF_B.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/Z10C13_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/Z12CN13_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/Z2CN1810_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/Z2CN1810_REF_B.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/Z2CN2010_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/Z2CN2412_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/Z2CND1712_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/Z3CN1810_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/Z3CN2009M_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/Z5CN1810_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/Z5CN1810_REF_B.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/Z5CND1304_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/Z5CND1712_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/Z5CND1712_REF_B.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/Z6CN1810_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/Z6CN1810_REF_B.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/Z6CND1712_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/Z6CND1712_REF_B.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/Z6CNNB1811_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/Z6CNNB1811_REF_B.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/Z6NCTDV2515_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/Z8CNDNB1812_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/Z8CNDNB1812_REF_B.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/Z8CNDT1812_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/Z8CNDT1812_REF_B.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/Z8CNT1811_REF_A.NOMI
-%%EFICASDIR%%/Aster/Cata/cataSTA9/materiau/Z8CNT1811_REF_B.NOMI
 %%EFICASDIR%%/Aster/Cata/cataSTA9/ops.py
 %%EFICASDIR%%/Aster/Cata/cataSTA9/ops.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA9/ops.pyo
-%%EFICASDIR%%/Aster/LICENSE.TERMS
-%%EFICASDIR%%/Aster/__init__.py
-%%EFICASDIR%%/Aster/__init__.pyc
-%%EFICASDIR%%/Aster/__init__.pyo
+%%EFICASDIR%%/Aster/Doc/clefs_docu_STA10
+%%EFICASDIR%%/Aster/Doc/clefs_docu_STA11
+%%EFICASDIR%%/Aster/Doc/clefs_docu_STA9
 %%EFICASDIR%%/Aster/configuration_ASTER.py
 %%EFICASDIR%%/Aster/configuration_ASTER.pyc
 %%EFICASDIR%%/Aster/configuration_ASTER.pyo
-%%EFICASDIR%%/Aster/editeur.ini
-%%EFICASDIR%%/Aster/editeur_salome.ini
-%%EFICASDIR%%/Aster/eficas_aster.py
-%%EFICASDIR%%/Aster/eficas_aster.pyc
-%%EFICASDIR%%/Aster/eficas_aster.pyo
 %%EFICASDIR%%/Aster/prefs.py
 %%EFICASDIR%%/Aster/prefs.pyc
 %%EFICASDIR%%/Aster/prefs.pyo
 %%EFICASDIR%%/Aster/prefs_ASTER.py
 %%EFICASDIR%%/Aster/prefs_ASTER.pyc
 %%EFICASDIR%%/Aster/prefs_ASTER.pyo
-%%EFICASDIR%%/Aster/properties.py
-%%EFICASDIR%%/Aster/properties.pyc
-%%EFICASDIR%%/Aster/properties.pyo
 %%EFICASDIR%%/Aster/qtEficas_aster.py
 %%EFICASDIR%%/Aster/qtEficas_aster.pyc
 %%EFICASDIR%%/Aster/qtEficas_aster.pyo
 %%EFICASDIR%%/Aster/qtGroup.py
 %%EFICASDIR%%/Aster/qtGroup.pyc
 %%EFICASDIR%%/Aster/qtGroup.pyo
-%%EFICASDIR%%/Aster/style.py
-%%EFICASDIR%%/Aster/style.pyc
-%%EFICASDIR%%/Aster/style.pyo
 %%EFICASDIR%%/Editeur/Objecttreeitem.py
 %%EFICASDIR%%/Editeur/Objecttreeitem.pyc
 %%EFICASDIR%%/Editeur/Objecttreeitem.pyo
@@ -1873,6 +1689,7 @@ bin/qtEficas
 %%EFICASDIR%%/Editeur/icons/empty.png
 %%EFICASDIR%%/Editeur/icons/image240.png
 %%EFICASDIR%%/Editeur/icons/logo_edf.gif
+%%EFICASDIR%%/Editeur/icons/map.ppm
 %%EFICASDIR%%/Editeur/icons/minusnode.gif
 %%EFICASDIR%%/Editeur/icons/minusnode.png
 %%EFICASDIR%%/Editeur/icons/plusnode.gif
@@ -2087,6 +1904,12 @@ bin/qtEficas
 %%EFICASDIR%%/InterfaceQT4/monChoixCata.py
 %%EFICASDIR%%/InterfaceQT4/monChoixCata.pyc
 %%EFICASDIR%%/InterfaceQT4/monChoixCata.pyo
+%%EFICASDIR%%/InterfaceQT4/monChoixCode.py
+%%EFICASDIR%%/InterfaceQT4/monChoixCode.pyc
+%%EFICASDIR%%/InterfaceQT4/monChoixCode.pyo
+%%EFICASDIR%%/InterfaceQT4/monChoixMap.py
+%%EFICASDIR%%/InterfaceQT4/monChoixMap.pyc
+%%EFICASDIR%%/InterfaceQT4/monChoixMap.pyo
 %%EFICASDIR%%/InterfaceQT4/monCommandePanel.py
 %%EFICASDIR%%/InterfaceQT4/monCommandePanel.pyc
 %%EFICASDIR%%/InterfaceQT4/monCommandePanel.pyo
@@ -2153,6 +1976,9 @@ bin/qtEficas
 %%EFICASDIR%%/InterfaceQT4/monRacinePanel.py
 %%EFICASDIR%%/InterfaceQT4/monRacinePanel.pyc
 %%EFICASDIR%%/InterfaceQT4/monRacinePanel.pyo
+%%EFICASDIR%%/InterfaceQT4/monRecherche.py
+%%EFICASDIR%%/InterfaceQT4/monRecherche.pyc
+%%EFICASDIR%%/InterfaceQT4/monRecherche.pyo
 %%EFICASDIR%%/InterfaceQT4/monSelectImage.py
 %%EFICASDIR%%/InterfaceQT4/monSelectImage.pyc
 %%EFICASDIR%%/InterfaceQT4/monSelectImage.pyo
@@ -2339,10 +2165,45 @@ bin/qtEficas
 %%EFICASDIR%%/Noyau/nommage.py
 %%EFICASDIR%%/Noyau/nommage.pyc
 %%EFICASDIR%%/Noyau/nommage.pyo
+%%EFICASDIR%%/Noyau/strfunc.py
+%%EFICASDIR%%/Noyau/strfunc.pyc
+%%EFICASDIR%%/Noyau/strfunc.pyo
+%%EFICASDIR%%/Openturns_Study/CMakeLists.txt
+%%EFICASDIR%%/Openturns_Study/CVS/Entries
+%%EFICASDIR%%/Openturns_Study/CVS/Entries.Log
+%%EFICASDIR%%/Openturns_Study/CVS/Repository
+%%EFICASDIR%%/Openturns_Study/CVS/Root
+%%EFICASDIR%%/Openturns_Study/CVS/Tag
+%%EFICASDIR%%/Openturns_Study/OpenTURNS_Cata_Study_V1.py
+%%EFICASDIR%%/Openturns_Study/OpenTURNS_Cata_Study_V1.pyc
+%%EFICASDIR%%/Openturns_Study/OpenTURNS_Cata_Study_V1.pyo
+%%EFICASDIR%%/Openturns_Study/OpenTURNS_Cata_Study_V10.py
+%%EFICASDIR%%/Openturns_Study/OpenTURNS_Cata_Study_V10.pyc
+%%EFICASDIR%%/Openturns_Study/OpenTURNS_Cata_Study_V10.pyo
+%%EFICASDIR%%/Openturns_Study/OpenTURNS_Cata_Study_V2.py
+%%EFICASDIR%%/Openturns_Study/OpenTURNS_Cata_Study_V2.pyc
+%%EFICASDIR%%/Openturns_Study/OpenTURNS_Cata_Study_V2.pyo
+%%EFICASDIR%%/Openturns_Study/OpenTURNS_Cata_Study_V3.py
+%%EFICASDIR%%/Openturns_Study/OpenTURNS_Cata_Study_V3.pyc
+%%EFICASDIR%%/Openturns_Study/OpenTURNS_Cata_Study_V3.pyo
+%%EFICASDIR%%/Openturns_Study/OpenTURNS_Cata_Study_V4.py
+%%EFICASDIR%%/Openturns_Study/OpenTURNS_Cata_Study_V4.pyc
+%%EFICASDIR%%/Openturns_Study/OpenTURNS_Cata_Study_V4.pyo
+%%EFICASDIR%%/Openturns_Study/OpenTURNS_Cata_Study_V5.py
+%%EFICASDIR%%/Openturns_Study/OpenTURNS_Cata_Study_V5.pyc
+%%EFICASDIR%%/Openturns_Study/OpenTURNS_Cata_Study_V5.pyo
+%%EFICASDIR%%/Openturns_Study/OpenTURNS_Cata_Study_V6.py
+%%EFICASDIR%%/Openturns_Study/OpenTURNS_Cata_Study_V6.pyc
+%%EFICASDIR%%/Openturns_Study/OpenTURNS_Cata_Study_V6.pyo
+%%EFICASDIR%%/Openturns_Study/OpenTURNS_Cata_Study_V7.py
+%%EFICASDIR%%/Openturns_Study/OpenTURNS_Cata_Study_V7.pyc
+%%EFICASDIR%%/Openturns_Study/OpenTURNS_Cata_Study_V7.pyo
 %%EFICASDIR%%/Openturns_Study/OpenTURNS_Cata_Study_V8.py
 %%EFICASDIR%%/Openturns_Study/OpenTURNS_Cata_Study_V8.pyc
 %%EFICASDIR%%/Openturns_Study/OpenTURNS_Cata_Study_V8.pyo
-%%EFICASDIR%%/Openturns_Study/catalogues_openturns.ini
+%%EFICASDIR%%/Openturns_Study/OpenTURNS_Cata_Study_V9.py
+%%EFICASDIR%%/Openturns_Study/OpenTURNS_Cata_Study_V9.pyc
+%%EFICASDIR%%/Openturns_Study/OpenTURNS_Cata_Study_V9.pyo
 %%EFICASDIR%%/Openturns_Study/configuration_OPENTURNS_STUDY.py
 %%EFICASDIR%%/Openturns_Study/configuration_OPENTURNS_STUDY.pyc
 %%EFICASDIR%%/Openturns_Study/configuration_OPENTURNS_STUDY.pyo
@@ -2353,15 +2214,47 @@ bin/qtEficas
 %%EFICASDIR%%/Openturns_Study/prefs.pyc
 %%EFICASDIR%%/Openturns_Study/prefs.pyo
 %%EFICASDIR%%/Openturns_Study/prefs_OPENTURNS_STUDY.py
+%%EFICASDIR%%/Openturns_Study/prefs_OPENTURNS_STUDY.py.in
 %%EFICASDIR%%/Openturns_Study/prefs_OPENTURNS_STUDY.pyc
 %%EFICASDIR%%/Openturns_Study/prefs_OPENTURNS_STUDY.pyo
+%%EFICASDIR%%/Openturns_Study/properties.py
+%%EFICASDIR%%/Openturns_Study/properties.pyc
+%%EFICASDIR%%/Openturns_Study/properties.pyo
 %%EFICASDIR%%/Openturns_Study/qtEficas_openturns_study.py
 %%EFICASDIR%%/Openturns_Study/qtEficas_openturns_study.pyc
 %%EFICASDIR%%/Openturns_Study/qtEficas_openturns_study.pyo
+%%EFICASDIR%%/Openturns_Study/sdistOTqt.py
+%%EFICASDIR%%/Openturns_Study/sdistOTqt.pyc
+%%EFICASDIR%%/Openturns_Study/sdistOTqt.pyo
+%%EFICASDIR%%/Openturns_Study/style.py
+%%EFICASDIR%%/Openturns_Study/style.pyc
+%%EFICASDIR%%/Openturns_Study/style.pyo
+%%EFICASDIR%%/Openturns_Study/test/CVS/Entries
+%%EFICASDIR%%/Openturns_Study/test/CVS/Repository
+%%EFICASDIR%%/Openturns_Study/test/CVS/Root
+%%EFICASDIR%%/Openturns_Study/test/CVS/Tag
+%%EFICASDIR%%/Openturns_Study/test/MinMax_ExpPlane.comm
+%%EFICASDIR%%/Openturns_Study/test/MinMax_ExpPlane.py
+%%EFICASDIR%%/Openturns_Study/test/MinMax_ExpPlane.pyc
+%%EFICASDIR%%/Openturns_Study/test/MinMax_ExpPlane.pyo
+%%EFICASDIR%%/Openturns_Study/test/MinMax_RandomSampling.comm
+%%EFICASDIR%%/Openturns_Wrapper/CMakeLists.txt
+%%EFICASDIR%%/Openturns_Wrapper/CVS/Entries
+%%EFICASDIR%%/Openturns_Wrapper/CVS/Repository
+%%EFICASDIR%%/Openturns_Wrapper/CVS/Root
+%%EFICASDIR%%/Openturns_Wrapper/CVS/Tag
+%%EFICASDIR%%/Openturns_Wrapper/OpenTURNS_Cata_Wrapper_V1.py
+%%EFICASDIR%%/Openturns_Wrapper/OpenTURNS_Cata_Wrapper_V1.pyc
+%%EFICASDIR%%/Openturns_Wrapper/OpenTURNS_Cata_Wrapper_V1.pyo
+%%EFICASDIR%%/Openturns_Wrapper/OpenTURNS_Cata_Wrapper_V2.py
+%%EFICASDIR%%/Openturns_Wrapper/OpenTURNS_Cata_Wrapper_V2.pyc
+%%EFICASDIR%%/Openturns_Wrapper/OpenTURNS_Cata_Wrapper_V2.pyo
+%%EFICASDIR%%/Openturns_Wrapper/OpenTURNS_Cata_Wrapper_V3.py
+%%EFICASDIR%%/Openturns_Wrapper/OpenTURNS_Cata_Wrapper_V3.pyc
+%%EFICASDIR%%/Openturns_Wrapper/OpenTURNS_Cata_Wrapper_V3.pyo
 %%EFICASDIR%%/Openturns_Wrapper/OpenTURNS_Cata_Wrapper_V4.py
 %%EFICASDIR%%/Openturns_Wrapper/OpenTURNS_Cata_Wrapper_V4.pyc
 %%EFICASDIR%%/Openturns_Wrapper/OpenTURNS_Cata_Wrapper_V4.pyo
-%%EFICASDIR%%/Openturns_Wrapper/catalogues_openturns.ini
 %%EFICASDIR%%/Openturns_Wrapper/configuration_OPENTURNS_WRAPPER.py
 %%EFICASDIR%%/Openturns_Wrapper/configuration_OPENTURNS_WRAPPER.pyc
 %%EFICASDIR%%/Openturns_Wrapper/configuration_OPENTURNS_WRAPPER.pyo
@@ -2369,11 +2262,21 @@ bin/qtEficas
 %%EFICASDIR%%/Openturns_Wrapper/prefs.pyc
 %%EFICASDIR%%/Openturns_Wrapper/prefs.pyo
 %%EFICASDIR%%/Openturns_Wrapper/prefs_OPENTURNS_WRAPPER.py
+%%EFICASDIR%%/Openturns_Wrapper/prefs_OPENTURNS_WRAPPER.py.in
 %%EFICASDIR%%/Openturns_Wrapper/prefs_OPENTURNS_WRAPPER.pyc
 %%EFICASDIR%%/Openturns_Wrapper/prefs_OPENTURNS_WRAPPER.pyo
+%%EFICASDIR%%/Openturns_Wrapper/properties.py
+%%EFICASDIR%%/Openturns_Wrapper/properties.pyc
+%%EFICASDIR%%/Openturns_Wrapper/properties.pyo
 %%EFICASDIR%%/Openturns_Wrapper/qtEficas_openturns_wrapper.py
 %%EFICASDIR%%/Openturns_Wrapper/qtEficas_openturns_wrapper.pyc
 %%EFICASDIR%%/Openturns_Wrapper/qtEficas_openturns_wrapper.pyo
+%%EFICASDIR%%/Openturns_Wrapper/sdistOTqt.py
+%%EFICASDIR%%/Openturns_Wrapper/sdistOTqt.pyc
+%%EFICASDIR%%/Openturns_Wrapper/sdistOTqt.pyo
+%%EFICASDIR%%/Openturns_Wrapper/style.py
+%%EFICASDIR%%/Openturns_Wrapper/style.pyc
+%%EFICASDIR%%/Openturns_Wrapper/style.pyo
 %%EFICASDIR%%/Traducteur/__init__.py
 %%EFICASDIR%%/Traducteur/__init__.pyc
 %%EFICASDIR%%/Traducteur/__init__.pyo
@@ -2500,6 +2403,9 @@ bin/qtEficas
 %%EFICASDIR%%/UiQT4/desRacine.py
 %%EFICASDIR%%/UiQT4/desRacine.pyc
 %%EFICASDIR%%/UiQT4/desRacine.pyo
+%%EFICASDIR%%/UiQT4/desRecherche.py
+%%EFICASDIR%%/UiQT4/desRecherche.pyc
+%%EFICASDIR%%/UiQT4/desRecherche.pyo
 %%EFICASDIR%%/UiQT4/desSelectVal.py
 %%EFICASDIR%%/UiQT4/desSelectVal.pyc
 %%EFICASDIR%%/UiQT4/desSelectVal.pyo
@@ -2604,12 +2510,18 @@ bin/qtEficas
 %%EFICASDIR%%/convert/__init__.py
 %%EFICASDIR%%/convert/__init__.pyc
 %%EFICASDIR%%/convert/__init__.pyo
+%%EFICASDIR%%/convert/convert_SEP.py
+%%EFICASDIR%%/convert/convert_SEP.pyc
+%%EFICASDIR%%/convert/convert_SEP.pyo
 %%EFICASDIR%%/convert/convert_asterv5.py
 %%EFICASDIR%%/convert/convert_asterv5.pyc
 %%EFICASDIR%%/convert/convert_asterv5.pyo
 %%EFICASDIR%%/convert/convert_file_from_template.py
 %%EFICASDIR%%/convert/convert_file_from_template.pyc
 %%EFICASDIR%%/convert/convert_file_from_template.pyo
+%%EFICASDIR%%/convert/convert_map.py
+%%EFICASDIR%%/convert/convert_map.pyc
+%%EFICASDIR%%/convert/convert_map.pyo
 %%EFICASDIR%%/convert/convert_openturns_study.py
 %%EFICASDIR%%/convert/convert_openturns_study.pyc
 %%EFICASDIR%%/convert/convert_openturns_study.pyo
@@ -2639,9 +2551,15 @@ bin/qtEficas
 %%EFICASDIR%%/generator/__init__.py
 %%EFICASDIR%%/generator/__init__.pyc
 %%EFICASDIR%%/generator/__init__.pyo
+%%EFICASDIR%%/generator/generator_CARMEL3D.py
+%%EFICASDIR%%/generator/generator_CARMEL3D.pyc
+%%EFICASDIR%%/generator/generator_CARMEL3D.pyo
 %%EFICASDIR%%/generator/generator_GroupMA.py
 %%EFICASDIR%%/generator/generator_GroupMA.pyc
 %%EFICASDIR%%/generator/generator_GroupMA.pyo
+%%EFICASDIR%%/generator/generator_SEP.py
+%%EFICASDIR%%/generator/generator_SEP.pyc
+%%EFICASDIR%%/generator/generator_SEP.pyo
 %%EFICASDIR%%/generator/generator_aplat.py
 %%EFICASDIR%%/generator/generator_aplat.pyc
 %%EFICASDIR%%/generator/generator_aplat.pyo
@@ -2651,6 +2569,9 @@ bin/qtEficas
 %%EFICASDIR%%/generator/generator_file_from_template.py
 %%EFICASDIR%%/generator/generator_file_from_template.pyc
 %%EFICASDIR%%/generator/generator_file_from_template.pyo
+%%EFICASDIR%%/generator/generator_map.py
+%%EFICASDIR%%/generator/generator_map.pyc
+%%EFICASDIR%%/generator/generator_map.pyo
 %%EFICASDIR%%/generator/generator_openturns.py
 %%EFICASDIR%%/generator/generator_openturns.pyc
 %%EFICASDIR%%/generator/generator_openturns.pyo
@@ -2666,13 +2587,20 @@ bin/qtEficas
 %%EFICASDIR%%/generator/generator_vers3DSalome.py
 %%EFICASDIR%%/generator/generator_vers3DSalome.pyc
 %%EFICASDIR%%/generator/generator_vers3DSalome.pyo
+%%EFICASDIR%%/generator/tube.py
+%%EFICASDIR%%/generator/tube.pyc
+%%EFICASDIR%%/generator/tube.pyo
 @dirrm %%EFICASDIR%%/generator
 @dirrm %%EFICASDIR%%/convert/Parserv5
 @dirrm %%EFICASDIR%%/convert
 @dirrm %%EFICASDIR%%/Validation
 @dirrm %%EFICASDIR%%/UiQT4
 @dirrm %%EFICASDIR%%/Traducteur
+@dirrm %%EFICASDIR%%/Openturns_Wrapper/CVS
 @dirrm %%EFICASDIR%%/Openturns_Wrapper
+@dirrm %%EFICASDIR%%/Openturns_Study/test/CVS
+@dirrm %%EFICASDIR%%/Openturns_Study/test
+@dirrm %%EFICASDIR%%/Openturns_Study/CVS
 @dirrm %%EFICASDIR%%/Openturns_Study
 @dirrm %%EFICASDIR%%/Noyau
 @dirrm %%EFICASDIR%%/InterfaceQT4
@@ -2682,12 +2610,12 @@ bin/qtEficas
 @dirrm %%EFICASDIR%%/Editeur/Patrons/ASTER
 @dirrm %%EFICASDIR%%/Editeur/Patrons
 @dirrm %%EFICASDIR%%/Editeur
+@dirrm %%EFICASDIR%%/Aster/Doc
 @dirrm %%EFICASDIR%%/Aster/Cata/cataSTA9/materiau
 @dirrm %%EFICASDIR%%/Aster/Cata/cataSTA9/Utilitai
 @dirrm %%EFICASDIR%%/Aster/Cata/cataSTA9/SD
 @dirrm %%EFICASDIR%%/Aster/Cata/cataSTA9/Macro
 @dirrm %%EFICASDIR%%/Aster/Cata/cataSTA9
-@dirrm %%EFICASDIR%%/Aster/Cata/cataSTA11/materiau
 @dirrm %%EFICASDIR%%/Aster/Cata/cataSTA11/Cata_Utils
 @dirrm %%EFICASDIR%%/Aster/Cata/cataSTA11
 @dirrm %%EFICASDIR%%/Aster/Cata/cataSTA10/materiau