From 110fb9c750bc87db625b20587918759b81ebc379 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Sat, 27 Aug 2022 10:51:34 +0200 Subject: [PATCH 1/3] Bump version to 2.5-alpha --- .tx/config | 2 +- CHANGELOG.md | 2 ++ CMakeLists.txt | 4 ++-- LICENSE | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.tx/config b/.tx/config index 553143ac744..754d4ec049d 100644 --- a/.tx/config +++ b/.tx/config @@ -1,7 +1,7 @@ [main] host = https://www.transifex.com -[mixxxdj.mixxx2-4] +[mixxxdj.mixxx2-5] file_filter = res/translations/mixxx_.ts source_file = res/translations/mixxx.ts source_lang = en diff --git a/CHANGELOG.md b/CHANGELOG.md index df1ef0e305b..0aedb2ae59c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,7 @@ # Changelog +## [2.5.0](https://launchpad.net/mixxx/+milestone/2.4.0) (Unreleased) + ## [2.4.0](https://launchpad.net/mixxx/+milestone/2.4.0) (Unreleased) ### Cover Art diff --git a/CMakeLists.txt b/CMakeLists.txt index 7accbdb8d90..9ae36f0e733 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -135,9 +135,9 @@ if(DEFINED VCPKG_ROOT AND DEFINED VCPKG_TARGET_TRIPLET) endif() endif() -project(mixxx VERSION 2.4.0) +project(mixxx VERSION 2.5.0) # Work around missing version suffixes support https://gitlab.kitware.com/cmake/cmake/-/issues/16716 -set(MIXXX_VERSION_PRERELEASE "alpha-pre") # set to "alpha-pre" "beta" or "" +set(MIXXX_VERSION_PRERELEASE "alpha") # set to "alpha" "beta" or "" set(CMAKE_PROJECT_HOMEPAGE_URL "https://www.mixxx.org") set(CMAKE_PROJECT_DESCRIPTION "Mixxx is Free DJ software that gives you everything you need to perform live mixes.") diff --git a/LICENSE b/LICENSE index 4e9b29c5aef..ae4dcc324b2 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Mixxx version 2.4, Digital DJ'ing software. +Mixxx version 2.5, Digital DJ'ing software. Copyright (C) 2001-2022 Mixxx Development Team Mixxx is free software; you can redistribute it and/or modify From 2900fe168a27f2828edd961f0c12d39a1a424dfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Sat, 27 Aug 2022 10:50:29 +0200 Subject: [PATCH 2/3] Remove workaround for a consecutive versioning of the 2.4 in the PPA --- packaging/CPackDebUploadPPA.cmake | 9 --------- 1 file changed, 9 deletions(-) diff --git a/packaging/CPackDebUploadPPA.cmake b/packaging/CPackDebUploadPPA.cmake index de5a21f8534..69af8e187a4 100644 --- a/packaging/CPackDebUploadPPA.cmake +++ b/packaging/CPackDebUploadPPA.cmake @@ -42,15 +42,6 @@ if(NOT CPACK_DEBIAN_GPG_RET EQUAL "0") SET(CPACK_DEBIAN_DEBUILD_NOSIGN "--no-sign") endif() -# hack to advance the version from the legacy version like this: -# dpkg --compare-versions 2.4.0~alpha~pre1~git7859 lt 2.4.0~alpha2~5463~gf2da9e619d && echo true -# and from changing to --first-parent -# dpkg --compare-versions 2.4.0~alpha1~6372~g0244af2e04-1~impish lt 2.4.0~alpha2~805~g4f13bc1d5d-1~impish && echo true -# dpkg --compare-versions 2.4.0~alpha2~5463~gf2da9e619d lt 2.4.0 && echo true -if(DEB_UPLOAD_PPA MATCHES "nightlies") - string(REPLACE "2.4~alpha~" "2.4.0~alpha2~" CPACK_DEBIAN_PACKAGE_VERSION "${CPACK_DEBIAN_PACKAGE_VERSION}") -endif() - message(NOTICE "Creating mixxx_${CPACK_DEBIAN_PACKAGE_VERSION}.orig.tar.gz") execute_process( COMMAND tar -czf "mixxx_${CPACK_DEBIAN_PACKAGE_VERSION}.orig.tar.gz" ${CPACK_PACKAGE_FILE_NAME} From ec2d36382b78bcda498e86f6c561bc01e2f765bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Fri, 9 Sep 2022 01:18:50 +0200 Subject: [PATCH 3/3] Link Changelog to the GitHub Milestones --- CHANGELOG.md | 2 +- res/linux/org.mixxx.Mixxx.metainfo.xml | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0aedb2ae59c..4962376e102 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## [2.5.0](https://launchpad.net/mixxx/+milestone/2.4.0) (Unreleased) +## [2.5.0](https://github.com/mixxxdj/mixxx/issues?q=milestone%3A2.5.0) (Unreleased) ## [2.4.0](https://launchpad.net/mixxx/+milestone/2.4.0) (Unreleased) diff --git a/res/linux/org.mixxx.Mixxx.metainfo.xml b/res/linux/org.mixxx.Mixxx.metainfo.xml index 42000bc8dc9..b678761d0ce 100644 --- a/res/linux/org.mixxx.Mixxx.metainfo.xml +++ b/res/linux/org.mixxx.Mixxx.metainfo.xml @@ -96,7 +96,11 @@ Do not edit it manually. --> - + + + + +

Cover Art @@ -1529,7 +1533,7 @@ - +