Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.5-alpha #10881

Merged
merged 4 commits into from
Jan 12, 2023
+10 −13
Merged

2.5-alpha #10881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
110fb9c
Bump version to 2.5-alpha
daschuer Aug 27, 2022
2900fe1
Remove workaround for a consecutive versioning of the 2.4 in the PPA
daschuer Aug 27, 2022
ec2d363
Link Changelog to the GitHub Milestones
daschuer Sep 8, 2022
6f5ae1a
Merge remote-tracking branch 'upstream/main' into 2.5-alpha
daschuer Jan 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .tx/config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.")
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
9 changes: 0 additions & 9 deletions packaging/CPackDebUploadPPA.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
4 changes: 4 additions & 0 deletions res/linux/org.mixxx.Mixxx.metainfo.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down