options.py: relicense to 2-clause BSD license.

At the request of a few people who would like to us it in their own
projects.

Signed-off-by: Avery Pennarun <apenwarr@gmail.com>

diff --git a/LICENSE b/LICENSE
index ed6ca847ee3bbf3606894159b6f0e6b84774973b..6178f22d475ad51da9e68e4eaf636ef2d866406d 100644 (file)
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,8 @@
 
 The files in this project may all be distributed under the terms of the
-following license.  In addition, bupsplit.c and bupsplit.h may be
+following license. (The LGPL version 2.)
+
+In addition, bupsplit.c, bupsplit.h, and options.py may be
 redistributed according to the separate license (a BSD-style license)
 written inside those files.
 

diff --git a/lib/bup/options.py b/lib/bup/options.py
index cfbeea111fb00725090bdbb83eb83daa56aa8e14..9bcead7e19db49a3992dc251fe2ef57a30da6dbf 100644 (file)
--- a/lib/bup/options.py
+++ b/lib/bup/options.py
@@ -1,3 +1,33 @@
+# Copyright 2011 Avery Pennarun and options.py contributors.
+# All rights reserved.
+#
+# (This license applies to this file but not necessarily the other files in
+# this package.)
+# 
+# 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.
+# 
+# THIS SOFTWARE IS PROVIDED BY AVERY PENNARUN ``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 <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.
+#
 """Command-line options parser.
 With the help of an options spec string, easily parse command-line options.