From 49f312505cba4f2e089f9eb7291f89edc3fd7a76 Mon Sep 17 00:00:00 2001
From: Ivan Romanov <drizt@land.ru>
Date: Wed, 2 Oct 2013 22:12:32 +0600
Subject: [PATCH] no digit postffix in qcatool2 name

---
 CMakeLists.txt               |  6 +++---
 plugins/qca-pkcs11/README    |  2 +-
 tools/qcatool/CMakeLists.txt | 14 +++++++-------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3f583628..8823d580 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,10 +42,10 @@ set(QCA_LIB_PATCH_VERSION "3")
 set(QCA_LIB_SUFFIX "" CACHE STRING "Qca library suffix")
 if(QCA_LIB_SUFFIX)
   set(QCA_LIB_NAME qca-${QCA_LIB_SUFFIX})
-  set(QCA_MANPAGE_NAME qcatool2-${QCA_LIB_SUFFIX}.1)
+  set(QCA_MANPAGE_NAME qcatool-${QCA_LIB_SUFFIX}.1)
 else(QCA_LIB_SUFFIX)
   set(QCA_LIB_NAME qca)
-  set(QCA_MANPAGE_NAME qcatool2.1)
+  set(QCA_MANPAGE_NAME qcatool.1)
 endif(QCA_LIB_SUFFIX)
 
 set(QCA_LIB_VERSION_STRING "${QCA_LIB_MAJOR_VERSION}.${QCA_LIB_MINOR_VERSION}.${QCA_LIB_PATCH_VERSION}")
@@ -200,7 +200,7 @@ endif(NOT WIN32)
 configure_file("crypto.prf.cmake" "${CMAKE_BINARY_DIR}/crypto.prf" @ONLY)
 install(FILES "${CMAKE_BINARY_DIR}/crypto.prf" DESTINATION "${QCA_FEATURE_INSTALL_DIR}")
 
-configure_file(man/qcatool2.1 "${CMAKE_BINARY_DIR}/${QCA_MANPAGE_NAME}" COPYONLY)
+configure_file(man/qcatool.1 "${CMAKE_BINARY_DIR}/${QCA_MANPAGE_NAME}" COPYONLY)
 install(FILES "${CMAKE_BINARY_DIR}/${QCA_MANPAGE_NAME}" DESTINATION "${QCA_MAN_INSTALL_DIR}/man1")
 
 add_subdirectory(src)
diff --git a/plugins/qca-pkcs11/README b/plugins/qca-pkcs11/README
index 37410c4d..11032f8d 100644
--- a/plugins/qca-pkcs11/README
+++ b/plugins/qca-pkcs11/README
@@ -31,7 +31,7 @@ CONFIGURATION
 	Configuration is stored at ~/.config/Affinix/QCA.conf, in order to
 	generate default configuration use:
 
-	$ qcatool2 config save qca-pkcs11 
+	$ qcatool config save qca-pkcs11
 
 	Attributes:
 		allow_load_rootca (Boolean)
diff --git a/tools/qcatool/CMakeLists.txt b/tools/qcatool/CMakeLists.txt
index e845ad4a..e77f56de 100644
--- a/tools/qcatool/CMakeLists.txt
+++ b/tools/qcatool/CMakeLists.txt
@@ -1,19 +1,19 @@
-project(qcatool2)
+project(qcatool)
 
-set(qcatool2_moc_SRCS main.cpp)
+set(qcatool_moc_SRCS main.cpp)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 
-MY_AUTOMOC( qcatool2_moc_SRCS )
+MY_AUTOMOC( qcatool_moc_SRCS )
 
-set(qcatool2_bin_SRCS ${qcatool2_moc_SRCS})  
+set(qcatool_bin_SRCS ${qcatool_moc_SRCS})
 
 if(QCA_LIB_SUFFIX)
-  set(QCATOOL_NAME qcatool2-${QCA_LIB_SUFFIX})
+  set(QCATOOL_NAME qcatool-${QCA_LIB_SUFFIX})
 else(QCA_LIB_SUFFIX)
-  set(QCATOOL_NAME qcatool2)
+  set(QCATOOL_NAME qcatool)
 endif(QCA_LIB_SUFFIX)
 
-add_executable(${QCATOOL_NAME} ${qcatool2_bin_SRCS})
+add_executable(${QCATOOL_NAME} ${qcatool_bin_SRCS})
 
 target_link_libraries( ${QCATOOL_NAME} ${QCA_LIB_NAME} ${QT_QTCORE_LIBRARY})