From 5e3dc635e713847d2c7bc06badbf7b08e819cf04 Mon Sep 17 00:00:00 2001
From: caremoli <caremoli>
Date: Tue, 20 Nov 2007 13:44:28 +0000
Subject: [PATCH] CCAR: merge from BR_Dev_For_4_0 (20/12/07)

---
 bin/NSparam.py             | 4 ++--
 configure.ac               | 6 +++---
 doc/salome/Makefile.am     | 5 ++---
 doc/salome/tui/Makefile.am | 3 ++-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bin/NSparam.py b/bin/NSparam.py
index 5ec527e11..652e6da66 100755
--- a/bin/NSparam.py
+++ b/bin/NSparam.py
@@ -36,7 +36,7 @@ def getNSparams(info=""):
     my_host=""
     if os.environ.has_key("OMNIORB_CONFIG"):
         file = open(os.environ["OMNIORB_CONFIG"], "r")
-        s = file.read()
+        s = file.readline()
         while len(s):
             l = string.split(s, ":")
             if string.split(l[0], " ")[0] == "ORBInitRef" or \
@@ -48,7 +48,7 @@ def getNSparams(info=""):
                 my_host = l[len(l)-2]
                 break;
                 pass
-            s = file.read()
+            s = file.readline()
             pass
         pass
     if info=='host':
diff --git a/configure.ac b/configure.ac
index c6fb0228d..6254567d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
 #
 #AC_PREREQ(2.59)
 #AC_INIT(src)
-AC_INIT([Salome2 Project], [4.0.0], [paul.rascle@edf.fr], [salome])
+AC_INIT([Salome2 Project], [4.1.0], [paul.rascle@edf.fr], [salome])
 
 # AC_CONFIG_AUX_DIR defines an alternative directory where to find the auxiliary
 # scripts such as config.guess, install-sh, ...
@@ -18,8 +18,8 @@ AM_INIT_AUTOMAKE([tar-pax])
 PACKAGE=salome
 AC_SUBST(PACKAGE)
 
-VERSION=4.0.0
-XVERSION=0x040000
+VERSION=4.1.0
+XVERSION=0x040100
 AC_SUBST(VERSION)
 AC_SUBST(XVERSION)
 
diff --git a/doc/salome/Makefile.am b/doc/salome/Makefile.am
index c68d0c1e8..86089e1b9 100644
--- a/doc/salome/Makefile.am
+++ b/doc/salome/Makefile.am
@@ -50,8 +50,7 @@ info_TEXINFOS = Batch.texi
 install-data-local:  html usr_docs
 	cp -rp $(top_builddir)/doc/salome/Batch.html $(docdir)
 
-EXTRA_DIST= main.dox batch.dox install.dox \
+EXTRA_DIST= main.dox install.dox \
 	    kernel_resources.dox kernel_services.dox \
-	    salome_application.dox  unittests.dox \
+	    salome_application.dox unittests.dox \
 	    salome_file.dox batch.dox
-
diff --git a/doc/salome/tui/Makefile.am b/doc/salome/tui/Makefile.am
index 12a714b16..9088dfa1c 100644
--- a/doc/salome/tui/Makefile.am
+++ b/doc/salome/tui/Makefile.am
@@ -51,7 +51,8 @@ usr_docs:
 #	$(INSTALL) -d $(docdir)/tui/KERNEL;
 	cp -fr $(srcdir)/KERNEL/sources/static/*.* $(docdir);
 	cp -fr $(srcdir)/KERNEL/sources/ $(docdir);
-	cp -fr KERNEL/[a-l]*.* $(docdir)
+	cp -fr KERNEL/[a-f]*.* $(docdir)
+	cp -fr KERNEL/[g-l]*.* $(docdir)
 	cp -fr KERNEL/[m-z]*.* $(docdir)
 	cp -fr $(srcdir)/KERNEL/HTML/ $(docdir);
 	cp -f $(srcdir)/pythfilter.py $(docdir);
-- 
2.39.2