diff options
| author | István Váradi <ivaradi@varadiistvan.hu> | 2020-07-13 17:30:35 +0300 |
|---|---|---|
| committer | István Váradi <ivaradi@varadiistvan.hu> | 2020-07-13 17:42:11 +0300 |
| commit | fdb7b8331cd4ec3ad88f1b3b2e67dbc7ee8ccaf5 (patch) | |
| tree | 36eff031888522b420a282ebac3d188314d60b2f | |
| parent | c63669f64fbd10d2ff733c498b12310a30248a4a (diff) | |
Re-added the deletion of VERSION.cmake to the patch and updated the versiondebian/dist/eoan/stable-2.6
| -rw-r--r-- | debian/patches/0004-sane-cmake.patch | 31 |
1 files changed, 30 insertions, 1 deletions
diff --git a/debian/patches/0004-sane-cmake.patch b/debian/patches/0004-sane-cmake.patch index c85a93e4d..28c5d717c 100644 --- a/debian/patches/0004-sane-cmake.patch +++ b/debian/patches/0004-sane-cmake.patch @@ -22,7 +22,7 @@ Last-Update: 2019-11-17 +# include(${CMAKE_SOURCE_DIR}/VERSION.cmake) +set( MIRALL_VERSION_MAJOR 2 ) +set( MIRALL_VERSION_MINOR 6 ) -+set( MIRALL_VERSION_PATCH 4 ) ++set( MIRALL_VERSION_PATCH 5 ) +set( MIRALL_VERSION_YEAR 2020 ) +set( MIRALL_SOVERSION 0 ) + @@ -238,3 +238,32 @@ Last-Update: 2019-11-17 - "${CMAKE_BINARY_DIR}/CPackOptions.cmake" @ONLY) -set(CPACK_PROJECT_CONFIG_FILE "${CMAKE_BINARY_DIR}/CPackOptions.cmake") # File included at cpack time, once per generator after setting CPACK_GENERATOR to the actual generator being used; allows per-generator setting of CPACK_* variables at cpack time. ${PROJECT_BINARY_DIR}/CPackOptions.cmake -include(CPack) +--- a/VERSION.cmake ++++ /dev/null +@@ -1,26 +0,0 @@ +-set( MIRALL_VERSION_MAJOR 2 ) +-set( MIRALL_VERSION_MINOR 6 ) +-set( MIRALL_VERSION_PATCH 5 ) +-set( MIRALL_VERSION_YEAR 2020 ) +-set( MIRALL_SOVERSION 0 ) +- +-if ( NOT DEFINED MIRALL_VERSION_SUFFIX ) +- set( MIRALL_VERSION_SUFFIX "git") #e.g. beta1, beta2, rc1 +-endif( NOT DEFINED MIRALL_VERSION_SUFFIX ) +- +-if( NOT DEFINED MIRALL_VERSION_BUILD ) +- set( MIRALL_VERSION_BUILD "0" ) # Integer ID. Generated by the build system +-endif( NOT DEFINED MIRALL_VERSION_BUILD ) +-# Composite defines +-# Used e.g. for libraries Keep at x.y.z. +-set( MIRALL_VERSION "${MIRALL_VERSION_MAJOR}.${MIRALL_VERSION_MINOR}.${MIRALL_VERSION_PATCH}" ) +-# Version with Build ID. Used in the installer +-set( MIRALL_VERSION_FULL ${MIRALL_VERSION} ) +-set( MIRALL_VERSION_STRING ${MIRALL_VERSION} ) +-set( MIRALL_VERSION_FULL "${MIRALL_VERSION_FULL}.${MIRALL_VERSION_BUILD}" ) +- +-set( MIRALL_VERSION_STRING "${MIRALL_VERSION}${MIRALL_VERSION_SUFFIX}" ) +- +-if( MIRALL_VERSION_BUILD ) +- set( MIRALL_VERSION_STRING "${MIRALL_VERSION_STRING} (build ${MIRALL_VERSION_BUILD})" ) +-endif( MIRALL_VERSION_BUILD ) |