From b5f28f1ecd34ee2fba6971bdf634564987648eb9 Mon Sep 17 00:00:00 2001 From: manongjohn Date: Thu, 11 Feb 2021 12:02:54 -0500 Subject: [PATCH] Update tahoma2d links to new path --- CONTRIBUTING.md | 8 ++--- README.md | 7 ++-- doc/how_to_build_linux.md | 2 +- doc/how_to_build_macosx.md | 2 +- stuff/doc/LICENSE/LICENSE_ffmpeg_info.txt | 2 +- stuff/doc/LICENSE/LICENSE_tahoma2d.txt | 36 ------------------- toonz/cmake/BundleInfo.plist.in | 2 +- toonz/sources/toonz/Resources/info.txt | 2 +- toonz/sources/toonz/mainwindow.cpp | 4 +-- .../org.tahoma2d.Tahoma2D.metainfo.xml | 2 +- 10 files changed, 15 insertions(+), 52 deletions(-) delete mode 100644 stuff/doc/LICENSE/LICENSE_tahoma2d.txt diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 591ede24..2511b0de 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -10,11 +10,11 @@ I will first review the request, then I'll accept it, add comments for rework, o ### Workflow -0. `fork` Tahoma2D to your GitHub account from `turtletooth/tahoma2d`. - - (use the `fork` button at the https://github.com/turtletooth/tahoma2d) +0. `fork` Tahoma2D to your GitHub account from `tahoma2d/tahoma2d`. + - (use the `fork` button at the https://github.com/tahoma2d/tahoma2d) 0. `clone` the repository. - `git clone git@github.com:your-github-account/tahoma2d.git` - - `git remote add upstream https://github.com/turtletooth/tahoma2d.git`, additionally. + - `git remote add upstream https://github.com/tahoma2d/tahoma2d.git`, additionally. 0. modify the codes. - `git checkout -b your-branch-name` - `your-branch-name` is a name of your modifications, for example, @@ -32,7 +32,7 @@ I will first review the request, then I'll accept it, add comments for rework, o ## Bugs -If you find bugs, please report details about them using [issues](https://github.com/turtletooth/tahoma2d/issues). +If you find bugs, please report details about them using [issues](https://github.com/tahoma2d/tahoma2d/issues). Please include information needed to reproduce the bug, including the operating system and information directly relating to the issue. Links to screen captures of what is observed on screen or video of specific steps to produce the problem are very helpful. diff --git a/README.md b/README.md index 226f79ad..801d006d 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,6 @@ # Tahoma2D -[![](https://ci.appveyor.com/api/projects/status/mnc3mepksux9kvap/branch/master?svg=true)](https://ci.appveyor.com/project/turtletooth/tahoma2d) -[![](https://travis-ci.com/turtletooth/tahoma2d.svg?branch=master)](https://travis-ci.com/turtletooth/tahoma2d) +[![](https://ci.appveyor.com/api/projects/status/mnc3mepksux9kvap/branch/master?svg=true)](https://ci.appveyor.com/project/tahoma2d/tahoma2d) ## What is Tahoma2D? @@ -16,7 +15,7 @@ Please refer to the Tahoma2D site at . ## Installation -Please download the latest release at . +Please download the latest release at . ## How to Build Locally @@ -31,7 +30,7 @@ Can't develop but still want to help? Help us test individual Pull Requests befo ## Community - To share tips or to troubleshoot, join the [Google Tahoma2D Users forum](hhttps://groups.google.com/g/tahoma2d) -- If you found a bug with the software after troubleshooting, or are a developer, search the [Github issues](https://github.com/turtletooth/tahoma2d/issues) and post there. +- If you found a bug with the software after troubleshooting, or are a developer, search the [Github issues](https://github.com/tahoma2d/tahoma2d/issues) and post there. ## Licensing diff --git a/doc/how_to_build_linux.md b/doc/how_to_build_linux.md index 6f2ddd1b..042e4f72 100644 --- a/doc/how_to_build_linux.md +++ b/doc/how_to_build_linux.md @@ -101,7 +101,7 @@ $ cd .. ### Cloning the GIT Tree ``` -$ git clone https://github.com/turtletooth/tahoma2d +$ git clone https://github.com/tahoma2d/tahoma2d ``` ### Copying the 'stuff' Directory diff --git a/doc/how_to_build_macosx.md b/doc/how_to_build_macosx.md index 217c112f..45f42696 100644 --- a/doc/how_to_build_macosx.md +++ b/doc/how_to_build_macosx.md @@ -62,7 +62,7 @@ $ rm /usr/local/lib/cmake/glew These steps will put the Tahoma2D repository under /Users/yourlogin/Documents. ``` $ cd ~/Documents #or where you want to store the repository# -$ git clone https://github.com/turtletooth/tahoma2d +$ git clone https://github.com/tahoma2d/tahoma2d $ cd tahoma2d $ git lfs pull $ cd thirdparty/boost diff --git a/stuff/doc/LICENSE/LICENSE_ffmpeg_info.txt b/stuff/doc/LICENSE/LICENSE_ffmpeg_info.txt index 944d0ae3..b698bc34 100644 --- a/stuff/doc/LICENSE/LICENSE_ffmpeg_info.txt +++ b/stuff/doc/LICENSE/LICENSE_ffmpeg_info.txt @@ -4,7 +4,7 @@ Tahoma2D does not directly use FFmpeg libraries or code. As of July 2020, Tahoma2D is shipping with FFmpeg 4.3 LGPL version from https://ffmpeg.zeranoe.com/builds/ FFmpeg source code can be found at: -https://github.com/turtletooth/FFmpeg +https://github.com/tahoma2d/FFmpeg or https://github.com/FFmpeg/FFmpeg diff --git a/stuff/doc/LICENSE/LICENSE_tahoma2d.txt b/stuff/doc/LICENSE/LICENSE_tahoma2d.txt deleted file mode 100644 index a3383bd6..00000000 --- a/stuff/doc/LICENSE/LICENSE_tahoma2d.txt +++ /dev/null @@ -1,36 +0,0 @@ -License Agreement For Tahoma2D -[https://github.com/turtletooth/tahoma2d] - -- - - - - - - - - - - - - - - - - -Tahoma2D - -All contributions by Jeremy Bullock: -Copyright (c) 2016 - 2020, Jeremy Bullock -All rights reserved. - -All contributions by DWANGO: -Copyright (c) 2016 - 2020, DWANGO Co., Ltd. -All rights reserved. - -All other contributions: -Copyright (c) 2016 - 2020, the respective contributors. -All rights reserved. - -Each contributor holds copyright over their respective contributions. -The project versioning (Git) records all such contribution source information. - - -LICENSE - -BSD 3-Clause "New" or "Revised" License - -Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - -3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/toonz/cmake/BundleInfo.plist.in b/toonz/cmake/BundleInfo.plist.in index 3fbacfc6..086a93e0 100644 --- a/toonz/cmake/BundleInfo.plist.in +++ b/toonz/cmake/BundleInfo.plist.in @@ -11,7 +11,7 @@ CFBundleIconFile Tahoma2D.icns CFBundleIdentifier - io.github.turtletooth.Tahoma2D + io.github.tahoma2d.Tahoma2D NSCameraUsageDescription Tahoma2D needs access to the camera in order to use Camera Capture NSMicrophoneUsageDescription diff --git a/toonz/sources/toonz/Resources/info.txt b/toonz/sources/toonz/Resources/info.txt index 3c451f17..5f666752 100644 --- a/toonz/sources/toonz/Resources/info.txt +++ b/toonz/sources/toonz/Resources/info.txt @@ -1 +1 @@ -Web: https://turtletooth.com/ +Web: https://tahoma2d.org diff --git a/toonz/sources/toonz/mainwindow.cpp b/toonz/sources/toonz/mainwindow.cpp index 89724f74..400ece7d 100644 --- a/toonz/sources/toonz/mainwindow.cpp +++ b/toonz/sources/toonz/mainwindow.cpp @@ -1195,7 +1195,7 @@ void MainWindow::onOpenReportABug() { int ret = DVGui::MsgBox(DVGui::INFORMATION, str, buttons, 1); if (ret == 1) QDesktopServices::openUrl( - QUrl("https://github.com/turtletooth/tahoma2d/issues")); + QUrl("https://github.com/tahoma2d/tahoma2d/issues")); } //----------------------------------------------------------------------------- @@ -1481,7 +1481,7 @@ void MainWindow::onUpdateCheckerDone(bool error) { if (ret == 1) { // Write the new last date to file QDesktopServices::openUrl(QObject::tr( - "https://github.com/turtletooth/tahoma2d/releases/latest")); + "https://github.com/tahoma2d/tahoma2d/releases/latest")); } } diff --git a/toonz/sources/xdg-data/org.tahoma2d.Tahoma2D.metainfo.xml b/toonz/sources/xdg-data/org.tahoma2d.Tahoma2D.metainfo.xml index 9c9b6cd1..04f597a6 100644 --- a/toonz/sources/xdg-data/org.tahoma2d.Tahoma2D.metainfo.xml +++ b/toonz/sources/xdg-data/org.tahoma2d.Tahoma2D.metainfo.xml @@ -18,7 +18,7 @@

https://tahoma2d.org - https://github.com/turtletooth/tahoma2d/issues + https://github.com/tahoma2d/tahoma2d/issues https://tahoma2d.readthedocs.io/en/latest/_images/interface.png