[SCM] Polkit Qt 1 packaging branch, master, updated. debian/0.99.0-1
Modestas Vainius
modax at alioth.debian.org
Sun Mar 13 23:06:24 UTC 2011
The following commit has been merged in the master branch:
commit d268293e3f7bbcdbd85d116422ea44d996220b67
Author: Modestas Vainius <modestas at vainius.eu>
Date: Mon Mar 14 00:33:33 2011 +0200
Include verbatim BSD license to debian/copyright.
---
debian/changelog | 1 +
debian/copyright | 28 +++++++++++++++++++++++-----
2 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f6f54ec..f4d32b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ polkit-qt-1 (0.99.0-0r1) UNRELEASED; urgency=low
* Switch debian/rules engine to qt-kde-team/2/*.
* Bump Standards-Version to 3.9.1: no changes needed.
* Remove dupe "Section" field from debian/control.
+ * Include verbatim BSD license to debian/copyright.
[ Didier Raboud ]
* Bump B-D of libpolkit to >= 0.98.
diff --git a/debian/copyright b/debian/copyright
index 47f96f0..654a098 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -45,10 +45,28 @@ Copyright for cmake/modules/InstallSettings.cmake file:
License for cmake modules:
- Redistribution and use is allowed according to the terms of the BSD license.
-
-On Debian systems, the complete text of the BSD License can be found in
-`/usr/share/common-licenses/BSD'.
+ 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.
License:
@@ -74,4 +92,4 @@ The Debian packaging is:
Copyright (C) 2010 Fathi Boudra <fabo at debian.org>
-and is licensed under the GPL version 2 or any later version.
\ No newline at end of file
+and is licensed under the GPL version 2 or any later version.
--
Polkit Qt 1 packaging
More information about the pkg-kde-commits
mailing list