From dcccf58835c802087e27a2b2649c5e19f9f6937f Mon Sep 17 00:00:00 2001
From: "Cameron (Kamran) Mashayekhi" <cmashayekhi@novell.com>
Date: Tue, 18 Apr 2006 22:12:38 +0000
Subject: [PATCH] YaST modules rename from novell-casa to CASA.

---
 casa-yast/agents/Makefile                     |  24 ++--
 casa-yast/agents/Makefile.am                  |   2 +-
 casa-yast/agents/Makefile.in                  |   4 +-
 casa-yast/make_casa_yast.sh                   |  32 ++---
 casa-yast/src/CASA.desktop                    |  23 ++++
 casa-yast/src/CASA.ycp                        |  92 ++++++++++++++
 casa-yast/src/CASA_auto.ycp                   | 117 ++++++++++++++++++
 casa-yast/src/CASA_proposal.ycp               | 107 ++++++++++++++++
 casa-yast/src/Makefile                        |  34 ++---
 casa-yast/src/Makefile.am                     |  12 +-
 casa-yast/src/Makefile.in                     |  14 +--
 casa-yast/src/NovellCasa.pm                   |  45 +++++--
 casa-yast/src/NovellCasa.ycp                  |  41 ++++--
 casa-yast/src/complex.ycp                     |  30 ++++-
 casa-yast/src/dialogs.ycp                     |  34 +++--
 casa-yast/src/helps.ycp                       |  28 ++++-
 casa-yast/src/icons/install_casa_yast_icons   |  34 +++--
 casa-yast/src/novell-casa.desktop             |  10 +-
 casa-yast/src/novell-casa.ycp                 |  39 ++++--
 casa-yast/src/novell-casa_auto.ycp            |  33 +++--
 casa-yast/src/novell-casa_proposal.ycp        |  33 +++--
 casa-yast/src/wizards.ycp                     |  42 +++++--
 ...novell-casa.spec.in => yast2-CASA.spec.in} |  20 +--
 23 files changed, 690 insertions(+), 160 deletions(-)
 create mode 100644 casa-yast/src/CASA.desktop
 create mode 100644 casa-yast/src/CASA.ycp
 create mode 100644 casa-yast/src/CASA_auto.ycp
 create mode 100644 casa-yast/src/CASA_proposal.ycp
 rename casa-yast/{yast2-novell-casa.spec.in => yast2-CASA.spec.in} (80%)

diff --git a/casa-yast/agents/Makefile b/casa-yast/agents/Makefile
index 93532bf2..7dd18184 100644
--- a/casa-yast/agents/Makefile
+++ b/casa-yast/agents/Makefile
@@ -2,7 +2,7 @@
 # agents/Makefile.  Generated from Makefile.in by configure.
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,15 +14,15 @@
 
 
 
-# Makefile.am for novell-casa/agents
+# Makefile.am for CASA/agents
 
 
 srcdir = .
 top_srcdir = ..
 
-pkgdatadir = $(datadir)/yast2-novell-casa
-pkglibdir = $(libdir)/yast2-novell-casa
-pkgincludedir = $(includedir)/yast2-novell-casa
+pkgdatadir = $(datadir)/yast2-CASA
+pkglibdir = $(libdir)/yast2-CASA
+pkgincludedir = $(includedir)/yast2-CASA
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = /usr/bin/install -c -p
@@ -73,7 +73,7 @@ CREATE_PKGCONFIG_NOARCH_FALSE =
 CREATE_PKGCONFIG_NOARCH_TRUE = #
 CREATE_PKGCONFIG_TRUE = #
 CYGPATH_W = echo
-DEFS = -DPACKAGE_NAME=\"yast2-novell-casa\" -DPACKAGE_TARNAME=\"yast2-novell-casa\" -DPACKAGE_VERSION=\"1.6.0\" -DPACKAGE_STRING=\"yast2-novell-casa\ 1.6.0\" -DPACKAGE_BUGREPORT=\"http://www.suse.de/feedback\" -DPACKAGE=\"yast2-novell-casa\" -DVERSION=\"1.6.0\" 
+DEFS = -DPACKAGE_NAME=\"yast2-CASA\" -DPACKAGE_TARNAME=\"yast2-CASA\" -DPACKAGE_VERSION=\"1.6.0\" -DPACKAGE_STRING=\"yast2-CASA\ 1.6.0\" -DPACKAGE_BUGREPORT=\"http://www.suse.de/feedback\" -DPACKAGE=\"yast2-CASA\" -DVERSION=\"1.6.0\" 
 ECHO_C = 
 ECHO_N = -n
 ECHO_T = 
@@ -87,15 +87,15 @@ LN_S = ln -s
 LTLIBOBJS = 
 MAINTAINER = casa <casa@novell.com>
 MAKEINFO = ${SHELL} /home/nds_cm/dev/yast/casa-yast/missing --run makeinfo
-PACKAGE = yast2-novell-casa
+PACKAGE = yast2-CASA
 PACKAGE_BUGREPORT = http://www.suse.de/feedback
-PACKAGE_NAME = yast2-novell-casa
-PACKAGE_STRING = yast2-novell-casa 1.6.0
-PACKAGE_TARNAME = yast2-novell-casa
+PACKAGE_NAME = yast2-CASA
+PACKAGE_STRING = yast2-CASA 1.6.0
+PACKAGE_TARNAME = yast2-CASA
 PACKAGE_VERSION = 1.6.0
 PATH_SEPARATOR = :
 PKG_CONFIG_PATH = 
-RPMNAME = yast2-novell-casa
+RPMNAME = yast2-CASA
 SET_MAKE = 
 SHELL = /bin/sh
 STRIP = 
@@ -123,7 +123,7 @@ build_vendor = suse
 clientdir = ${prefix}/share/YaST2/clients
 datadir = ${prefix}/share
 desktopdir = ${prefix}/share/applications/YaST2
-docdir = ${prefix}/share/doc/packages/yast2-novell-casa
+docdir = ${prefix}/share/doc/packages/yast2-CASA
 exec_prefix = ${prefix}
 execcompdir = ${prefix}/lib/YaST2
 fillupdir = /var/adm/fillup-templates
diff --git a/casa-yast/agents/Makefile.am b/casa-yast/agents/Makefile.am
index 395c5519..7773301d 100644
--- a/casa-yast/agents/Makefile.am
+++ b/casa-yast/agents/Makefile.am
@@ -1,4 +1,4 @@
-# Makefile.am for novell-casa/agents
+# Makefile.am for CASA/agents
 
 agent_SCRIPTS =
 
diff --git a/casa-yast/agents/Makefile.in b/casa-yast/agents/Makefile.in
index 5a984cf6..0877f14b 100644
--- a/casa-yast/agents/Makefile.in
+++ b/casa-yast/agents/Makefile.in
@@ -2,7 +2,7 @@
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# Makefile.am for novell-casa/agents
+# Makefile.am for CASA/agents
 
 
 srcdir = @srcdir@
diff --git a/casa-yast/make_casa_yast.sh b/casa-yast/make_casa_yast.sh
index b43d5394..c490a4c6 100755
--- a/casa-yast/make_casa_yast.sh
+++ b/casa-yast/make_casa_yast.sh
@@ -893,7 +893,7 @@ rpmBuild ()
     echo "************************************************************"
     echo "[$SCRIPT_NAME] running rpmBuild()"
 
-    # delete the yast2-novell-casa build directory
+    # delete the yast2-CASA build directory
     deleteBuildDirectoryContents
 
     # delete the rpm directory
@@ -923,10 +923,10 @@ rpmBuild ()
     # this creates the tarball in the package directory
     executeMakePackageLocal
 
-    # create the novell-casa.po file
+    # create the CASA.po file
     #createPOFile
 
-    # delete the yast2-novell-casa directory in the SOURCES directory
+    # delete the yast2-CASA directory in the SOURCES directory
     deleteSourcesDirectoryContents
         
     # delete the spec file in the SPECS directory
@@ -1016,7 +1016,7 @@ rpmBuild ()
     # delete the package directory
     deletePackageDirectory
     
-    # delete the yast2-novell-casa directory in the SOURCES directory
+    # delete the yast2-CASA directory in the SOURCES directory
     deleteSourcesDirectoryContents
         
     # delete the spec file in the SPECS directory
@@ -1038,7 +1038,7 @@ rpmBuild ()
     # clean the pot and mo files
     cleanPOTFile
 
-    # delete the yast2-novell-casa build directory
+    # delete the yast2-CASA build directory
     deleteBuildDirectoryContents
 }
 
@@ -1142,7 +1142,7 @@ createTarBall ()
 
 createPOFile ()
 {
-    # use the novell-casa.pot file to create the novell-casa.po which is given to localization 
+    # use the CASA.pot file to create the CASA.po which is given to localization 
     cd $START_DIR
 
     echo ""
@@ -1172,7 +1172,7 @@ createPOFile ()
 
 createMOFiles ()
 {
-    # use the novell-casa.po files from localization to create the novell-casa.mo files
+    # use the CASA.po files from localization to create the CASA.mo files
     cd $START_DIR
     PO_DIRS="$START_DIR/pofiles/cs
         $START_DIR/pofiles/de
@@ -1230,7 +1230,7 @@ clean ()
     # delete the package directory
     deletePackageDirectory
     
-    # delete the yast2-novell-casa directory in the SOURCES directory
+    # delete the yast2-CASA directory in the SOURCES directory
     deleteSourcesDirectoryContents
         
     # delete the spec file in the SPECS directory
@@ -1259,7 +1259,7 @@ clean ()
     cleanPOTFile
     cleanMOFiles
 
-    # delete the yast2-novell-casa build directory
+    # delete the yast2-CASA build directory
     deleteBuildDirectoryContents
     # from rpmBuild ()
 
@@ -1280,7 +1280,7 @@ clean ()
 
 cleanPOFile ()
 {
-    # delete the novell-casa.po file
+    # delete the CASA.po file
     cd $START_DIR
     
     if [ -e $START_DIR/$PO_FILE ]
@@ -1296,7 +1296,7 @@ cleanPOFile ()
 
 cleanPOTFile ()
 {
-    # delete the novell-casa.pot file
+    # delete the CASA.pot file
     cd $START_DIR
     
     if [ -e $START_DIR/$POT_FILE ]
@@ -1312,7 +1312,7 @@ cleanPOTFile ()
 
 cleanMOFiles ()
 {
-    # delete the novell-casa.mo file
+    # delete the CASA.mo file
     cd $START_DIR
     
     echo ""
@@ -1452,7 +1452,7 @@ else
 ARCH=i586
 fi
 
-PACKAGE_NAME="yast2-novell-casa"
+PACKAGE_NAME="yast2-CASA"
 BUILD_ROOT_SPECS_DIR="$BUILD_ROOT/SPECS"
 BUILD_ROOT_RPMS_DIR="$BUILD_ROOT/RPMS"
 BUILD_ROOT_SRPMS_DIR="$BUILD_ROOT/SRPMS"
@@ -1467,9 +1467,9 @@ PACKAGE_DIRECTORY="$START_DIR/package"
 SPEC_FILE_DIRECTORY="$START_DIR/spec"
 SPEC_FILE="$PACKAGE_NAME.spec"
 SPEC_IN_FILE="$PACKAGE_NAME.spec.in"
-POT_FILE="novell-casa.pot"
-PO_FILE="novell-casa.po"
-MO_FILE="novell-casa.mo"
+POT_FILE="CASA.pot"
+PO_FILE="CASA.po"
+MO_FILE="CASA.mo"
 
 validateCommandLineParams
 
diff --git a/casa-yast/src/CASA.desktop b/casa-yast/src/CASA.desktop
new file mode 100644
index 00000000..4af8b565
--- /dev/null
+++ b/casa-yast/src/CASA.desktop
@@ -0,0 +1,23 @@
+[Desktop Entry]
+Type=Application
+Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Security;
+
+X-KDE-ModuleType=Library
+X-KDE-RootOnly=true
+X-KDE-HasReadOnlyMode=true
+X-KDE-Library=yast2
+X-SuSE-YaST-Call=CASA
+
+X-SuSE-YaST-Group=Security
+X-SuSE-YaST-Argument=
+X-SuSE-YaST-RootOnly=true
+X-SuSE-YaST-AutoInst=
+X-SuSE-YaST-Geometry=
+X-SuSE-YaST-SortKey=
+X-SuSE-YaST-AutoInstResource=CASA
+
+Icon=CASA
+Exec=/sbin/yast2 CASA 
+
+Name=Novell CASA
+GenericName=Configure CASA
diff --git a/casa-yast/src/CASA.ycp b/casa-yast/src/CASA.ycp
new file mode 100644
index 00000000..2d707bf5
--- /dev/null
+++ b/casa-yast/src/CASA.ycp
@@ -0,0 +1,92 @@
+/**
+ * File:	clients/CASA.ycp
+ * Package:	Configuration of CASA
+ * Summary:	Main file
+ * Authors:	casa <casa@novell.com>
+ *
+ *********************************************************************
+ * Copyright (C) 2005-2006 Novell, Inc. All Rights Reserved.
+ *
+ * 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; 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
+ * Library 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, Novell, Inc.
+ *
+ * To contact Novell about this file by physical or electronic mail, 
+ * you may find current contact information at www.novell.com.
+ *
+ *********************************************************************
+ *
+ * Main file for CASA configuration. Uses all other files.
+ */
+
+{
+
+/***
+ * <h3>Configuration of CASA</h3>
+ */
+
+textdomain "CASA";
+
+/* The main () */
+y2milestone ("----------------------------------------");
+y2milestone ("Novell CASA module started");
+
+import "Progress";
+import "Report";
+import "Summary";
+
+import "CommandLine";
+include "CASA/wizards.ycp";
+
+map cmdline_description = $[
+    "id" 	: "CASA",
+    /* Command line help text for the XCASA module */
+    "help"	: _("Configuration of CASA"),
+    "guihandler"        : NovellCasaSequence,
+    "initialize"        : NovellCasa::Read,
+    "finish"            : NovellCasa::Write,
+    "actions"           : $[
+	// FIXME TODO: fill the functionality description here
+    ],
+    "options"		: $[
+	// FIXME TODO: fill the option descriptions here
+    ],
+    "mapping"		: $[
+	// FIXME TODO: fill the mappings of actions and options here
+    ]
+];
+
+/* is this proposal or not? */
+boolean propose = false;
+list args = WFM::Args();
+if(size(args) > 0) {
+    if(is(WFM::Args(0), path) && WFM::Args(0) == .propose) {
+        y2milestone("Using PROPOSE mode");
+        propose = true;
+    }
+}
+
+/* main ui function */
+any ret = nil;
+
+if(propose) ret = NovellCasaAutoSequence();
+else ret = CommandLine::Run(cmdline_description);
+y2debug("ret=%1", ret);
+
+/* Finish */
+y2milestone("Novell CASA module finished");
+y2milestone("----------------------------------------");
+
+return ret;
+
+/* EOF */
+}
diff --git a/casa-yast/src/CASA_auto.ycp b/casa-yast/src/CASA_auto.ycp
new file mode 100644
index 00000000..af6083af
--- /dev/null
+++ b/casa-yast/src/CASA_auto.ycp
@@ -0,0 +1,117 @@
+/**
+ * File:	clients/CASA_auto.ycp
+ * Package:	Configuration of CASA
+ * Summary:	Client for autoinstallation
+ * Authors:	casa <casa@novell.com>
+ *
+ *********************************************************************
+ * Copyright (C) 2005-2006 Novell, Inc. All Rights Reserved.
+ *
+ * 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; 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
+ * Library 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, Novell, Inc.
+ *
+ * To contact Novell about this file by physical or electronic mail, 
+ * you may find current contact information at www.novell.com.
+ *
+ *********************************************************************
+ *
+ * This is a client for autoinstallation. It takes its arguments,
+ * goes through the configuration and return the setting.
+ * Does not do any changes to the configuration.
+ */
+
+/**
+ * @param function to execute
+ * @param map/list of CASA settings
+ * @return map edited settings, Summary or boolean on success depending on called function
+ * @example map mm = $[ "FAIL_DELAY" : "77" ];
+ * @example map ret = WFM::CallFunction ("CASA_auto", [ "Summary", mm ]);
+ */
+
+{
+
+textdomain "CASA";
+
+y2milestone("----------------------------------------");
+y2milestone("Novell CASA auto started");
+
+import "NovellCasa";
+include "CASA/wizards.ycp";
+
+any ret = nil;
+string func = "";
+map param = $[];
+
+/* Check arguments */
+if(size(WFM::Args()) > 0 && is(WFM::Args(0), string)) {
+    func = (string)WFM::Args(0);
+    if(size(WFM::Args()) > 1 && is(WFM::Args(1), map))
+	param = (map) WFM::Args(1);
+}
+y2debug("func=%1", func);
+y2debug("param=%1", param);
+
+/* Create a summary*/
+if(func == "Summary") {
+    ret = select(NovellCasa::Summary(), 0, "");
+}
+/* Reset configuration */
+else if (func == "Reset") {
+    NovellCasa::Import($[]);
+    ret = $[];
+}
+/* Change configuration (run AutoSequence) */
+else if (func == "Change") {
+    ret = NovellCasaAutoSequence();
+}
+/* Import configuration */
+else if (func == "Import") {
+    ret = NovellCasa::Import(param);
+}
+/* Return actual state */
+else if (func == "Export") {
+    ret = NovellCasa::Export();
+}
+/* Return needed packages */
+else if (func == "Packages") {
+    ret = NovellCasa::AutoPackages();
+}
+/* Read current state */
+else if (func == "Read") {
+    import "Progress";
+    Progress::off();
+    ret = NovellCasa::Read();
+    Progress::on();
+}
+/* Write givven settings */
+else if (func == "Write") {
+    import "Progress";
+    Progress::off();
+//    NovellCasa::write_only = true;
+    ret = NovellCasa::Write();
+    Progress::on();
+}
+/* Unknown function */
+else {
+    y2error("Unknown function: %1", func);
+    ret = false;
+}
+
+y2debug("ret=%1", ret);
+y2milestone("Novell CASA auto finished");
+y2milestone("----------------------------------------");
+
+return ret;
+
+/* EOF */
+}
diff --git a/casa-yast/src/CASA_proposal.ycp b/casa-yast/src/CASA_proposal.ycp
new file mode 100644
index 00000000..5cf758a1
--- /dev/null
+++ b/casa-yast/src/CASA_proposal.ycp
@@ -0,0 +1,107 @@
+/**
+ * File:	clients/CASA_proposal.ycp
+ * Package:	Configuration of CASA
+ * Summary:	Proposal function dispatcher.
+ * Authors:	casa <casa@novell.com>
+ *
+ *********************************************************************
+ * Copyright (C) 2005-2006 Novell, Inc. All Rights Reserved.
+ *
+ * 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; 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
+ * Library 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, Novell, Inc.
+ *
+ * To contact Novell about this file by physical or electronic mail, 
+ * you may find current contact information at www.novell.com.
+ *
+ *********************************************************************
+ *
+ * Proposal function dispatcher for CASA configuration.
+ * See source/installation/proposal/proposal-API.txt
+ */
+
+{
+
+textdomain "CASA";
+
+import "NovellCasa";
+import "Progress";
+
+/* The main () */
+y2milestone("----------------------------------------");
+y2milestone("Novell CASA proposal started");
+
+string func = (string) WFM::Args(0);
+map param = (map) WFM::Args(1);
+map ret = $[];
+
+/* create a textual proposal */
+if(func == "MakeProposal") {
+    string proposal = "";
+    string warning = nil;
+    symbol warning_level = nil;
+    boolean force_reset = param["force_reset"]:false;
+
+//    if(force_reset || !NovellCasa::proposal_valid) {
+//        NovellCasa::proposal_valid = true;
+//	Progress::off();
+//	NovellCasa::Read();
+//    }
+    list sum = NovellCasa::Summary();
+//    proposal = sum[0]:"";
+    Progress::on();
+
+    ret = $[
+//	"preformatted_proposal" : proposal,
+//	"warning_level" : warning_level,
+//	"warning" : warning,
+    ];
+}
+/* run the module */
+else if(func == "AskUser") {
+    map stored = NovellCasa::Export();
+    symbol seq = (symbol) WFM::CallFunction("CASA", [.propose]);
+    if(seq != `next) NovellCasa::Import(stored);
+
+    y2debug("stored=%1",stored);
+    y2debug("seq=%1",seq);
+    ret = $[
+	"workflow_sequence" : seq
+    ];
+}
+/* create titles */
+else if(func == "Description") {
+    ret = $[
+	/* Rich text title for NovellCasa in proposals */
+	"rich_text_title" : _("Novell CASA"),
+	/* Menu title for NovellCasa in proposals */
+	"menu_title" : _("&Novell CASA"),
+	"id" : "CASA",
+    ];
+}
+/* write the proposal */
+else if(func == "Write") {
+    NovellCasa::Write();
+}
+/* unknown function */
+else {
+    y2error("unknown function: %1", func);
+}
+
+/* Finish */
+y2debug("ret=%1",ret);
+y2milestone("Novell CASA proposal finished");
+y2milestone("----------------------------------------");
+return ret;
+
+/* EOF */
+}
diff --git a/casa-yast/src/Makefile b/casa-yast/src/Makefile
index 9b47ffb7..708b46a9 100644
--- a/casa-yast/src/Makefile
+++ b/casa-yast/src/Makefile
@@ -2,7 +2,7 @@
 # src/Makefile.  Generated from Makefile.in by configure.
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,7 +14,7 @@
 
 
 
-# Makefile.am for novell-casa/src
+# Makefile.am for CASA/src
 
 # Makefile.am.common					-*- Makefile -*-
 # Generated file, do not edit!
@@ -22,9 +22,9 @@
 srcdir = .
 top_srcdir = ..
 
-pkgdatadir = $(datadir)/yast2-novell-casa
-pkglibdir = $(libdir)/yast2-novell-casa
-pkgincludedir = $(includedir)/yast2-novell-casa
+pkgdatadir = $(datadir)/yast2-CASA
+pkglibdir = $(libdir)/yast2-CASA
+pkgincludedir = $(includedir)/yast2-CASA
 top_builddir = ..
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = /usr/bin/install -c -p
@@ -84,7 +84,7 @@ CREATE_PKGCONFIG_NOARCH_FALSE =
 CREATE_PKGCONFIG_NOARCH_TRUE = #
 CREATE_PKGCONFIG_TRUE = #
 CYGPATH_W = echo
-DEFS = -DPACKAGE_NAME=\"yast2-novell-casa\" -DPACKAGE_TARNAME=\"yast2-novell-casa\" -DPACKAGE_VERSION=\"1.6.0\" -DPACKAGE_STRING=\"yast2-novell-casa\ 1.6.0\" -DPACKAGE_BUGREPORT=\"http://www.suse.de/feedback\" -DPACKAGE=\"yast2-novell-casa\" -DVERSION=\"1.6.0\" 
+DEFS = -DPACKAGE_NAME=\"yast2-CASA\" -DPACKAGE_TARNAME=\"yast2-CASA\" -DPACKAGE_VERSION=\"1.6.0\" -DPACKAGE_STRING=\"yast2-CASA\ 1.6.0\" -DPACKAGE_BUGREPORT=\"http://www.suse.de/feedback\" -DPACKAGE=\"yast2-CASA\" -DVERSION=\"1.6.0\" 
 ECHO_C = 
 ECHO_N = -n
 ECHO_T = 
@@ -98,15 +98,15 @@ LN_S = ln -s
 LTLIBOBJS = 
 MAINTAINER = casa <casa@novell.com>
 MAKEINFO = ${SHELL} /home/nds_cm/dev/yast/casa-yast/missing --run makeinfo
-PACKAGE = yast2-novell-casa
+PACKAGE = yast2-CASA
 PACKAGE_BUGREPORT = http://www.suse.de/feedback
-PACKAGE_NAME = yast2-novell-casa
-PACKAGE_STRING = yast2-novell-casa 1.6.0
-PACKAGE_TARNAME = yast2-novell-casa
+PACKAGE_NAME = yast2-CASA
+PACKAGE_STRING = yast2-CASA 1.6.0
+PACKAGE_TARNAME = yast2-CASA
 PACKAGE_VERSION = 1.6.0
 PATH_SEPARATOR = :
 PKG_CONFIG_PATH = 
-RPMNAME = yast2-novell-casa
+RPMNAME = yast2-CASA
 SET_MAKE = 
 SHELL = /bin/sh
 STRIP = 
@@ -134,7 +134,7 @@ build_vendor = suse
 clientdir = ${prefix}/share/YaST2/clients
 datadir = ${prefix}/share
 desktopdir = ${prefix}/share/applications/YaST2
-docdir = ${prefix}/share/doc/packages/yast2-novell-casa
+docdir = ${prefix}/share/doc/packages/yast2-CASA
 exec_prefix = ${prefix}
 execcompdir = ${prefix}/lib/YaST2
 fillupdir = /var/adm/fillup-templates
@@ -175,13 +175,13 @@ themedir = /usr/share/pixmaps
 yast2dir = ${prefix}/share/YaST2
 ybindir = ${prefix}/lib/YaST2/bin
 ydatadir = ${prefix}/share/YaST2/data
-yncludedir = ${prefix}/share/YaST2/include/novell-casa
+yncludedir = ${prefix}/share/YaST2/include/CASA
 ystartupdir = ${prefix}/lib/YaST2
 iconsdir = /usr/share/applications
 client_DATA = \
-	novell-casa.ycp		\
-	novell-casa_auto.ycp	\
-	novell-casa_proposal.ycp
+	CASA.ycp		\
+	CASA_auto.ycp	\
+	CASA_proposal.ycp
 
 ynclude_DATA = \
 	helps.ycp		\
@@ -190,7 +190,7 @@ ynclude_DATA = \
 	complex.ycp
 
 desktop_DATA = \
-	novell-casa.desktop
+	CASA.desktop
 
 module_DATA = \
 	NovellCasa.ycp
diff --git a/casa-yast/src/Makefile.am b/casa-yast/src/Makefile.am
index d0a40ccd..ca263fa9 100644
--- a/casa-yast/src/Makefile.am
+++ b/casa-yast/src/Makefile.am
@@ -1,14 +1,14 @@
-# Makefile.am for novell-casa/src
+# Makefile.am for CASA/src
 
-yncludedir = @yncludedir@/novell-casa
+yncludedir = @yncludedir@/CASA
 iconsdir = /usr/share/applications
 themedir = /usr/share/pixmaps
 
 
 client_DATA =			\
-	novell-casa.ycp		\
-	novell-casa_auto.ycp	\
-	novell-casa_proposal.ycp
+	CASA.ycp		\
+	CASA_auto.ycp		\
+	CASA_proposal.ycp
 
 ynclude_DATA =			\
 	helps.ycp		\
@@ -17,7 +17,7 @@ ynclude_DATA =			\
 	complex.ycp
 
 desktop_DATA =			\
-	novell-casa.desktop
+	CASA.desktop
 
 module_DATA =			\
 	NovellCasa.ycp
diff --git a/casa-yast/src/Makefile.in b/casa-yast/src/Makefile.in
index c1efd9d2..e2be6da7 100644
--- a/casa-yast/src/Makefile.in
+++ b/casa-yast/src/Makefile.in
@@ -2,7 +2,7 @@
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# Makefile.am for novell-casa/src
+# Makefile.am for CASA/src
 
 # Makefile.am.common					-*- Makefile -*-
 # Generated file, do not edit!
@@ -175,13 +175,13 @@ themedir = /usr/share/pixmaps
 yast2dir = @yast2dir@
 ybindir = @ybindir@
 ydatadir = @ydatadir@
-yncludedir = @yncludedir@/novell-casa
+yncludedir = @yncludedir@/CASA
 ystartupdir = @ystartupdir@
 iconsdir = /usr/share/applications
 client_DATA = \
-	novell-casa.ycp		\
-	novell-casa_auto.ycp	\
-	novell-casa_proposal.ycp
+	CASA.ycp		\
+	CASA_auto.ycp	\
+	CASA_proposal.ycp
 
 ynclude_DATA = \
 	helps.ycp		\
@@ -190,7 +190,7 @@ ynclude_DATA = \
 	complex.ycp
 
 desktop_DATA = \
-	novell-casa.desktop
+	CASA.desktop
 
 module_DATA = \
 	NovellCasa.ycp
diff --git a/casa-yast/src/NovellCasa.pm b/casa-yast/src/NovellCasa.pm
index 2ff18439..ff1c01d1 100644
--- a/casa-yast/src/NovellCasa.pm
+++ b/casa-yast/src/NovellCasa.pm
@@ -1,12 +1,37 @@
 #! /usr/bin/perl -w
 # File:		modules/NovellCasa.pm
-# Package:	Configuration of novell-casa
+# Package:	Configuration of CASA
 # Summary:	NovellCasa settings, input and output functions
 # Authors:	casa <casa@novell.com>
 #
 # $Id: NovellCasa.pm,v 1.5 2004/02/11 10:31:12 mvidner Exp $
+#------------------------------------------------------------------------------
+# Comments to:
+#   support@Novell.com
+#------------------------------------------------------------------------------
 #
-# Representation of the configuration of novell-casa.
+#  Copyright (C) 2005-2006 Novell, Inc. All Rights Reserved.
+#
+#  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; 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
+#  Library 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, Novell, Inc.
+# 
+#  To contact Novell about this file by physical or electronic mail, 
+#  you may find current contact information at www.novell.com.
+# 
+#
+#------------------------------------------------------------------------------
+#
+# Representation of the configuration of CASA.
 # Input and output routines.
 
 
@@ -21,7 +46,7 @@ use Locale::gettext;
 use POSIX ();     # Needed for setlocale()
 
 POSIX::setlocale(LC_MESSAGES, "");
-textdomain("novell-casa");
+textdomain("CASA");
 
 sub _ {
     return gettext($_[0]);
@@ -59,7 +84,7 @@ sub Modified {
     return Boolean($modified);
 }
 
-# Settings: Define all variables needed for configuration of novell-casa
+# Settings: Define all variables needed for configuration of CASA
 # TODO FIXME: Define all the variables necessary to hold
 # TODO FIXME: the configuration here (with the appropriate
 # TODO FIXME: description)
@@ -75,14 +100,14 @@ sub Modified {
 #   my $additional_parameter = 1;
 
 ##
- # Read all novell-casa settings
+ # Read all CASA settings
  # @return true on success
  #
 BEGIN { $TYPEINFO{Read} = ["function", "boolean"]; }
 sub Read {
 
     # NovellCasa read dialog caption
-    my $caption = _("Initializing novell-casa Configuration");
+    my $caption = _("Initializing CASA Configuration");
 
     # TODO FIXME Set the right number of stages
     my $steps = 4;
@@ -157,14 +182,14 @@ sub Read {
 }
 
 ##
- # Write all novell-casa settings
+ # Write all CASA settings
  # @return true on success
  #
 BEGIN { $TYPEINFO{Write} = ["function", "boolean"]; }
 sub Write {
 
     # NovellCasa read dialog caption
-    my $caption = _("Saving novell-casa Configuration");
+    my $caption = _("Saving CASA Configuration");
 
     # TODO FIXME And set the right number of stages
     my $steps = 2;
@@ -216,7 +241,7 @@ sub Write {
 }
 
 ##
- # Get all novell-casa settings from the first parameter
+ # Get all CASA settings from the first parameter
  # (For use by autoinstallation.)
  # @param settings The YCP structure to be imported.
  # @return boolean True on success
@@ -229,7 +254,7 @@ sub Import {
 }
 
 ##
- # Dump the novell-casa settings to a single map
+ # Dump the CASA settings to a single map
  # (For use by autoinstallation.)
  # @return map Dumped settings (later acceptable by Import ())
  #
diff --git a/casa-yast/src/NovellCasa.ycp b/casa-yast/src/NovellCasa.ycp
index 1a9570d2..f84653a7 100644
--- a/casa-yast/src/NovellCasa.ycp
+++ b/casa-yast/src/NovellCasa.ycp
@@ -1,19 +1,38 @@
 /**
  * File:	modules/NovellCasa.ycp
- * Package:	Configuration of novell-casa
+ * Package:	Configuration of CASA
  * Summary:	NovellCasa settings, input and output functions
  * Authors:	casa <casa@novell.com>
  *
- * $Id: NovellCasa.ycp,v 1.13 2004/03/15 13:18:08 mvidner Exp $
+ *********************************************************************
+ * Copyright (C) 2005-2006 Novell, Inc. All Rights Reserved.
  *
- * Representation of the configuration of novell-casa.
+ * 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; 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
+ * Library 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, Novell, Inc.
+ *
+ * To contact Novell about this file by physical or electronic mail, 
+ * you may find current contact information at www.novell.com.
+ *
+ *********************************************************************
+ *
+ * Representation of the configuration of CASA.
  * Input and output routines.
  */
 
 {
 
 module "NovellCasa";
-textdomain "novell-casa";
+textdomain "CASA";
 
 import "Progress";
 import "Report";
@@ -66,7 +85,7 @@ global boolean Modified() {
     return modified;
 }
 
-// Settings: Define all variables needed for configuration of novell-casa
+// Settings: Define all variables needed for configuration of CASA
 // TODO FIXME: Define all the variables necessary to hold
 // TODO FIXME: the configuration here (with the appropriate
 // TODO FIXME: description)
@@ -82,13 +101,13 @@ global boolean Modified() {
 //   boolean additional_parameter = true;
 
 /**
- * Read all novell-casa settings
+ * Read all CASA settings
  * @return true on success
  */
 global boolean Read() {
 
     /* NovellCasa read dialog caption */
-    string caption = _("Initializing novell-casa Configuration");
+    string caption = _("Initializing CASA Configuration");
 
     // TODO FIXME Set the right number of stages
     integer steps = 4;
@@ -157,13 +176,13 @@ global boolean Read() {
 }
 
 /**
- * Write all novell-casa settings
+ * Write all CASA settings
  * @return true on success
  */
 global boolean Write() {
 
     /* NovellCasa read dialog caption */
-    string caption = _("Saving novell-casa Configuration");
+    string caption = _("Saving CASA Configuration");
 
     // TODO FIXME And set the right number of stages
     integer steps = 2;
@@ -213,7 +232,7 @@ global boolean Write() {
 }
 
 /**
- * Get all novell-casa settings from the first parameter
+ * Get all CASA settings from the first parameter
  * (For use by autoinstallation.)
  * @param settings The YCP structure to be imported.
  * @return boolean True on success
@@ -224,7 +243,7 @@ global boolean Import (map settings) {
 }
 
 /**
- * Dump the novell-casa settings to a single map
+ * Dump the CASA settings to a single map
  * (For use by autoinstallation.)
  * @return map Dumped settings (later acceptable by Import ())
  */
diff --git a/casa-yast/src/complex.ycp b/casa-yast/src/complex.ycp
index 396fa778..171febc8 100644
--- a/casa-yast/src/complex.ycp
+++ b/casa-yast/src/complex.ycp
@@ -1,15 +1,35 @@
 /**
- * File:	include/novell-casa/complex.ycp
- * Package:	Configuration of novell-casa
+ * File:	include/CASA/complex.ycp
+ * Package:	Configuration of CASA
  * Summary:	Dialogs definitions
  * Authors:	casa <casa@novell.com>
  *
- * $Id: complex.ycp,v 1.6 2004/02/05 15:16:57 msvec Exp $
+ *********************************************************************
+ * Copyright (C) 2005-2006 Novell, Inc. All Rights Reserved.
+ *
+ * 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; 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
+ * Library 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, Novell, Inc.
+ *
+ * To contact Novell about this file by physical or electronic mail, 
+ * you may find current contact information at www.novell.com.
+ *
+ *********************************************************************
+ *
  */
 
 {
 
-textdomain "novell-casa";
+textdomain "CASA";
 
 import "Label";
 import "Popup";
@@ -17,7 +37,7 @@ import "Wizard";
 //import "Wizard_hw";
 import "NovellCasa";
 
-include "novell-casa/helps.ycp";
+include "CASA/helps.ycp";
 
 /**
  * Return a modification status
diff --git a/casa-yast/src/dialogs.ycp b/casa-yast/src/dialogs.ycp
index af694faa..265259a9 100644
--- a/casa-yast/src/dialogs.ycp
+++ b/casa-yast/src/dialogs.ycp
@@ -1,21 +1,41 @@
 /**
- * File:	include/novell-casa/dialogs.ycp
- * Package:	Configuration of novell-casa
+ * File:	include/CASA/dialogs.ycp
+ * Package:	Configuration of CASA
  * Summary:	Dialogs definitions
  * Authors:	casa <casa@novell.com>
  *
- * $Id: dialogs.ycp,v 1.6 2004/02/05 11:29:30 msvec Exp $
+ *********************************************************************
+ * Copyright (C) 2005-2006 Novell, Inc. All Rights Reserved.
+ *
+ * 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; 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
+ * Library 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, Novell, Inc.
+ *
+ * To contact Novell about this file by physical or electronic mail, 
+ * you may find current contact information at www.novell.com.
+ *
+ *********************************************************************
+ *
  */
 
 {
 
-textdomain "novell-casa";
+textdomain "CASA";
 
 import "Label";
 import "Wizard";
 import "NovellCasa";
 
-include "novell-casa/helps.ycp";
+include "CASA/helps.ycp";
 
 /**
  * Configure1 dialog
@@ -27,7 +47,7 @@ any Configure1Dialog () {
     string caption = _("Novell CASA Configuration");
 
     /* NovellCasa configure1 dialog contents */
-    term contents = `Label (_("First part of configuration of novell-casa"));
+    term contents = `Label (_("First part of configuration of CASA"));
 
     Wizard::SetContentsButtons(caption, contents, HELPS["c1"]:"",
 	    Label::BackButton(), Label::NextButton());
@@ -64,7 +84,7 @@ any Configure2Dialog () {
     string caption = _("Novell CASA Configuration");
 
     /* NovellCasa configure2 dialog contents */
-    term contents = `Label (_("Second part of configuration of novell-casa"));
+    term contents = `Label (_("Second part of configuration of CASA"));
 
     Wizard::SetContentsButtons(caption, contents, HELPS["c2"]:"",
 	    Label::BackButton(), Label::NextButton());
diff --git a/casa-yast/src/helps.ycp b/casa-yast/src/helps.ycp
index fabc67a4..502a3e61 100644
--- a/casa-yast/src/helps.ycp
+++ b/casa-yast/src/helps.ycp
@@ -1,15 +1,35 @@
 /**
- * File:	include/novell-casa/helps.ycp
- * Package:	Configuration of novell-casa
+ * File:	include/CASA/helps.ycp
+ * Package:	Configuration of CASA
  * Summary:	Help texts of all the dialogs
  * Authors:	casa <casa@novell.com>
  *
- * $Id: helps.ycp,v 1.4 2004/02/05 11:29:30 msvec Exp $
+*********************************************************************
+ * Copyright (C) 2005-2006 Novell, Inc. All Rights Reserved.
+ *
+ * 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; 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
+ * Library 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, Novell, Inc.
+ *
+ * To contact Novell about this file by physical or electronic mail, 
+ * you may find current contact information at www.novell.com.
+ *
+ *********************************************************************
+ *
  */
 
 {
 
-textdomain "novell-casa";
+textdomain "CASA";
 
 /**
  * All helps are here
diff --git a/casa-yast/src/icons/install_casa_yast_icons b/casa-yast/src/icons/install_casa_yast_icons
index 607075bb..14e5142d 100755
--- a/casa-yast/src/icons/install_casa_yast_icons
+++ b/casa-yast/src/icons/install_casa_yast_icons
@@ -7,20 +7,30 @@
 # Comments to:
 #   support@novell.com
 #------------------------------------------------------------------------------
-# Copyright 2005, Novell, Inc.
 #
-# This program 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.
+#  Copyright (C) 2005-2006 Novell, Inc. All Rights Reserved.
+#
+#  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; 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
+#  Library 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, Novell, Inc.
+# 
+#  To contact Novell about this file by physical or electronic mail, 
+#  you may find current contact information at www.novell.com.
+# 
 #
-# This script and its embedded programs are distributed with
-# absolutely, positively NO WARRANTY WHATSOEVER, without even the
-# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-# PURPOSE.  The author and Novell, Inc. take no responsibility for
-# the consequences of running this script.
 #------------------------------------------------------------------------------
 #
-#   START_DIR = pwd - the current working directory
+#   START_DIR    =   pwd - the current working directory
+#                          this is the directory where this script is executed from
 #
 #------------------------------------------------------------------------------
 
@@ -31,7 +41,7 @@ DATE=`date`
 SOURCE22_ICON=CASA_22.png
 SOURCE32_ICON=CASA_32.png
 SOURCE48_ICON=CASA_48.png
-DEST_ICON=novell-casa.png
+DEST_ICON=CASA.png
 
 determineIfSourceExists ()
 {
@@ -200,7 +210,7 @@ DIR_48=48x48
 ICON_SOURCE="/usr/share/pixmaps"
 APPS_DIR="apps"
 ICONS_DIR="icons"
-ICON_FILE="novell-casa.png"
+ICON_FILE="CASA.png"
 
 if [ -z "$1" ]
 then
diff --git a/casa-yast/src/novell-casa.desktop b/casa-yast/src/novell-casa.desktop
index f08e10e1..4af8b565 100644
--- a/casa-yast/src/novell-casa.desktop
+++ b/casa-yast/src/novell-casa.desktop
@@ -6,7 +6,7 @@ X-KDE-ModuleType=Library
 X-KDE-RootOnly=true
 X-KDE-HasReadOnlyMode=true
 X-KDE-Library=yast2
-X-SuSE-YaST-Call=novell-casa
+X-SuSE-YaST-Call=CASA
 
 X-SuSE-YaST-Group=Security
 X-SuSE-YaST-Argument=
@@ -14,10 +14,10 @@ X-SuSE-YaST-RootOnly=true
 X-SuSE-YaST-AutoInst=
 X-SuSE-YaST-Geometry=
 X-SuSE-YaST-SortKey=
-X-SuSE-YaST-AutoInstResource=novell-casa
+X-SuSE-YaST-AutoInstResource=CASA
 
-Icon=novell-casa
-Exec=/sbin/yast2 novell-casa 
+Icon=CASA
+Exec=/sbin/yast2 CASA 
 
 Name=Novell CASA
-GenericName=Configure novell-casa
+GenericName=Configure CASA
diff --git a/casa-yast/src/novell-casa.ycp b/casa-yast/src/novell-casa.ycp
index 29fe8d4a..2d707bf5 100644
--- a/casa-yast/src/novell-casa.ycp
+++ b/casa-yast/src/novell-casa.ycp
@@ -1,21 +1,40 @@
 /**
- * File:	clients/novell-casa.ycp
- * Package:	Configuration of novell-casa
+ * File:	clients/CASA.ycp
+ * Package:	Configuration of CASA
  * Summary:	Main file
  * Authors:	casa <casa@novell.com>
  *
- * $Id: novell-casa.ycp,v 1.9 2004/02/05 15:16:57 msvec Exp $
+ *********************************************************************
+ * Copyright (C) 2005-2006 Novell, Inc. All Rights Reserved.
  *
- * Main file for novell-casa configuration. Uses all other files.
+ * 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; 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
+ * Library 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, Novell, Inc.
+ *
+ * To contact Novell about this file by physical or electronic mail, 
+ * you may find current contact information at www.novell.com.
+ *
+ *********************************************************************
+ *
+ * Main file for CASA configuration. Uses all other files.
  */
 
 {
 
 /***
- * <h3>Configuration of novell-casa</h3>
+ * <h3>Configuration of CASA</h3>
  */
 
-textdomain "novell-casa";
+textdomain "CASA";
 
 /* The main () */
 y2milestone ("----------------------------------------");
@@ -26,12 +45,12 @@ import "Report";
 import "Summary";
 
 import "CommandLine";
-include "novell-casa/wizards.ycp";
+include "CASA/wizards.ycp";
 
 map cmdline_description = $[
-    "id" 	: "novell-casa",
-    /* Command line help text for the Xnovell-casa module */
-    "help"	: _("Configuration of novell-casa"),
+    "id" 	: "CASA",
+    /* Command line help text for the XCASA module */
+    "help"	: _("Configuration of CASA"),
     "guihandler"        : NovellCasaSequence,
     "initialize"        : NovellCasa::Read,
     "finish"            : NovellCasa::Write,
diff --git a/casa-yast/src/novell-casa_auto.ycp b/casa-yast/src/novell-casa_auto.ycp
index 4f89ce6f..af6083af 100644
--- a/casa-yast/src/novell-casa_auto.ycp
+++ b/casa-yast/src/novell-casa_auto.ycp
@@ -1,10 +1,29 @@
 /**
- * File:	clients/novell-casa_auto.ycp
- * Package:	Configuration of novell-casa
+ * File:	clients/CASA_auto.ycp
+ * Package:	Configuration of CASA
  * Summary:	Client for autoinstallation
  * Authors:	casa <casa@novell.com>
  *
- * $Id: novell-casa_auto.ycp,v 1.12 2004/01/28 21:24:07 nashif Exp $
+ *********************************************************************
+ * Copyright (C) 2005-2006 Novell, Inc. All Rights Reserved.
+ *
+ * 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; 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
+ * Library 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, Novell, Inc.
+ *
+ * To contact Novell about this file by physical or electronic mail, 
+ * you may find current contact information at www.novell.com.
+ *
+ *********************************************************************
  *
  * This is a client for autoinstallation. It takes its arguments,
  * goes through the configuration and return the setting.
@@ -13,21 +32,21 @@
 
 /**
  * @param function to execute
- * @param map/list of novell-casa settings
+ * @param map/list of CASA settings
  * @return map edited settings, Summary or boolean on success depending on called function
  * @example map mm = $[ "FAIL_DELAY" : "77" ];
- * @example map ret = WFM::CallFunction ("novell-casa_auto", [ "Summary", mm ]);
+ * @example map ret = WFM::CallFunction ("CASA_auto", [ "Summary", mm ]);
  */
 
 {
 
-textdomain "novell-casa";
+textdomain "CASA";
 
 y2milestone("----------------------------------------");
 y2milestone("Novell CASA auto started");
 
 import "NovellCasa";
-include "novell-casa/wizards.ycp";
+include "CASA/wizards.ycp";
 
 any ret = nil;
 string func = "";
diff --git a/casa-yast/src/novell-casa_proposal.ycp b/casa-yast/src/novell-casa_proposal.ycp
index 45febcc3..5cf758a1 100644
--- a/casa-yast/src/novell-casa_proposal.ycp
+++ b/casa-yast/src/novell-casa_proposal.ycp
@@ -1,18 +1,37 @@
 /**
- * File:	clients/novell-casa_proposal.ycp
- * Package:	Configuration of novell-casa
+ * File:	clients/CASA_proposal.ycp
+ * Package:	Configuration of CASA
  * Summary:	Proposal function dispatcher.
  * Authors:	casa <casa@novell.com>
  *
- * $Id: novell-casa_proposal.ycp,v 1.6 2004/02/05 11:29:30 msvec Exp $
+ *********************************************************************
+ * Copyright (C) 2005-2006 Novell, Inc. All Rights Reserved.
  *
- * Proposal function dispatcher for novell-casa configuration.
+ * 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; 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
+ * Library 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, Novell, Inc.
+ *
+ * To contact Novell about this file by physical or electronic mail, 
+ * you may find current contact information at www.novell.com.
+ *
+ *********************************************************************
+ *
+ * Proposal function dispatcher for CASA configuration.
  * See source/installation/proposal/proposal-API.txt
  */
 
 {
 
-textdomain "novell-casa";
+textdomain "CASA";
 
 import "NovellCasa";
 import "Progress";
@@ -50,7 +69,7 @@ if(func == "MakeProposal") {
 /* run the module */
 else if(func == "AskUser") {
     map stored = NovellCasa::Export();
-    symbol seq = (symbol) WFM::CallFunction("novell-casa", [.propose]);
+    symbol seq = (symbol) WFM::CallFunction("CASA", [.propose]);
     if(seq != `next) NovellCasa::Import(stored);
 
     y2debug("stored=%1",stored);
@@ -66,7 +85,7 @@ else if(func == "Description") {
 	"rich_text_title" : _("Novell CASA"),
 	/* Menu title for NovellCasa in proposals */
 	"menu_title" : _("&Novell CASA"),
-	"id" : "novell-casa",
+	"id" : "CASA",
     ];
 }
 /* write the proposal */
diff --git a/casa-yast/src/wizards.ycp b/casa-yast/src/wizards.ycp
index 778d7c81..d68a412c 100644
--- a/casa-yast/src/wizards.ycp
+++ b/casa-yast/src/wizards.ycp
@@ -1,24 +1,44 @@
 /**
- * File:	include/novell-casa/wizards.ycp
- * Package:	Configuration of novell-casa
+ * File:	include/CASA/wizards.ycp
+ * Package:	Configuration of CASA
  * Summary:	Wizards definitions
  * Authors:	casa <casa@novell.com>
  *
- * $Id: wizards.ycp,v 1.6 2004/02/05 11:29:30 msvec Exp $
+ *********************************************************************
+ * Copyright (C) 2005-2006 Novell, Inc. All Rights Reserved.
+ *
+ * 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; 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
+ * Library 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, Novell, Inc.
+ *
+ * To contact Novell about this file by physical or electronic mail, 
+ * you may find current contact information at www.novell.com.
+ *
+ *********************************************************************
+ *
  */
 
 {
 
-textdomain "novell-casa";
+textdomain "CASA";
 
 import "Sequencer";
 import "Wizard";
 
-include "novell-casa/complex.ycp";
-include "novell-casa/dialogs.ycp";
+include "CASA/complex.ycp";
+include "CASA/dialogs.ycp";
 
 /**
- * Add a configuration of novell-casa
+ * Add a configuration of CASA
  * @return sequence result
  */
 any AddSequence() {
@@ -46,7 +66,7 @@ any AddSequence() {
 }
 
 /**
- * Main workflow of the novell-casa configuration
+ * Main workflow of the CASA configuration
  * @return sequence result
  */
 any MainSequence() {
@@ -96,7 +116,7 @@ any MainSequence() {
 }
 
 /**
- * Whole configuration of novell-casa
+ * Whole configuration of CASA
  * @return sequence result
  */
 any NovellCasaSequence() {
@@ -124,7 +144,7 @@ any NovellCasaSequence() {
     ];
 
     Wizard::CreateDialog();
-    Wizard::SetDesktopIcon("novell-casa");
+    Wizard::SetDesktopIcon("CASA");
 
     any ret = Sequencer::Run(aliases, sequence);
 
@@ -133,7 +153,7 @@ any NovellCasaSequence() {
 }
 
 /**
- * Whole configuration of novell-casa but without reading and writing.
+ * Whole configuration of CASA but without reading and writing.
  * For use with autoinstallation.
  * @return sequence result
  */
diff --git a/casa-yast/yast2-novell-casa.spec.in b/casa-yast/yast2-CASA.spec.in
similarity index 80%
rename from casa-yast/yast2-novell-casa.spec.in
rename to casa-yast/yast2-CASA.spec.in
index 9f910eb5..6864f617 100644
--- a/casa-yast/yast2-novell-casa.spec.in
+++ b/casa-yast/yast2-CASA.spec.in
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-novell-casa (Version 1.6.462)
+# spec file for package yast2-CASA (Version 1.6.462)
 #
 # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -12,7 +12,7 @@
 
 @HEADER-COMMENT@
 
-Name:		yast2-novell-casa
+Name:		yast2-CASA
 BuildRequires:	yast2-devel yast2-devtools update-desktop-files
 Version:	1.6.462
 Release:	0
@@ -45,14 +45,14 @@ chmod 555 $RPM_BUILD_ROOT/usr/share/applications/install_casa_yast_icons
 @CLEAN@
 
 %post
-echo "yast2-novell-casa post install script"
+echo "yast2-CASA post install script"
 echo "installing the Novell CASA YaST icon files"
 /usr/share/applications/install_casa_yast_icons install rpm
 exit 0
 
 %preun
 if [ "$1" = 0 ]; then
-	echo "yast2-novell-casa pre uninstall script"
+	echo "yast2-CASA pre uninstall script"
 	echo "removing the Novell CASA YaST icon files"
 	/usr/share/applications/install_casa_yast_icons uninstall rpm
 fi
@@ -61,14 +61,14 @@ exit 0
 
 %files
 %defattr(-,root,root)
-%dir @yncludedir@/novell-casa
+%dir @yncludedir@/CASA
 /usr/share/applications/install_casa_yast_icons
 /usr/share/pixmaps/CASA_22.png
 /usr/share/pixmaps/CASA_32.png
 /usr/share/pixmaps/CASA_48.png
-@yncludedir@/novell-casa/*
-@clientdir@/novell-casa.ycp
-@clientdir@/novell-casa_*.ycp
-@moduledir@/NovellCasa.*
-@desktopdir@/novell-casa.desktop
+@yncludedir@/CASA/*
+@clientdir@/CASA.ycp
+@clientdir@/CASA_*.ycp
+@moduledir@/Casa.*
+@desktopdir@/CASA.desktop
 %doc @docdir@