From 2b6cff9065a2f8acee34f1818ce332ee8779a66b Mon Sep 17 00:00:00 2001 From: Modestas Vainius Date: Wed, 30 Jun 2010 10:47:53 +0300 Subject: [PATCH] Remove deprecated references to /usr/share/common-licenses/BSD from debian/copyright. --- debian/changelog | 2 ++ debian/copyright | 36 +----------------------------------- 2 files changed, 3 insertions(+), 35 deletions(-) diff --git a/debian/changelog b/debian/changelog index 65df60b22..c678888b0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -15,6 +15,8 @@ cmake (2.8.2-1) UNRELEASED; urgency=low * Bump Standards-Version to 3.9.0: - replace Conflicts: cmake (<= 2.6.2-1) with Breaks in cmake-data; - add Breaks: cmake (<= 2.6.2-1) to cmake-gui-curses. + * Remove deprecated references to /usr/share/common-licenses/BSD from + debian/copyright. -- Kai Wasserbäch Thu, 03 Jun 2010 16:25:20 +0200 diff --git a/debian/copyright b/debian/copyright index 71d8d0fd2..b382ee9f2 100644 --- a/debian/copyright +++ b/debian/copyright @@ -56,9 +56,7 @@ http://www.cmake.org/HTML/Copyright.html CMake is licensed under OSI approved BSD "July 22 1999" style license and therefore the right to use and distribute it in binary form linked with Qt4 are granted by the Qt GPL Exception. See /usr/share/doc/libqtcore4/copyright for -more information on the Qt GPL Exception. Complete text of the original BSD -"July 22 1999" license can be found in /usr/share/common-licenses/BSD on Debian -systems. +more information on the Qt GPL Exception. -- Detailed copyright and licensing summary can be found below: @@ -154,38 +152,6 @@ Detailed copyright and licensing summary can be found below: | OTHER DEALINGS IN THE SOFTWARE. -- --- - OSI approvied BSD-like License without advertising clause - 39 files are licensed under this license: - - + Modules/FindSubversion.cmake - + Source/CPack/cmCPackDebGenerator.cxx - + Utilities/cmcurl/krb4.c - + Utilities/cmcurl/security.c - + Utilities/cmtar/tar.h - + Utilities/cmtar/compat/basename.c - + Utilities/cmtar/compat/dirname.c - + Utilities/cmtar/compat/strlcat.c - + Utilities/cmtar/compat/strlcpy.c - Utilities/cmxmlrpc/* excluding: - -? Utilities/cmxmlrpc/CMakeLists.txt - -? Utilities/cmxmlrpc/bool.h - -? Utilities/cmxmlrpc/casprintf.c - -? Utilities/cmxmlrpc/casprintf.h - -? Utilities/cmxmlrpc/inline.h - -? Utilities/cmxmlrpc/linklist.h - -? Utilities/cmxmlrpc/mallocvar.h - -? Utilities/cmxmlrpc/synch_client.c - -? Utilities/cmxmlrpc/transport_config.h - -? Utilities/cmxmlrpc/xmlrpc_curl_transport.c - -? Utilities/cmxmlrpc/xmlrpc_curl_transport.h - -? Utilities/cmxmlrpc/xmlrpc_strutil.c - - On Debian systems, the complete text of the - BSD-like License can be found in - /usr/share/common-licenses/BSD --- - -- BSD-like License with advertising clause