From 3c6c969e3d1236155aea049f83f0fcdb2af8e8d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Sat, 15 Jan 2022 22:59:10 +0100 Subject: [PATCH 1/4] Added CHANGELOG entry for the new Pioneer DDJ SB3 mapping --- CHANGELOG.md | 1 + res/linux/org.mixxx.Mixxx.metainfo.xml | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e2607d34b90..297d51bb5c55 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ * Preserve file creation time when writing metadata on Windows [#4586](https://github.com/mixxxdj/mixxx/pull/4586) [lp1955314](https://bugs.launchpad.net/mixxx/+bug/1955314) * Fix handling of file extension when importing and exporting sampler settings [#4539](https://github.com/mixxxdj/mixxx/pull/4539) * Fix crash when using an empty directory as resource path using the `--resource-path` command line option [#4575](https://github.com/mixxxdj/mixxx/pull/4575) [lp1934560](https://bugs.launchpad.net/mixxx/+bug/1934560) +* Added mapping for Pioneer DDJ SB3 controller [#3821](https://github.com/mixxxdj/mixxx/pull/3821) ### Packaging diff --git a/res/linux/org.mixxx.Mixxx.metainfo.xml b/res/linux/org.mixxx.Mixxx.metainfo.xml index e48e42836b2f..5c6f7bb4f5fd 100644 --- a/res/linux/org.mixxx.Mixxx.metainfo.xml +++ b/res/linux/org.mixxx.Mixxx.metainfo.xml @@ -132,6 +132,10 @@ #4575 lp1934560 +
  • + Added mapping for Pioneer DDJ SB3 controller + #3821 +

    • Packaging From 16ef2533fe247027120e078b95aadc6f7262da30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Sat, 15 Jan 2022 23:01:58 +0100 Subject: [PATCH 2/4] Update copyright year in LICENSE file --- LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LICENSE b/LICENSE index 518e705c7be2..4ba889ceb9e8 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ Mixxx version 2.3, Digital DJ'ing software. -Copyright (C) 2001-2021 Mixxx Development Team +Copyright (C) 2001-2022 Mixxx Development Team Mixxx is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by From 2d74d3ca39734db61066128540fedd3ec61dfa95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Sat, 15 Jan 2022 23:11:09 +0100 Subject: [PATCH 3/4] Update debian/changelog --- packaging/debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packaging/debian/changelog b/packaging/debian/changelog index 33de41f83ad5..d5162c8c9cd8 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -1,3 +1,9 @@ +mixxx (2.3.2-1~bionic) bionic; urgency=medium + + * Build of 2.3.2 + + -- RJ Skerry-Ryan Sat, 15 Jan 2022 23:09:24 +0000 + mixxx (2.3.1-1~bionic) bionic; urgency=medium * Build of 2.3.1 From 2e16600d452adf1b77181fbe20d8b7d6adf9bd6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Sat, 15 Jan 2022 23:12:54 +0100 Subject: [PATCH 4/4] Bump Mixxx version to 2.3.1 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 90cc508ece49..245fae1fe226 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -58,7 +58,7 @@ if(NOT CMAKE_CONFIGURATION_TYPES) endif() endif() -project(mixxx VERSION 2.3.1) +project(mixxx VERSION 2.3.2) # Work around missing version suffixes support https://gitlab.kitware.com/cmake/cmake/-/issues/16716 set(MIXXX_VERSION_PRERELEASE "") # set to "alpha-pre" "beta" or ""