Browse Source

Fixes #331 updating naming convention to debian policy.

Changed naming to <name>_<version>_<arch> as denoted by the debian
policy manual.

Removing extra source package name line.

Signed-off-by: Philip Schwartz <philip.schwartz@lexisnexis.com>
Philip Schwartz 13 years ago
parent
commit
141735bbca
1 changed files with 4 additions and 5 deletions
  1. 4 5
      CMakeLists.txt

+ 4 - 5
CMakeLists.txt

@@ -269,7 +269,6 @@ SET(CPACK_PACKAGE_VERSION_MAJOR ${majorver})
 SET(CPACK_PACKAGE_VERSION_MINOR ${minorver})
 SET(CPACK_PACKAGE_VERSION_PATCH ${point}${stagever})
 set ( CPACK_PACKAGE_CONTACT "ossdevelopment@lexisnexis.com" )
-set ( CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_RPM_PACKAGE_VERSION}_${version}" )
 set( CPACK_SOURCE_GENERATOR TGZ )
 set ( CPACK_RPM_PACKAGE_VERSION "${projname}")
 SET(CPACK_RPM_PACKAGE_RELEASE "${version}")
@@ -303,15 +302,15 @@ if ( CMAKE_SYSTEM MATCHES Linux )
     message ( "-- distro uses ${packageManagement}, revision is ${packageRevisionArch}" )
 
     if ( ${packageManagement} STREQUAL "DEB" )
-        set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_RPM_PACKAGE_VERSION}_${version}-${stagever}${packageRevisionArch}")
+        set(CPACK_PACKAGE_FILE_NAME	"${CMAKE_PROJECT_NAME}_${CPACK_RPM_PACKAGE_VERSION}-${version}-${stagever}${packageRevisionArch}")
     elseif ( ${packageManagement} STREQUAL "RPM" )
-        set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_RPM_PACKAGE_VERSION}_${version}-${stagever}.${packageRevisionArch}")
+        set(CPACK_PACKAGE_FILE_NAME	"${CMAKE_PROJECT_NAME}_${CPACK_RPM_PACKAGE_VERSION}-${version}-${stagever}.${packageRevisionArch}")
         else()
-        set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_RPM_PACKAGE_VERSION}_${version}-${stagever}-${CPACK_SYSTEM_NAME}")
+        set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}_${CPACK_RPM_PACKAGE_VERSION}_${version}-${stagever}${CPACK_SYSTEM_NAME}")
     endif ()
 endif ( CMAKE_SYSTEM MATCHES Linux )
 MESSAGE ("-- Current release version is ${CPACK_PACKAGE_FILE_NAME}")
-set ( CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_RPM_PACKAGE_VERSION}_${version}" )
+set ( CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}_${CPACK_RPM_PACKAGE_VERSION}-${version}" )
 set( CPACK_SOURCE_GENERATOR TGZ )
 set(CPACK_SOURCE_IGNORE_FILES
         "~$"