Re: New kholidays tarball - was - Re: kholidays-16.12.3 depfreeze broken
next time please make that .1 (e.g. kholidays-16.12.3.1.tar.xz) On Thu, Mar 16, 2017 at 12:26 AM, Albert Astals Cidwrote: > El divendres, 10 de març de 2017, a les 14:19:04 CET, > andreas.sturmlech...@gmail.com va escriure: >> master was merged twice into Applications/16.12 branch and bumped >> KF5_VERSION, cmake minimum version and PIM_VERSION. >> >> Bad (version bumping/dropping) commits: >> c714ab94bc5d3f82e6de135798f905f27f19fc64 >> 065c4028f97268466b22afb59eae2cbb37994a40 >> 4594308464a3ee8386c6e85e643dc7dac052e250 >> >> This will need a tarball respin. > > http://download.kde.org/stable/applications/16.12.3/src/kholidays-16.12.3a.tar.xz > > Cheers, > Albert > >> >> Best regards, >> Andreas > >
New kholidays tarball - was - Re: kholidays-16.12.3 depfreeze broken
El divendres, 10 de març de 2017, a les 14:19:04 CET, andreas.sturmlech...@gmail.com va escriure: > master was merged twice into Applications/16.12 branch and bumped > KF5_VERSION, cmake minimum version and PIM_VERSION. > > Bad (version bumping/dropping) commits: > c714ab94bc5d3f82e6de135798f905f27f19fc64 > 065c4028f97268466b22afb59eae2cbb37994a40 > 4594308464a3ee8386c6e85e643dc7dac052e250 > > This will need a tarball respin. http://download.kde.org/stable/applications/16.12.3/src/kholidays-16.12.3a.tar.xz Cheers, Albert > > Best regards, > Andreas
Re: kholidays-16.12.3 depfreeze broken
This is all my fault. I committed twice into the master branch for fixes to holidays files: 88dcc058172f8f529a01d10593940de75f0b33c7 was for Hong Kong holidays c88b89db49874407ba4b7cf0266208fb64cb6b33 was for Ukraine holidays. all I wanted to do was get those commits into the Applications/16.12 branch. looks like I merged instead of cherry-picked. No other changes except for those holidays files should be in the Applications/16.12 branch from me. On Monday, March 13, 2017 12:07:14 AM Albert Astals Cid wrote: > El dissabte, 11 de març de 2017, a les 17:30:27 CET, Albert Astals Cid va > escriure: > > El divendres, 10 de març de 2017, a les 14:14:35 CET, Andreas Sturmlechner > > va > > escriure: > > > Merge commit c8f9b01c480de6bc561fa96289260e2bb82d4a1e bumped cmake min > > > version and PIM_VERSION. > > > > > > Attached patch might fix it, unless you want to blacklist. > > > > I'm honestly not convinced this guarantees a re-spin of a tarball we've > > already published, since bascically it'd need to be 16.12.4 > > > > Now actually adding the kdepim mailing list. > > > What do others think? > > Cheers, > Albert > > > > > Cheers, > > Albert > > > > > Regards, > > > Andreas > > > > > > > > > ---Original Message--- > > > > > > On Friday, 10 March 2017 at 14:10, Andreas Sturmlechner wrote: > > > > master was merged twice into Applications/16.12 branch and bumped > > > > > > KF5_VERSION, > > > > > > > cmake minimum version and PIM_VERSION. > > > > > > > > Bad (version bumping/dropping) commits: > > > > c714ab94bc5d3f82e6de135798f905f27f19fc64 > > > > 065c4028f97268466b22afb59eae2cbb37994a40 > > > > 4594308464a3ee8386c6e85e643dc7dac052e250 > > > > > > > > This will need a tarball respin. > > > > > > > > Best regards, > > > > Andreas > >
Re: kholidays-16.12.3 depfreeze broken
El dissabte, 11 de març de 2017, a les 17:30:27 CET, Albert Astals Cid va escriure: > El divendres, 10 de març de 2017, a les 14:14:35 CET, Andreas Sturmlechner > va > escriure: > > Merge commit c8f9b01c480de6bc561fa96289260e2bb82d4a1e bumped cmake min > > version and PIM_VERSION. > > > > Attached patch might fix it, unless you want to blacklist. > > I'm honestly not convinced this guarantees a re-spin of a tarball we've > already published, since bascically it'd need to be 16.12.4 > Now actually adding the kdepim mailing list. > What do others think? Cheers, Albert > > Cheers, > Albert > > > Regards, > > Andreas > > > > > > ---Original Message--- > > > > On Friday, 10 March 2017 at 14:10, Andreas Sturmlechner wrote: > > > master was merged twice into Applications/16.12 branch and bumped > > > > KF5_VERSION, > > > > > cmake minimum version and PIM_VERSION. > > > > > > Bad (version bumping/dropping) commits: > > > c714ab94bc5d3f82e6de135798f905f27f19fc64 > > > 065c4028f97268466b22afb59eae2cbb37994a40 > > > 4594308464a3ee8386c6e85e643dc7dac052e250 > > > > > > This will need a tarball respin. > > > > > > Best regards, > > > Andreas
Re: kholidays-16.12.3 depfreeze broken
Il giorno Sat, 11 Mar 2017 17:30:27 +0100 Albert Astals Cidha scritto: > I'm honestly not convinced this guarantees a re-spin of a tarball > we've already published, since bascically it'd need to be 16.12.4 Well, there is an additional problem there: the version of the lib got bumped, so we have /usr/lib64/libKF5Holidays.so.5.4.40 Instead of /usr/lib64/libKF5Holidays.so.5.4.3 in the released tarball. If truly a respin is not wanted, it should be essential to tell distros to apply 506bd08a6faf61c776beecb05f1acbe04223827a from kholidays. -- Luca Beltrame - KDE Forums team GPG key ID: A29D259B
Re: Re: kholidays-16.12.3 depfreeze broken
---Original Message--- On Saturday, 11 March 2017 at 17:30, Albert Astals Cid wrote: > El divendres, 10 de març de 2017, a les 14:14:35 CET, Andreas Sturmlechner > > va escriure: > > Merge commit c8f9b01c480de6bc561fa96289260e2bb82d4a1e bumped cmake min > > version and PIM_VERSION. > > I'm honestly not convinced this guarantees a re-spin of a tarball we've > already published, since bascically it'd need to be 16.12.4 That's only the second half of the story, in case you overlooked below: > > On Friday, 10 March 2017 at 14:10, Andreas Sturmlechner wrote: > > > master was merged twice into Applications/16.12 branch and bumped > > > > KF5_VERSION, In any case, I've pushed a fix to Applications/16.12 branch that dials back KF5_VERSION to 5.28.0 and also all the other cmake changes. Regards, Andreas
Re: kholidays-16.12.3 depfreeze broken
El divendres, 10 de març de 2017, a les 14:14:35 CET, Andreas Sturmlechner va escriure: > Merge commit c8f9b01c480de6bc561fa96289260e2bb82d4a1e bumped cmake min > version and PIM_VERSION. > > Attached patch might fix it, unless you want to blacklist. I'm honestly not convinced this guarantees a re-spin of a tarball we've already published, since bascically it'd need to be 16.12.4 What do others think? Cheers, Albert > > Regards, > Andreas > > > ---Original Message--- > > On Friday, 10 March 2017 at 14:10, Andreas Sturmlechner wrote: > > master was merged twice into Applications/16.12 branch and bumped > > KF5_VERSION, > > > cmake minimum version and PIM_VERSION. > > > > Bad (version bumping/dropping) commits: > > c714ab94bc5d3f82e6de135798f905f27f19fc64 > > 065c4028f97268466b22afb59eae2cbb37994a40 > > 4594308464a3ee8386c6e85e643dc7dac052e250 > > > > This will need a tarball respin. > > > > Best regards, > > Andreas
Re: kholidays-16.12.3 depfreeze broken
Merge commit c8f9b01c480de6bc561fa96289260e2bb82d4a1e bumped cmake min version and PIM_VERSION. Attached patch might fix it, unless you want to blacklist. Regards, Andreas ---Original Message--- On Friday, 10 March 2017 at 14:10, Andreas Sturmlechner wrote: > master was merged twice into Applications/16.12 branch and bumped KF5_VERSION, > cmake minimum version and PIM_VERSION. > > Bad (version bumping/dropping) commits: > c714ab94bc5d3f82e6de135798f905f27f19fc64 > 065c4028f97268466b22afb59eae2cbb37994a40 > 4594308464a3ee8386c6e85e643dc7dac052e250 > > This will need a tarball respin. > > Best regards, > Andreascommit f1e9e5780473e46b912ca262cd5003e4984f4f7f Author: Andreas SturmlechnerDate: Fri Mar 10 13:33:10 2017 +0100 Revert depfreeze breaking merge (KF5_VERSION, cmake, PIM_VERSION) diff --git a/CMakeLists.txt b/CMakeLists.txt index 05164db..2ca8624 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,28 +1,26 @@ -cmake_minimum_required(VERSION 3.0) -set(PIM_VERSION "5.4.40") +cmake_minimum_required(VERSION 2.8.12) -project(KHolidays VERSION ${PIM_VERSION}) +project(KHolidays) # ECM setup -set(KF5_VERSION "5.31.0") +set(KF5_VERSION "5.28.0") find_package(ECM ${KF5_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) include(GenerateExportHeader) include(ECMGenerateHeaders) include(ECMGeneratePriFile) -include(CMakePackageConfigHelpers) +include(ECMPackageConfigHelpers) include(ECMSetupVersion) include(ECMPoQmTools) include(FeatureSummary) include(KDEInstallDirs) include(KDECMakeSettings) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) -include(ECMCoverageOption) set(KHOLIDAYS_LIB_VERSION ${PIM_VERSION}) -ecm_setup_version(PROJECT VARIABLE_PREFIX KHOLIDAYS +ecm_setup_version(${KHOLIDAYS_LIB_VERSION} PROJECT VARIABLE_PREFIX KHOLIDAYS VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kholidays_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5HolidaysConfigVersion.cmake" SOVERSION 5 @@ -50,7 +48,7 @@ endif() ### CMake Config Files ### set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Holidays") -configure_package_config_file( +ecm_configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/KF5HolidaysConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5HolidaysConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
Re: kholidays-16.12.3 depfreeze broken
> master was merged twice into Applications/16.12 branch and bumped > KF5_VERSION, > cmake minimum version and PIM_VERSION. > > Bad (version bumping/dropping) commits: > c714ab94bc5d3f82e6de135798f905f27f19fc64 > 065c4028f97268466b22afb59eae2cbb37994a40 > 4594308464a3ee8386c6e85e643dc7dac052e250 Merge commit c8f9b01c480de6bc561fa96289260e2bb82d4a1e bumped cmake min version and PIM_VERSION.
kholidays-16.12.3 depfreeze broken
master was merged twice into Applications/16.12 branch and bumped KF5_VERSION, cmake minimum version and PIM_VERSION. Bad (version bumping/dropping) commits: c714ab94bc5d3f82e6de135798f905f27f19fc64 065c4028f97268466b22afb59eae2cbb37994a40 4594308464a3ee8386c6e85e643dc7dac052e250 This will need a tarball respin. Best regards, Andreas