[SCM] Finger Lakes Instrument library packaging branch, master, updated. b07e9dbcbc254230f1347cd178579491435e731b

[Pino Toscano]

The following commit has been merged in the master branch:
commit b8ea3eb828a1281520ff24dec4de7bb23f058a20
Author: Pino Toscano <pino at kde.org>
Date:   Sat Aug 28 11:17:39 2010 +0200

    Pur the whole BSD license text, as per more recent Policy.
---
 debian/changelog |    5 +++--
 debian/copyright |   26 ++++++++++++++++++++++++--
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3cc0a11..c3d7bb7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,11 +10,12 @@ libfli (1.7-0r1) UNRELEASED; urgency=low
     - update install files
     - simplify rules
     - drop cdbs from Build-Depends
-  * Update copyright.
+  * Update copyright, also put the text of the BSD license instead of pointing
+    to the deprecated /usr/share/common-licenses/BSD.
   * Bump Standards-Version to 3.8.4, no changes required.
   * Set format as "3.0 (quilt)".
 
- -- Debian Krap Maintainers <debian-qt-kde at lists.debian.org>  Sat, 28 Aug 2010 11:11:45 +0200
+ -- Debian Krap Maintainers <debian-qt-kde at lists.debian.org>  Sat, 28 Aug 2010 11:17:05 +0200
 
 libfli1 (1.7-0ubuntu1) jaunty; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index c06f588..2cde17f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -7,9 +7,31 @@ Copyright:
     
 License:
 
-Licensed under the BSD License, see /usr/share/common-licenses/BSD
+    Licensed under the BSD License:
+
+    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 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.
+
 
 The Debian packaging is:
  Copyright 2008, Jasem Mutlaq <mutlaqja at ikarustech.com>
  Copyright 2010, Pino Toscano <pino at kde.org>
-And it is licensed under the BSD License, see /usr/share/common-licenses/BSD.
+And it is licensed under the BSD License, see above.

-- 
Finger Lakes Instrument library packaging