[SCM] Google Gadgets packaging branch, master, updated. debian/0.11.2-2-9-gdeb6c41

[Pino Toscano]

The following commit has been merged in the master branch:
commit 2ded085ab416414410be8797f4c37f323b76d0ca
Author: Pino Toscano <pino at kde.org>
Date:   Sat Aug 7 14:25:01 2010 +0200

    Update debian/copyright
    
    - explicitly list the sources in unittest/ which are licensed as BSD.
    - put the whole BSD license text instead of referring to /usr/share/common-licenses/BSD, which is deprecated in Debian Policy 3.9.0.0.
---
 debian/changelog |    7 ++++++-
 debian/copyright |   41 +++++++++++++++++++++++++++++++++++++----
 2 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1aeb76a..bea3cb8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,13 @@ google-gadgets (0.11.2-3) UNRELEASED; urgency=low
   * Remove the postinst and postrm scripts of google-gadgets-common, as
     dh_installmime will take care of adding the proper snippets to trigger
     update-mime-database. (Closes: #591863)
+  * Update debian/copyright:
+    - explicitly list the sources in unittest/ which are licensed as BSD.
+    - put the whole BSD license text instead of referring to
+      /usr/share/common-licenses/BSD, which is deprecated in Debian Policy
+      3.9.0.0.
 
- -- Debian Krap Maintainers <debian-qt-kde at lists.debian.org>  Sat, 07 Aug 2010 13:05:25 +0200
+ -- Debian Krap Maintainers <debian-qt-kde at lists.debian.org>  Sat, 07 Aug 2010 14:22:00 +0200
 
 google-gadgets (0.11.2-2) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 6c6775c..adfa81e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -16,10 +16,6 @@ Copyright:
 License: Apache 2.0
     See </usr/share/common-licenses/Apache-2.0> for the full license text
     
-	The contents of unittest/ in the source package are (C) 2008 Google Inc
-	and are licensed under the BSD license, for full license text see:
-		</usr/share/common-licenses/BSD>
-		
 		
 The following files have their differing copyright holders and licenses:
 
@@ -775,3 +771,40 @@ libltdl/ltdl.c
 libltdl/ltdl.h
 	   Copyright (C) 1998-2001, 2003, 2004, 2007 Free Software Foundation, Inc.
 	      Originally by Thomas Tanner <tanner at ffii.org>
+
+unittest/gtest.cc:
+unittest/gtest.h:
+unittest/gtest_internal.h:
+unittest/gtest_internal_inl.h:
+unittest/gtest_pred_impl.h:
+unittest/gtest_prod.h:
+unittest/gtest_spi.h:
+    Copyright (C) 2008 Google Inc, BSD license:
+
+    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 Google Inc. 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.
+
+

-- 
Google Gadgets packaging