[SCM] udav packaging branch, master, updated. debian/0.6.3-2-7-g68d2d75

[Salvatore Bonaccorso]

The following commit has been merged in the master branch:
commit 68d2d754852da91bc5897e663d3a771eddd3412a
Author: Salvatore Bonaccorso <carnil at debian.org>
Date:   Wed Nov 10 10:22:16 2010 +0100

    debian/copyright: Refresh and add copyright and license information for new added files.

diff --git a/debian/changelog b/debian/changelog
index b2b304e..0855cc3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ udav (0.7-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Drop fix-598069-segfault-under-kde.patch as it is applied upstream.
+  * debian/copyright: Refresh and add copyright and license information
+    for new added files.
 
- -- Salvatore Bonaccorso <carnil at debian.org>  Wed, 10 Nov 2010 09:22:50 +0100
+ -- Salvatore Bonaccorso <carnil at debian.org>  Wed, 10 Nov 2010 10:22:07 +0100
 
 udav (0.6.3-2) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index e8f2bed..3ad95ce 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,9 +11,13 @@ Files: debinstall/*
 Copyright: Copyright 2007, Dmitry I. Kulagin <dik at kulagin.nnov.ru> 
 License: GPL-2+
 
+Files: src/textedit.cpp, src/textedit.h
+Copyright: 2010, Nokia Corporation and/or its subsidiary(-ies).
+License: BSD
+
 Files: debian/*
 Copyright: 2009, 2010, Salvatore Bonaccorso <carnil at debian.org>
-License: GPL-2+
+License: GPL-2+ or BSD
 
 License: GPL-2+
  This program is free software; you can redistribute it and/or modify
@@ -28,3 +32,30 @@ License: GPL-2+
  .
  On Debian systems the full text of the GNU General Public License can 
  be found in the `/usr/share/common-licenses/GPL-2' file.
+
+License: BSD
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+    * 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.
+    * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
+      the names of its contributors may be used to endorse or promote
+      products derived from this software without specific prior written
+      permission.
+ .
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+  "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 COPYRIGHT
+  OWNER 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.

-- 
udav packaging