From 525f0eece98764a18bad8b8677c7375de5f72753 Mon Sep 17 00:00:00 2001 From: Emily Mabrey <3370875+emabrey@users.noreply.github.com> Date: Mon, 5 Jul 2021 15:06:47 -0400 Subject: [PATCH 1/4] Modify README.md to use legally defensive language #5 - Modify `README.md` for mitigation of the trademark disparagement concerns Modify `README.md` for removal of overly definite statements about the pre-fork project Modify `REAMD.md` to remove language implying a non-fork derivative work --- README.md | 48 ++++++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/README.md b/README.md index 0c0221b1e..fe27b1e05 100644 --- a/README.md +++ b/README.md @@ -1,32 +1,36 @@ -[![Audacity](https://forum.audacityteam.org/styles/prosilver/theme/images/Audacity-logo_75px_trans_forum.png)](https://www.audacityteam.org) +Fork of audacity/audacity ========================= -[**Audacity**](https://www.audacityteam.org) is an easy-to-use, multi-track audio editor and recorder for Windows, Mac OS X, GNU/Linux and other operating systems. Developed by a group of volunteers as open source. +### This repository is a fork of the audacity repository that tries to revert all the changes that some members of the community felt didn't take the Audacity software project in a direction they desire. -- **Recording** from any real, or virtual audio device that is available to the host system. -- **Export / Import** a wide range of audio formats, extendible with FFmpeg. -- **High quality** using 32-bit float audio processing. -- **Plug-ins** Support for multiple audio plug-in formats, including VST, LV2, AU. -- **Macros** for chaining commands and batch processing. -- **Scripting** in Python, Perl, or any language that supports named pipes. -- **Nyquist** Very powerful built-in scripting language that may also be used to create plug-ins. -- **Editing** multi-track editing with sample accuracy and arbitrary sample rates. -- **Accessibility** for VI users. -- **Analysis and visualization** tools to analyze audio, or other signal data. -## This repository +This fork of **audacity** is an easy-to-use, cross-platform multi-track audio editor/recorder for Windows, Mac OS X, GNU/Linux and other operating systems and is developed by a group of volunteers as open source software. -This repository is a fork of Audacity that tries to revert all the sketchy changes made to the software in recent months, mostly related to data collection. You can find more informations on what happened in these Github issues on the original Audacity repository : +- **Recording** from audio devices (real or virtual) +- **Export / Import** a wide range of audio formats (extendible with FFmpeg) +- **High quality** including up to 32-bit float audio support +- **Plug-ins** Plug-in support for VST, LV2, and AU plugins +- **Scripting** in the built-in scripting language Nyquist, or in Python, Perl and other languages with named pipes +- **Editing** arbitrary sampling and multi-track timeline +- **Accessibility** including editing via keyboard, screen reader support and narration support +- **Tools** useful in the analysis of signals, including audio + +## Why did this project fork audacity/audacity? + +You can find more informations on what happened in these Github issues on the original audacity repository : + +- [**Privacy policy which may violate the original project's GPL license**](https://github.com/audacity/audacity/issues/1213) +- [**Contributer's License Agreement (CLA) which may violate the same GPL license**](https://github.com/audacity/audacity/discussions/932) +- [**Attempts at adding telemetry using Google services for data collection**](https://github.com/audacity/audacity/pull/835) + +## Pre-fork Access + +The latest Windows and macOS release of the pre-fork version of this repository may be available from the [Audacity website](https://www.audacityteam.org/download/). +Additionally, they one may find help and/or support for the pre-fork releases at the [Audacity Forum](https://forum.audacityteam.org/). +Developers may find support for the pre-fork releases available at the [Audacity Wiki](https://wiki.audacityteam.org/wiki/For_Developers). -- [**Privacy policy that doesn't respect the GPL**](https://github.com/audacity/audacity/issues/1213) -- [**Discussion on the Contributer's License Agreement (CLA), goes against the GPL**](https://github.com/audacity/audacity/discussions/932) -- [**Pull request trying to implement telemetry using Google's services (did not pass)**](https://github.com/audacity/audacity/pull/835) ## Getting Started -For end users, the latest Windows and macOS release of the *original* version of Audacity is available from the *original* [Audacity website](https://www.audacityteam.org/download/). Note that this is the unmodified version which still contains some sketchy code. -Help with using Audacity is available from the original [Audacity Forum](https://forum.audacityteam.org/). +Build instructions for this forked version of Audacity is available [here](BUILDING.md). -Build instructions are available [here](BUILDING.md). - -More information for developers is available from the original [Audacity Wiki](https://wiki.audacityteam.org/wiki/For_Developers). From 34713130abc08de646f1a951a6547fe6b5a00eb2 Mon Sep 17 00:00:00 2001 From: Hanns Holger Rutz Date: Mon, 5 Jul 2021 21:10:52 +0200 Subject: [PATCH 2/4] remove the requirement to sign the WSM Group's CLA --- .github/pull_request_template.md | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index f516e8ff3..0275be891 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -4,7 +4,6 @@ Resolves: *(direct link to the issue)* -- [ ] I signed [CLA](https://www.audacityteam.org/cla/) - [ ] I made sure the code compiles on my machine - [ ] I made sure there are no unnecessary changes in the code - [ ] I made sure the title of the PR reflects the core meaning of the issue you are solving From 5bd1acae183196bcfbc8af4e232f8dd91deadb35 Mon Sep 17 00:00:00 2001 From: Emily Mabrey <3370875+emabrey@users.noreply.github.com> Date: Mon, 5 Jul 2021 15:36:37 -0400 Subject: [PATCH 3/4] Modify Bug Report Template Remove usage of Audacity mark where it is not necessary in `.github/ISSUE_TEMPLATE/bug_report.md` --- .github/ISSUE_TEMPLATE/bug_report.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index f6658c13f..5764b8b50 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -22,7 +22,7 @@ If applicable, add screenshots to help explain your problem. **Additional information (please complete the following information):** - OS: [e.g. Mac High Sierra, Ubuntu 18.04, Windows 10] - - Version [e.g. Audacity 2.5.1] + - Version [e.g. 2.5.1] - (if relevant) Sound Device [e.g. Windows WASAPI, USB Sound card] **Additional context** From c8872953052817ae6b658f57b53fc1382d04644f Mon Sep 17 00:00:00 2001 From: Emily Mabrey <3370875+emabrey@users.noreply.github.com> Date: Mon, 5 Jul 2021 15:59:23 -0400 Subject: [PATCH 4/4] Fix typos in `README.md` Fix a typo an erroneous "they". Modify list formatting to be consistently capitalized. Modify word choice for developer pre-fork hyperlink anchor. Fix typo involving the use of "informations" when it should've been singular. --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index fe27b1e05..cf6b569e7 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ This fork of **audacity** is an easy-to-use, cross-platform multi-track audio ed - **Recording** from audio devices (real or virtual) - **Export / Import** a wide range of audio formats (extendible with FFmpeg) - **High quality** including up to 32-bit float audio support -- **Plug-ins** Plug-in support for VST, LV2, and AU plugins +- **Plug-ins** providing support for VST, LV2, and AU plugins - **Scripting** in the built-in scripting language Nyquist, or in Python, Perl and other languages with named pipes - **Editing** arbitrary sampling and multi-track timeline - **Accessibility** including editing via keyboard, screen reader support and narration support @@ -17,7 +17,7 @@ This fork of **audacity** is an easy-to-use, cross-platform multi-track audio ed ## Why did this project fork audacity/audacity? -You can find more informations on what happened in these Github issues on the original audacity repository : +You can find more information on the causes of the fork here: - [**Privacy policy which may violate the original project's GPL license**](https://github.com/audacity/audacity/issues/1213) - [**Contributer's License Agreement (CLA) which may violate the same GPL license**](https://github.com/audacity/audacity/discussions/932) @@ -26,8 +26,8 @@ You can find more informations on what happened in these Github issues on the or ## Pre-fork Access The latest Windows and macOS release of the pre-fork version of this repository may be available from the [Audacity website](https://www.audacityteam.org/download/). -Additionally, they one may find help and/or support for the pre-fork releases at the [Audacity Forum](https://forum.audacityteam.org/). -Developers may find support for the pre-fork releases available at the [Audacity Wiki](https://wiki.audacityteam.org/wiki/For_Developers). +Additionally, one may find help and/or support for the pre-fork releases at the [Audacity Forum](https://forum.audacityteam.org/). +Developers may find information for the pre-fork releases available at the [Audacity Wiki](https://wiki.audacityteam.org/wiki/For_Developers). ## Getting Started