Removed some previous fixesrefactoring/version-number

- Source packages should be named by public version (i.e., as same number as in tag)
- Binary packages for Windows and macOS should be named by inner version
- The Stellarium User Guide and Doxygen documents should be named by public version
- For the version in config.ini should be used the public version

4 files changed, 15 insertions, 29 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d557d852a5..aafc9065d0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -126,13 +126,12 @@ SET(STELLARIUM_RELEASE_BUILD 0 CACHE BOOL "Set 1 to build as an official release
 IF(STELLARIUM_RELEASE_BUILD)
      ADD_DEFINITIONS(-DSTELLARIUM_RELEASE_BUILD)
      SET(SERIES "${STELLARIUM_MINOR}.x")
-     SET(WINDOWS_PACKAGE_VERSION "${STELLARIUM_PUBLIC_VERSION}.0.0")
-     SET(ISS_PACKAGE_VERSION "${STELLARIUM_PUBLIC_VERSION}")
+     SET(WINDOWS_PACKAGE_VERSION "${VERSION}.0")
 ELSE()
      SET(SERIES "head")
      ########### Get revision number for non-release builds ###########
      STRING(TIMESTAMP CDNUMBER "%j")
-     SET(WINDOWS_PACKAGE_VERSION "${STELLARIUM_PUBLIC_VERSION}.${CDNUMBER}.0")
+     SET(WINDOWS_PACKAGE_VERSION "${VERSION}.${CDNUMBER}")
      FIND_PACKAGE(Git QUIET)
      IF(Git_FOUND)
           MESSAGE(STATUS "Found Git ${GIT_VERSION_STRING}")
@@ -154,7 +153,6 @@ ELSE()
                # Let's use short hash in all cases
                STRING(SUBSTRING ${GIT_REVISION} 0 7 REVISION)
                SET(PACKAGE_VERSION "${VERSION}-${REVISION}")
-	       SET(ISS_PACKAGE_VERSION "${STELLARIUM_PUBLIC_VERSION}-${REVISION}")
                ADD_DEFINITIONS(-DGIT_REVISION="${REVISION}")
                ADD_DEFINITIONS(-DGIT_BRANCH="${GIT_BRANCH}")
                # check to use --depth param...
@@ -164,25 +162,19 @@ ELSE()
                     STRING(TIMESTAMP GIT_COMMITS "1%j")
                ENDIF()
                # better way to numbering
-	       SET(WINDOWS_PACKAGE_VERSION "${STELLARIUM_PUBLIC_VERSION}.${GIT_COMMITS}.0")
-	       SET(ISS_PACKAGE_VERSION "${STELLARIUM_PUBLIC_VERSION}-${GIT_COMMITS}")
+	       SET(WINDOWS_PACKAGE_VERSION "${VERSION}.${GIT_COMMITS}")
           ENDIF()
      ELSE()
           STRING(TIMESTAMP TODAY "%j%H%M")
-          SET(PACKAGE_VERSION "${VERSION}-${TODAY}")
-	  SET(ISS_PACKAGE_VERSION "${STELLARIUM_PUBLIC_VERSION}-${TODAY}")
+	  SET(PACKAGE_VERSION "${VERSION}-${TODAY}")
           ADD_DEFINITIONS(-DGIT_REVISION="${TODAY}")
           ADD_DEFINITIONS(-DGIT_BRANCH="tarball")
      ENDIF()
      IF(STELLARIUM_VERSION)
-	  # expected "x.y" version scheme now...
-	  SET(PACKAGE_VERSION "${STELLARIUM_VERSION}.0")
-	  SET(ISS_PACKAGE_VERSION "${STELLARIUM_VERSION}")
-	  SET(STELLARIUM_PUBLIC_VERSION "${STELLARIUM_VERSION}")
+	  SET(PACKAGE_VERSION "${STELLARIUM_VERSION}")
           ADD_DEFINITIONS(-DSTELLARIUM_VERSION="${STELLARIUM_VERSION}")
      ENDIF()     
 ENDIF()
-ADD_DEFINITIONS(-DISS_PACKAGE_VERSION="${ISS_PACKAGE_VERSION}")
 MESSAGE(STATUS "Building ${PROJECT_NAME} ${STELLARIUM_PUBLIC_VERSION} (v${PACKAGE_VERSION}; Mode: ${CMAKE_BUILD_TYPE})")
 
 # Write version and series of Stellarium to Stellarium User Guide
@@ -737,7 +729,7 @@ IF(WIN32)
      #######################################################
 
      IF(STELLARIUM_RELEASE_BUILD)
-	  SET(PACKAGE_VERSION_RC "${STELLARIUM_PUBLIC_VERSION},0,0")
+	  SET(PACKAGE_VERSION_RC "${PACKAGE_VERSION},0")
      ELSE()
           SET(PACKAGE_VERSION_RC "${WINDOWS_PACKAGE_VERSION}")
      ENDIF()
@@ -825,13 +817,7 @@ IF(GENERATE_PACKAGE_TARGET)
      SET(CPACK_PACKAGE_VERSION_MINOR "${STELLARIUM_MINOR}")
      SET(CPACK_PACKAGE_VERSION_PATCH "${STELLARIUM_PATCH}")
      SET(CPACK_PACKAGE_INSTALL_DIRECTORY "stellarium")
-     IF(STELLARIUM_RELEASE_BUILD)
-	  SET(CPACK_SOURCE_PACKAGE_FILE_NAME "stellarium-${STELLARIUM_PUBLIC_VERSION}")
-	  SET(CPACK_DEBIAN_PACKAGE_VERSION "${STELLARIUM_PUBLIC_VERSION}+deb1")
-     ELSE()
-	  SET(CPACK_SOURCE_PACKAGE_FILE_NAME "stellarium-${STELLARIUM_PUBLIC_VERSION}-${GIT_REVISION}")
-	  SET(CPACK_DEBIAN_PACKAGE_VERSION "${STELLARIUM_PUBLIC_VERSION}-${GIT_REVISION}+deb1")
-     ENDIF()
+     SET(CPACK_SOURCE_PACKAGE_FILE_NAME "stellarium-${STELLARIUM_PUBLIC_VERSION}")
      SET(CPACK_SOURCE_GENERATOR "TGZ")
      SET(CPACK_GENERATOR "TGZ")
      SET(CPACK_STRIP_FILES "bin/stellarium")
@@ -842,7 +828,7 @@ IF(GENERATE_PACKAGE_TARGET)
      SET(CPACK_RPM_PACKAGE_URL "${STELLARIUM_URL}")
      SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "${CPACK_PACKAGE_VENDOR} <stellarium@googlegroups.com>")
      SET(CPACK_DEBIAN_PACKAGE_SECTION "science")
-
+     SET(CPACK_DEBIAN_PACKAGE_VERSION "${VERSION}+deb1")
      SET(CPACK_DEBIAN_PACKAGE_HOMEPAGE "${CPACK_RPM_PACKAGE_URL}")
      SET(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
      INCLUDE(CPack)
diff --git a/cmake/Info.plist.cmake b/cmake/Info.plist.cmake
index 4609bdb9a8..98f764fc28 100644
--- a/cmake/Info.plist.cmake
+++ b/cmake/Info.plist.cmake
@@ -19,9 +19,9 @@
 	<key>CFBundleSignature</key>
 	<string>Stel</string>
 	<key>CFBundleVersion</key>
-	<string>@STELLARIUM_PUBLIC_VERSION@</string>
+	<string>@PACKAGE_VERSION@</string>
 	<key>CFBundleShortVersionString</key>
-	<string>@STELLARIUM_PUBLIC_VERSION@</string>
+	<string>@PACKAGE_VERSION@</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>@PACKAGE_OSX_TARGET@</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/cmake/stellarium.iss.cmake b/cmake/stellarium.iss.cmake
index 3a2819f875..3c0755f3ef 100644
--- a/cmake/stellarium.iss.cmake
+++ b/cmake/stellarium.iss.cmake
@@ -12,8 +12,8 @@ WizardImageFile=@CMAKE_SOURCE_DIR@\data\splash.bmp
 WizardImageStretch=no

 WizardImageBackColor=clBlack

 AppName=Stellarium

-AppVersion=@STELLARIUM_PUBLIC_VERSION@

-AppVerName=Stellarium @STELLARIUM_PUBLIC_VERSION@

+AppVersion=@PACKAGE_VERSION@

+AppVerName=Stellarium @PACKAGE_VERSION@

 AppCopyright=@STELLARIUM_COPYRIGHT@

 AppPublisher=Stellarium team

 AppPublisherURL=@STELLARIUM_URL@

@@ -22,7 +22,7 @@ AppUpdatesURL=@STELLARIUM_URL@
 VersionInfoVersion=@WINDOWS_PACKAGE_VERSION@

 MinVersion=0,@ISS_MIN_WIN_VERSION@

 SetupIconFile=@CMAKE_SOURCE_DIR@\data\@PACKAGE_ICON@.ico

-OutputBaseFilename=stellarium-@ISS_PACKAGE_VERSION@-@ISS_PACKAGE_PLATFORM@

+OutputBaseFilename=stellarium-@PACKAGE_VERSION@-@ISS_PACKAGE_PLATFORM@

 OutputDir=@CMAKE_SOURCE_DIR@\installers

 ; In 64-bit mode, {pf} is equivalent to {pf64},

 ; see http://www.jrsoftware.org/ishelp/index.php?topic=32vs64bitinstalls

diff --git a/cmake/stellarium.rc.cmake b/cmake/stellarium.rc.cmake
index 3094a50702..9a5c78c0d9 100644
--- a/cmake/stellarium.rc.cmake
+++ b/cmake/stellarium.rc.cmake
@@ -12,10 +12,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName",      "Stellarium team\0"
             VALUE "FileDescription",  "Stellarium, the free open source planetarium\0"
-            VALUE "FileVersion",      "@STELLARIUM_PUBLIC_VERSION@\0"
+            VALUE "FileVersion",      "@PACKAGE_VERSION@\0"
             VALUE "LegalCopyright",   "Copyright (C) @COPYRIGHT_YEARS@ Stellarium team\0"
             VALUE "Info",             "@STELLARIUM_URL@\0"
-            VALUE "ProductVersion",   "@STELLARIUM_PUBLIC_VERSION@\0"
+            VALUE "ProductVersion",   "@PACKAGE_VERSION@\0"
             VALUE "ProductName",      "Stellarium\0"
             VALUE "InternalName",     "stellarium\0"
             VALUE "OriginalFilename", "stellarium.exe\0"