diff options
Diffstat (limited to 'distribution')
-rw-r--r-- | distribution/COMMON-MANIFEST.txt | 17 | ||||
-rw-r--r-- | distribution/boxbackup/DISTRIBUTION-MANIFEST.txt | 58 | ||||
-rw-r--r-- | distribution/boxbackup/LICENSE.txt | 38 | ||||
-rw-r--r-- | distribution/boxbackup/VERSION.txt | 2 |
4 files changed, 57 insertions, 58 deletions
diff --git a/distribution/COMMON-MANIFEST.txt b/distribution/COMMON-MANIFEST.txt index b6f4b6d7..6753c886 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 @@ -13,7 +18,10 @@ test/crypto test/compress test/win32 docs/api-notes +docs/api-notes/common docs/api-notes/common/lib_common +docs/api-notes/common/lib_common.txt +docs/api-notes/common/lib_compress docs/api-notes/common/lib_crypto docs/api-notes/common/lib_server MKDIR infrastructure @@ -26,11 +34,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 2147e6e3..3677d376 100644 --- a/distribution/boxbackup/DISTRIBUTION-MANIFEST.txt +++ b/distribution/boxbackup/DISTRIBUTION-MANIFEST.txt @@ -1,7 +1,14 @@ +LICENSE-GPL.txt + +LICENSE DUAL lib/intercept lib/raidfile +lib/httpserver test/raidfile test/raidfile/testfiles +test/httpserver + +LICENSE GPL lib/backupclient lib/backupstore bin/bbstored @@ -11,6 +18,7 @@ bin/bbackupd/win32 bin/bbackupquery bin/bbackupctl bin/bbackupobjdump +bin/s3simulator test/backupstore test/backupstore/testfiles test/backupstorefix @@ -19,21 +27,31 @@ test/backupstorepatch test/bbackupd test/bbackupd/testfiles test/backupdiff +test/httpserver/testfiles +test/httpserver/testfiles/photos docs/Makefile docs/tools + +LICENSE DUAL docs/api-notes -docs/api-notes/raidfile/lib_raidfile +docs/api-notes/raidfile +docs/api-notes/raidfile/lib_raidfile.txt + +LICENSE GPL +docs/api-notes/backup + +docs/images docs/htmlguide docs/htmlguide/adminguide docs/htmlguide/images docs/htmlguide/instguide -docs/htmlguide/manpages +docs/htmlguide/man-html docs/man MKDIR docs/docbook docs/docbook/ExceptionCodes.xml docs/docbook/adminguide.xml docs/docbook/bb-book.xsl -docs/docbook/bb-man.xsl.tmpl +docs/docbook/bb-man.xsl docs/docbook/bb-nochunk-book.xsl docs/docbook/bbackupctl.xml docs/docbook/bbackupd-config.xml @@ -50,20 +68,28 @@ docs/docbook/raidfile-config.xml docs/docbook/raidfile.conf.xml docs/docbook/html docs/docbook/html/images -TODO.txt +docs/xsl-generic +docs/xsl-generic/manpages +docs/xsl-generic/lib +docs/xsl-generic/common +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/bbadmin +contrib/bbreporter +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/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. - - - diff --git a/distribution/boxbackup/VERSION.txt b/distribution/boxbackup/VERSION.txt index 990d8ebe..3d50f849 100644 --- a/distribution/boxbackup/VERSION.txt +++ b/distribution/boxbackup/VERSION.txt @@ -1,2 +1,2 @@ -0.11_USE_SVN_VERSION +0.11rc8 boxbackup |