[SCM] KTorrent Debian packaging. branch, master, updated. debian/4.0.1-1-7-g7b6507a

Thu Jul 8 21:13:32 UTC 2010

The following commit has been merged in the master branch:
commit 224a8166b275eaf5164c201cae7e2735c14753c4
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Thu Jul 8 23:30:14 2010 +0300

    Minor debian/copyright updates.
    
    * No longer reference BSD from common-licenses in debian/copyright, replace
      it with copyright/license blob.
    * Fix indentation style in debian/copyright.
---
 debian/changelog |    3 +
 debian/copyright |  109 +++++++++++++++++++++++++++++++++---------------------
 2 files changed, 70 insertions(+), 42 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bffd80e..3b1632c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ ktorrent (4.0.2-1) UNRELEASED; urgency=low
   * New upstream release.
   * Bump libktorrent-dev build dependency to 1.0.2.
   * Bump Standards-Version to 3.9.0: add Breaks next to Replaces where needed.
+  * No longer reference BSD from common-licenses in debian/copyright, replace
+    it with copyright/license blob.
+  * Fix indentation style in debian/copyright.
 
  -- Modestas Vainius <modax at debian.org>  Thu, 08 Jul 2010 21:55:09 +0300
 
diff --git a/debian/copyright b/debian/copyright
index 0a7569b..8684897 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -193,58 +193,83 @@ Other used licenses:
     + libbtcore/util/win32.cpp
     + libbtcore/util/win32.h
 
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-  SOFTWARE.
+  | Permission is hereby granted, free of charge, to any person obtaining a
+  | copy of this software and associated documentation files (the "Software"),
+  | to deal in the Software without restriction, including without limitation
+  | the rights to use, copy, modify, merge, publish, distribute, sublicense,
+  | and/or sell copies of the Software, and to permit persons to whom the
+  | Software is furnished to do so, subject to the following conditions:
+  |
+  | The above copyright notice and this permission notice shall be included in
+  | all copies or substantial portions of the Software.
+  |
+  | THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  | IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+  | THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  | FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+  | DEALINGS IN THE SOFTWARE.
 --
 
 --
    cmake/modules/*
    + libbtcore/config-btcore.h.cmake
 
-  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 copyright
-     notice, this list of conditions and the following disclaimer.
-  2. Redistributions in binary form must reproduce the copyright
-     notice, this list of conditions and the following disclaimer in the
-     documentation and/or other materials provided with the distribution.
-  3. The name of the author may not be used to endorse or promote products 
-     derived from this software without specific prior written permission.
-  
-  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.
+  | 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 copyright
+  |    notice, this list of conditions and the following disclaimer.
+  | 2. Redistributions in binary form must reproduce the copyright
+  |    notice, this list of conditions and the following disclaimer in the
+  |    documentation and/or other materials provided with the distribution.
+  | 3. The name of the author may not be used to endorse or promote products 
+  |    derived from this software without specific prior written permission.
+  |
+  | 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.
 --
 
 --
   BSD License
 
-    + plugins/webinterface/common/sha1.js
+    + plugins/webinterface/www/common/sha1.js
 
-  On Debian systems, the complete text of the BSD License can be found in
-  /usr/share/common-licenses/BSD
+  | Copyright (c) 1998 - 2009, Paul Johnston & Contributors
+  | All rights reserved.
+  |
+  | 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 the author 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.
 --

-- 
KTorrent Debian packaging.

