Merge LICENSE.txt and COPYRIGHT.txt into just one file: COPYRIGHT.txt.

sabnzbd · Jan 2, 2011 · 8af6ee9 · 8af6ee9
1 parent 600863c
commit 8af6ee9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 20 deletions.
diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
@@ -12,11 +12,19 @@ Current team:
 Honorary member (and original author)
     Gregor Kaufmann <tdian@users.sourceforge.net>
 
-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
 of the License, or (at your option) any later version.
 
-See GPL2.txt and GPL3.txt
+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/LICENSE.txt b/LICENSE.txt
diff --git a/package.py b/package.py
@@ -287,7 +287,6 @@ def rename_file(folder, old, new):
          'GPL3.txt',
          'CHANGELOG.txt',
          'COPYRIGHT.txt',
-         'LICENSE.txt',
          'ISSUES.txt',
          'nzbmatrix.txt',
          'nzb.ico',