Merge pull request #10881 from daschuer/2.5-alpha

2.5-alpha
mixxxdj · Jan 12, 2023 · a3ad1cd · a3ad1cd
2 parents cce89d0 + 6f5ae1a
commit a3ad1cd
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 13 deletions.
diff --git 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_<lang>.ts
 source_file = res/translations/mixxx.ts
 source_lang = en

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog
 
+## [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)
 
 ### Cover Art

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -128,9 +128,9 @@ if(APPLE)
   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
@@ -1,4 +1,4 @@
-Mixxx version 2.4, Digital DJ'ing software.
+Mixxx version 2.5, Digital DJ'ing software.
 Copyright (C) 2001-2023 Mixxx Development Team
 
 Mixxx is free software; you can redistribute it and/or modify

diff --git 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}

diff --git a/res/linux/org.mixxx.Mixxx.metainfo.xml b/res/linux/org.mixxx.Mixxx.metainfo.xml
@@ -96,6 +96,10 @@
   Do not edit it manually.
   -->
   <releases>
+    <release version="2.5.0" type="development" date="2022-11-23" timestamp="1669217482">
+      <description>
+</description>
+    </release>
     <release version="2.4.0" type="development" date="2022-11-23" timestamp="1669217482">
       <description>
  <p>