copyright: include the complete BSD license.

… rather than referencing the file in /u/s/common-licenses, as requested
starting with policy 3.9.0.

diff --git a/debian/changelog b/debian/changelog
index 23724d67e304f50f9891680e0cae7d1db341c82f..fda47dc0d565b7fa7c880b2ce439ebd9f780427f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,10 +6,12 @@ ncmpc (0.17-1) unstable; urgency=low
   * debian/patches:
     - Added bts589660-updated-manpage -- updated obsolete parts of the
       manpage; thanks to Martin Hradil for reporting this (Closes: #589660).
-  * debian/control:
-    - Updated standards-version to 3.9.1 -- no changes.
+  * debian/control, debian/copyright:
+    - Updated standards-version to 3.9.1 -- include the complete BSD license
+      in debian/copyright rather than referencing the file in /u/s/common-
+      licenses.
 
- -- Sebastian Harl <tokkee@debian.org>  Fri, 30 Jul 2010 14:38:27 +0200
+ -- Sebastian Harl <tokkee@debian.org>  Fri, 30 Jul 2010 14:49:31 +0200
 
 ncmpc (0.16.1-1) unstable; urgency=low
 

diff --git a/debian/copyright b/debian/copyright
index 23b4f3be1af081be9669b55c016f92e565689836..df4126840596f41f5bec6880c7ac717b0b110f57 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -33,16 +33,36 @@ License:
        Copyright © 2004-2010 The Music Player Daemon Project
 
        Redistribution and use in source and binary forms, with or without
-       modification, are permitted provided that certain conditions are
-       met. See the BSD license for more details.
+       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 Music Player Daemon 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 FOUNDATION 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.
 
        Some files are licensed under the above mentioned 3-clause BSD License,
        while any others are licensed under the 2-clause BSD License, which does
        not include the third (endorsement / promotion) clause.
 
-On Debian systems, the complete text of the BSD License
-can be found in `/usr/share/common-licenses/BSD'.
-
        Files po/cs.po
              po/fi.po
              po/hu.po