diff --git a/debian/patches/0004-sane-cmake.patch b/debian/patches/0004-sane-cmake.patch index d159a2717..7e740e53a 100644 --- a/debian/patches/0004-sane-cmake.patch +++ b/debian/patches/0004-sane-cmake.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9d38cb3e2..1c3af9fed 100644 +index 687733588..da979ecbb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -95,29 +95,12 @@ include(GNUInstallDirs) +@@ -103,29 +103,12 @@ include(GNUInstallDirs) include(DefineInstallationPaths) include(GenerateExportHeader) @@ -32,7 +32,7 @@ index 9d38cb3e2..1c3af9fed 100644 set(SYSCONFDIR ${SYSCONF_INSTALL_DIR}) set(SHAREDIR ${CMAKE_INSTALL_FULL_DATADIR}) -@@ -220,7 +203,47 @@ if (NOT DEFINED APPLICATION_ICON_NAME) +@@ -246,7 +229,47 @@ if (NOT DEFINED APPLICATION_ICON_NAME) set(APPLICATION_ICON_NAME ${APPLICATION_SHORTNAME}) endif() @@ -151,12 +151,12 @@ index 0682090c0..000000000 -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) diff --git a/VERSION.cmake b/VERSION.cmake -index 2910a0668..c1ec7b912 100644 +index 2045ea0ed..d52b4169b 100644 --- a/VERSION.cmake +++ b/VERSION.cmake -@@ -13,22 +13,40 @@ set(NEXTCLOUD_SERVER_VERSION_SECURE_FILEDROP_MIN_SUPPORTED_MAJOR 26) - set(NEXTCLOUD_SERVER_VERSION_SECURE_FILEDROP_MIN_SUPPORTED_MINOR 0) - set(NEXTCLOUD_SERVER_VERSION_SECURE_FILEDROP_MIN_SUPPORTED_PATCH 0) +@@ -17,22 +17,40 @@ set(NEXTCLOUD_SERVER_VERSION_MOUNT_ROOT_PROPERTY_SUPPORTED_MAJOR 28) + set(NEXTCLOUD_SERVER_VERSION_MOUNT_ROOT_PROPERTY_SUPPORTED_MINOR 0) + set(NEXTCLOUD_SERVER_VERSION_MOUNT_ROOT_PROPERTY_SUPPORTED_PATCH 3) -if ( NOT DEFINED MIRALL_VERSION_SUFFIX ) - set( MIRALL_VERSION_SUFFIX "git") #e.g. beta1, beta2, rc1