From 589e9ea9ab7504fdc4536086b403eaf80a60fa85 Mon Sep 17 00:00:00 2001 From: shypike <> Date: Tue, 26 Aug 2008 15:00:13 +0000 Subject: [PATCH] Sync text files with 0.4.x branch. --- main/CHANGELOG.txt | 6 ++++-- main/COPYRIGHT.txt | 3 +-- main/LICENSE.txt | 18 ++++++++++++++++++ main/NSIS_Installer.nsi | 3 ++- main/README.txt | 36 +++++++++++++++++++++++++----------- main/setup.py | 1 + 6 files changed, 51 insertions(+), 16 deletions(-) create mode 100644 main/LICENSE.txt diff --git a/main/CHANGELOG.txt b/main/CHANGELOG.txt index 181a06d..0673655 100644 --- a/main/CHANGELOG.txt +++ b/main/CHANGELOG.txt @@ -1,9 +1,10 @@ ------------------------------------------------------------------------------- -0.4.3RC1 by The SABnzbd-Team +0.4.3RC4 by The SABnzbd-Team ------------------------------------------------------------------------------- - Dirscanner: if ignored file is replaced it will still be ignored - Accept RAR files that contain NZB-s as input. -- Duplicate RSS jobs are not filtered out +- Duplicate RSS jobs were not filtered out +- Delete history made safer - Proper script is not set when fetching from newzbin bookmarks - Strip white-space around server host name - Par2 checking can fail if first article of a par2 file is missing @@ -12,6 +13,7 @@ - On schedule change, evaluate pause/resume state properly - %s.n bug in the TV Sorting Preview - %s.n and %s_n bug in TV Sorting output +- Add API call to retrieve version ------------------------------------------------------------------------------- 0.4.2Final by The SABnzbd-Team ------------------------------------------------------------------------------- diff --git a/main/COPYRIGHT.txt b/main/COPYRIGHT.txt index 32e368e..794849b 100644 --- a/main/COPYRIGHT.txt +++ b/main/COPYRIGHT.txt @@ -1,4 +1,3 @@ -=========================================================================== (c) Copyright 2007-2008 by "The SABnzbd-team". @@ -14,6 +13,7 @@ Current team: Honorary member (and original author) Gregor Kaufmann +SABnzbd comes with ABSOLUTELY NO WARRANTY. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 @@ -21,4 +21,3 @@ of the License, or (at your option) any later version. See GPL2.txt and GPL3.txt -=========================================================================== diff --git a/main/LICENSE.txt b/main/LICENSE.txt new file mode 100644 index 0000000..0562231 --- /dev/null +++ b/main/LICENSE.txt @@ -0,0 +1,18 @@ + +Copyright 2008 The SABnzbd-Team + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +See accompanying files GPL2.txt and GPL3.txt. diff --git a/main/NSIS_Installer.nsi b/main/NSIS_Installer.nsi index 4d44aca..3f84079 100644 --- a/main/NSIS_Installer.nsi +++ b/main/NSIS_Installer.nsi @@ -56,7 +56,7 @@ DirText "Select the directory to install SABnzbd+ in:" ;-------------------------------- ;Pages - !insertmacro MUI_PAGE_LICENSE "GPL3.txt" + !insertmacro MUI_PAGE_LICENSE "LICENSE.txt" !define MUI_COMPONENTSPAGE_NODESC !insertmacro MUI_PAGE_COMPONENTS @@ -212,6 +212,7 @@ Section Uninstall Delete "$INSTDIR\GPL2.txt" Delete "$INSTDIR\GPL3.txt" Delete "$INSTDIR\COPYRIGHT.txt" + Delete "$INSTDIR\LICENSE.txt" Delete "$INSTDIR\msvcr71.dll" Delete "$INSTDIR\python25.dll" Delete "$INSTDIR\lib\libeay32.dll" diff --git a/main/README.txt b/main/README.txt index c50d82a..3b5cb29 100644 --- a/main/README.txt +++ b/main/README.txt @@ -1,5 +1,5 @@ ************************************* -*** This is SABnzbd 0.5.x *** +*** This is SABnzbd 0.4.3RC4 *** ************************************* SABnzbd is an open-source cross-platform binary newsreader. It simplifies the process of downloading from Usenet dramatically, @@ -13,8 +13,15 @@ There is an extensive Wiki on the use of SABnzbd. http://sabnzbd.wikidot.com/ +******************************************* +*** Upgrading from 0.4.2 *** +******************************************* +Just install over the existing installation, +and you will be able to resume where you left off. + + ************************************** -*** Upgrading from 0.3.4 and older *** +*** Upgrading from 0.4.1 and older *** ************************************** Do *not* install the new version over the old one. Remove old one first or install seperately. @@ -23,18 +30,25 @@ You cannot re-use an unfinished download queue or keep the download history. -******************************************* -*** Upgrading from 0.4.0Beta3 and older *** -******************************************* -See "Upgrading from 0.3.4" - ******************************************* -*** Upgrading from 0.4.0Beta4 and newer *** +*** Changes since 0.4.2 *** ******************************************* -Just install over the existing installation, -and you will be able to resume where you left off. - +New: +- Watched folder and UI now accept RAR files containing NZB-files. +- Add API call to retrieve version +- Sort the category list +Fixed: +- Watched folder: changed files will now be re-examined +- Duplicate RSS jobs were not filtered out +- Delete history made safer +- Proper script was not set when fetching from newzbin bookmarks +- Strip white-space around server host name (preventing copy-paste errors) +- Par2 checking would fail if first article of a par2 file is missing +- No error report was giben when server authentication is missing +- On schedule change, evaluate pause/resume state properly +- Fixed %s.n bug in the TV Sorting Preview +- Fixed %s.n and %s_n bug in TV Sorting output ******************************************* diff --git a/main/setup.py b/main/setup.py index 2c85b0f..1272f43 100644 --- a/main/setup.py +++ b/main/setup.py @@ -249,6 +249,7 @@ data = [ 'README.txt', 'GPL3.txt', 'CHANGELOG.txt', 'COPYRIGHT.txt', + 'LICENSE.txt', 'ISSUES.txt', 'email.tmpl', 'Sample-PostProc.cmd',