[SCM] gmerlin/master: Clarify Bitzi's "Public Domain" license

[umlaeute at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d58ea8ef883ca4b585cea9e36aec59265ca38d43
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date:   Wed Jul 2 14:24:19 2014 +0200

    Clarify Bitzi's "Public Domain" license

diff --git a/debian/copyright b/debian/copyright
index 90bac05..4345cf3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -67,7 +67,7 @@ License: other-GAP-gettext
 
 Files: plugins/cdaudio/sha1.[ch]
 Copyright: - (2001 The Bitzi Corporation, Uwe Hollerbach)
-License: Public Domain
+License: bitzi-public-domain
 
 Files: debian/*
 Copyright: 2008, Christian Marillat <marillat at debian.org>,
@@ -196,3 +196,48 @@ License: other-targa
  .
  This code is provided without any warranty.  The copyright holder is
  not liable for anything bad that might happen as a result of the code.
+
+License: bitzi-public-domain
+ 1. Authorship. This work and others bearing the above
+    label were created by, or on behalf of, the Bitzi
+    Corporation. Often other public domain material by
+    other authors is incorporated; this should be clear
+    from notations in the source code. If other non-
+    public-domain code or libraries are included, this is
+    is done under those works' respective licenses.
+ 2. Release. The Bitzi Corporation places its portion
+    of these labelled works into the public domain,
+    disclaiming all rights granted us by copyright law.
+    Bitzi places no restrictions on your freedom to copy,
+    use, redistribute and modify this work, though you
+    should be aware of points (3), (4), and (5) below.
+ 3. Trademark Advisory. The Bitzi Corporation reserves
+    all rights with regard to any of its trademarks which
+    may appear herein, such as "Bitzi", "Bitcollider", or
+    "Bitpedia". Please take care that your uses of this
+    work do not infringe on our trademarks or imply our
+    endorsement. For example, you should change labels
+    and identifier strings in your derivative works where
+    appropriate.
+ 4. Licensed portions. Some code and libraries may be
+    incorporated in this work in accordance with the
+    licenses offered by their respective rightsholders.
+    Further copying, use, redistribution and modification
+    of these third-party portions remains subject to
+    their original licenses.
+ 5. Disclaimer. THIS SOFTWARE IS PROVIDED BY THE AUTHOR
+    ``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 AUTHOR 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.
+ Please see http://bitzi.com/publicdomain or write
+ info at bitzi.com for more info.

-- 
gmerlin packaging