From a983f7ce6368d2052d14e4b26fdcd388e42f19a5 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sat, 23 Jan 2010 17:11:24 +0000 Subject: Switch license to GPL for backup parts, and dual GPL/BSD for common parts, as discussed and agreed in this thread: http://lists.boxbackup.org/pipermail/boxbackup/2010-January/000005.html --- distribution/COMMON-MANIFEST.txt | 14 ++++++-- distribution/boxbackup/DISTRIBUTION-MANIFEST.txt | 44 +++++++++++++++--------- distribution/boxbackup/LICENSE.txt | 38 -------------------- 3 files changed, 38 insertions(+), 58 deletions(-) delete mode 100644 distribution/boxbackup/LICENSE.txt (limited to 'distribution') diff --git a/distribution/COMMON-MANIFEST.txt b/distribution/COMMON-MANIFEST.txt index a21abe20..108e50ec 100644 --- a/distribution/COMMON-MANIFEST.txt +++ b/distribution/COMMON-MANIFEST.txt @@ -1,5 +1,10 @@ +LICENSE-DUAL.txt + +LICENSE DUAL + RUN ./bootstrap RUN cd docs; make + lib/common lib/crypto lib/server @@ -27,11 +32,14 @@ infrastructure/printversion.pl infrastructure/BoxPlatform.pm.in infrastructure/mingw infrastructure/msvc -NO-LICENSE config.sub -NO-LICENSE config.guess bootstrap configure.ac configure parcels.txt runtest.pl.in -NO-LICENSE-IN-DIR infrastructure/m4 +COPYING.txt + +LICENSE none +config.sub +config.guess +infrastructure/m4 diff --git a/distribution/boxbackup/DISTRIBUTION-MANIFEST.txt b/distribution/boxbackup/DISTRIBUTION-MANIFEST.txt index 4224855e..17e3ea8c 100644 --- a/distribution/boxbackup/DISTRIBUTION-MANIFEST.txt +++ b/distribution/boxbackup/DISTRIBUTION-MANIFEST.txt @@ -1,10 +1,16 @@ +LICENSE-GPL.txt + +LICENSE DUAL lib/intercept lib/raidfile +lib/httpserver test/raidfile test/raidfile/testfiles +test/httpserver + +LICENSE GPL lib/backupclient lib/backupstore -lib/httpserver bin/bbstored bin/bbstoreaccounts bin/bbackupd @@ -20,15 +26,18 @@ test/backupstorepatch test/bbackupd test/bbackupd/testfiles test/backupdiff -test/httpserver docs/Makefile docs/tools + +LICENSE DUAL docs/api-notes -docs/api-notes/backup docs/api-notes/raidfile docs/api-notes/raidfile/lib_raidfile.txt -docs/html -docs/html/images + +LICENSE GPL +docs/api-notes/backup + +docs/images docs/htmlguide docs/htmlguide/adminguide docs/htmlguide/images @@ -64,17 +73,18 @@ docs/xsl-generic/html docs/xsl-generic/highlighting BUGS.txt contrib -NO-LICENSE-IN-DIR contrib/debian -NO-LICENSE-IN-DIR contrib/mac_osx -NO-LICENSE-IN-DIR contrib/redhat -NO-LICENSE-IN-DIR contrib/rpm + +contrib/debian +contrib/mac_osx +contrib/redhat +contrib/rpm REPLACE-VERSION-IN contrib/rpm/boxbackup.spec -NO-LICENSE-IN-DIR contrib/solaris -NO-LICENSE-IN-DIR contrib/suse -NO-LICENSE-IN-DIR contrib/bbreporter -NO-LICENSE-IN-DIR contrib/windows -NO-LICENSE-IN-DIR contrib/windows/installer -NO-LICENSE-IN-DIR contrib/windows/installer/tools +contrib/solaris +contrib/suse +contrib/bbreporter +contrib/windows +contrib/windows/installer +contrib/windows/installer/tools infrastructure/msvc -NO-LICENSE-IN-DIR infrastructure/msvc/2003 -NO-LICENSE-IN-DIR infrastructure/msvc/2005 +infrastructure/msvc/2003 +infrastructure/msvc/2005 diff --git a/distribution/boxbackup/LICENSE.txt b/distribution/boxbackup/LICENSE.txt deleted file mode 100644 index a03851b8..00000000 --- a/distribution/boxbackup/LICENSE.txt +++ /dev/null @@ -1,38 +0,0 @@ - -Copyright (c) 2003 - 2008 - Ben Summers and contributors. All rights reserved. - -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. All use of this software and associated advertising materials must - display the following acknowledgment: - This product includes software developed by Ben Summers. -4. The names of the Authors may not be used to endorse or promote - products derived from this software without specific prior written - permission. - -[Where legally impermissible the Authors do not disclaim liability for -direct physical injury or death caused solely by defects in the software -unless it is modified by a third party.] - -THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``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 AUTHORS 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. - - - -- cgit v1.2.3