Bug(s) fixed: 172005

Bug Description: Change ldapserver version to 1.0
Reviewed by: Noriko (Thanks!)
Fix Description: This also fixes some lingering build issues involving
perldap, which is no longer a separate setup package, but just gets
included into DS in a similar manner to nspr, nss, etc.
Platforms tested: RHEL4
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none

2 files changed, 26 insertions, 26 deletions

diff --git a/include/nt/regparms.h b/include/nt/regparms.h
index f0cbeff5..a76a9534 100644
--- a/include/nt/regparms.h
+++ b/include/nt/regparms.h
@@ -77,19 +77,19 @@
 /* Admin IDs */
 #define ADM_ID_PRODUCT         "admin"
 #define ADM_NAME_SHORT         "Administration"
-#define ADM_VERSION            "7.0"
-#define ADM_NAME_VERSION       "Administration 7.0"
+#define ADM_VERSION            "1.0"
+#define ADM_NAME_VERSION       "Administration 1.0"
 #define ADM_NAME_SERVER        "Administration Server"
 #define ADM_NAME_FULL          "Fedora Administration Server"
-#define ADM_NAME_FULL_VERSION  "Fedora Administration Server 7.0"
-#define ADM_NAME_SERVICE       "Fedora Administration 7.0"
+#define ADM_NAME_FULL_VERSION  "Fedora Administration Server 1.0"
+#define ADM_NAME_SERVICE       "Fedora Administration 1.0"
 #define ADM_EXE                "ns-admin.exe"
 #define ADM_EXE_START          "admin.exe"
-#define ADM_ID_SERVICE         "admin70"
-#define ADM_KEY_ROOT           "Administration\\7.0"
+#define ADM_ID_SERVICE         "admin10"
+#define ADM_KEY_ROOT           "Administration\\1.0"
 #define ADM_SERVER_LST_NAME    "adm:Netscape Enterprise Server"
 #define ADM_DIR_ROOT           "admin"
-#define ADM_NAME_UNINSTALL     "Uninstall Administration Server 7.0"
+#define ADM_NAME_UNINSTALL     "Uninstall Administration Server 1.0"
 
 #if defined( NS_DS )
 #define ADMIN_SERVICE_NAME      "Admin Server" 
@@ -249,15 +249,15 @@
 /* Synchronization Service IDs */
 #define DSS_SHORT_NAME           "Directory Synchronization Service"
 #define DSS_SERVER_NAME          "Fedora Directory Synchronization Service"
-#define DSS_SERVER_VERSION       "7"
+#define DSS_SERVER_VERSION       "1"
 #define DSS_SETUP_SHORT_NAME     "Fedora Synchronization Service"
-#define DSS_SETUP_NAME           "Fedora Directory Synchronization Service 7"
+#define DSS_SETUP_NAME           "Fedora Directory Synchronization Service 1"
 #define DSS_REGISTRY_ROOT_KEY    "Directory Synchronization Service"
 #define DSS_EXE                  "dssynch.exe"
 #define DSS_DIR_ROOT             "dssynch"
 #define DSS_APP_PATH_KEY         "dssynch.exe"
 #define DSS_CONFIG_TOOL          "synchcfg.exe"
-#define DSS_UNINSTALL_KEY        "SynchronizationV7"
+#define DSS_UNINSTALL_KEY        "SynchronizationV1"
 #define DSS_SERVER_LST_NAME      "dssynch:Netscape Directory Synchronization Service"
 #define DSS_SERVICE_PREFIX       "Fedora Directory Synchronization Service "
 #define DSS_README_ICON_NAME     "Directory Synchronization Service README"
@@ -378,35 +378,35 @@
 */
 #define DS_SHORT_NAME           "Directory Server"
 #define DS_SERVER_NAME          "Fedora Directory Server"
-#define DS_SERVER_VERSION       "7"
+#define DS_SERVER_VERSION       "1"
 #define DS_SETUP_SHORT_NAME     "Directory Server"
-#define DS_SETUP_NAME           "Fedora Directory Server 7"
+#define DS_SETUP_NAME           "Fedora Directory Server 1"
 #define DS_REGISTRY_ROOT_KEY    "Directory Server"
 #define DS_APP_PATH_KEY         "ns-slapd.exe"
-#define DS_UNINSTALL_KEY        "DirectoryV7"
+#define DS_UNINSTALL_KEY        "DirectoryV1"
 #define DS_SERVICE_PREFIX       "Fedora Directory Server "
-#define DS_README_ICON_NAME     "Directory Server 7 README"
-#define DS_UNINSTALL_ICON_NAME  "Uninstall Directory Server 7"
+#define DS_README_ICON_NAME     "Directory Server 1 README"
+#define DS_UNINSTALL_ICON_NAME  "Uninstall Directory Server 1"
 #define DS_PRODUCT_NAME         "slapd"
 
 #define DS_ID_PRODUCT           "slapd"
 #define DS_NAME_SHORT           "Directory"
 #define DS_VERSION_OLD          "3.0"
 #undef  DS_VERSION
-#define DS_VERSION              "7"
-#define DS_NAME_VERSION         "Directory 7"
+#define DS_VERSION              "1"
+#define DS_NAME_VERSION         "Directory 1"
 #define DS_NAME_SERVER          "Directory Server"
 #define DS_NAME_FULL            "Fedora Directory Server"
-#define DS_NAME_FULL_VERSION    "Fedora Directory Server 7"
-#define DS_NAME_SERVICE         "Fedora Directory 7"
+#define DS_NAME_FULL_VERSION    "Fedora Directory Server 1"
+#define DS_NAME_SERVICE         "Fedora Directory 1"
 #define DS_EXE                  "ns-slapd.exe"
 #define DS_EXE_START            "slapd.exe"
 #define DS_ID_SERVICE           "slapd"
-#define DS_KEY_ROOT             "Directory\\7"
+#define DS_KEY_ROOT             "Directory\\1"
 #define DS_KEY_ROOT_OLD         "Directory\\3.0"
 #define DS_SERVER_LST_NAME      "slapd:Fedora Directory Server"
 #define DS_DIR_ROOT             "slapd"
-#define DS_NAME_UNINSTALL       "Uninstall Directory Server 7"
+#define DS_NAME_UNINSTALL       "Uninstall Directory Server 1"
 #define DS_SNMP_PATH            "bin\\slapd\\server\\ns-ldapagt.dll"
 #define DS_OPTIONS              "Select the installation option from below"
 #define DS_OPTIONS_TITLE 		"Directory Server Installions Options"
diff --git a/include/version.h b/include/version.h
index f8520232..4d1caffc 100644
--- a/include/version.h
+++ b/include/version.h
@@ -44,18 +44,18 @@
    exist, the PRODUCT_VERSION define has _DEF appended.
  */
 
-#define DIRECTORY_VERSION_DEF "7.1"
+#define DIRECTORY_VERSION_DEF "1.0"
 #define DIRECTORY_COMPATIBLE "3.0"
-#define DIRECTORY_VERSION_STRING "Fedora-DirServer/7.1"
+#define DIRECTORY_VERSION_STRING "Fedora-DirServer/1.0"
 
 #define DS_VERSION_DEF DIRECTORY_VERSION_DEF
 #define DS_VERSION_STRING DIRECTORY_VERSION_STRING
 
 #define DSS_VERSION_DEF DIRECTORY_VERSION_DEF
-#define DSS_VERSION_STRING "Fedora-DirSynchService/7.1"
+#define DSS_VERSION_STRING "Fedora-DirSynchService/1.0"
 
-#define ADMSERV_VERSION_DEF "7.0"
-#define ADMSERV_VERSION_STRING "Fedora-Administrator/7.0"
+#define ADMSERV_VERSION_DEF "1.0"
+#define ADMSERV_VERSION_STRING "Fedora-Administrator/1.0"
 /* supposedly the trunk is currently the home of 3.x development */
 
 #define ENTERPRISE_VERSION_DEF "3.01"