[SCM] ktp-contact-applet packaging branch, master, updated. upstream/0.4.0-16-gf4a8777
Diane Trout
diane-guest at alioth.debian.org
Sat Jul 13 06:21:40 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/ktp-contact-applet.git;a=commitdiff;h=091e6e8
The following commit has been merged in the master branch:
commit 091e6e8517d519279763171ca3613913580d00aa
Author: Diane Trout <diane at ghic.org>
Date: Sun Jun 30 22:04:17 2013 -0700
Imported Kubuntu's more complete copyright file.
---
debian/changelog | 1 +
debian/copyright | 144 ++++++++++++++++++++++++++++++------------------------
2 files changed, 81 insertions(+), 64 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a6488c0..c71ee4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,5 +9,6 @@ ktp-desktop-applets (0.6.2-2) UNRELEASED; urgency=low
* Rename package to ktp-desktop-applets
* Rename binary packages to kde-telepathy-desktop-applets to be more consistent with the other packages.
* Set Uploaders to Diane Trout and Michał Zając
+ * Imported Kubuntu's more complete copyright file.
-- Diane Trout <diane at ghic.org> Mon, 27 May 2013 11:09:12 -0700
diff --git a/debian/copyright b/debian/copyright
index 0f8b38c..ca09239 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,69 +1,85 @@
-This package was debianized by George Kiagiadakis <kiagiadakis.george at gmail.com> on
-Thu, 01 Dec 2011 12:54:50 +0200.
-
-It was downloaded from:
-
- http://download.kde.org/
-
-Upstream Authors:
-
- Francesco Nwokeka <francesco.nwokeka at gmail.com>
- Martin Klapetek <martin.klapetek at gmail.com>
-
-Copyright:
-
- © 2011 Francesco Nwokeka <francesco.nwokeka at gmail.com>
- © 2011 Martin Klapetek <martin.klapetek at gmail.com>
-
-License:
-
- This program is free software: you can redistribute it and/or modify
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ktp-desktop-applets
+Upstream-Contact: KDE Telepathy Project <kde-telepathy at kde.org>
+Source: http://download.kde.org/unstable/kde-telepathy/
+License: GPL-2+
+
+Files: *
+Copyright: 2011 Francesco Nwokeka <francesco.nwokeka at gmail.com>
+ 2012 David Edmundson <kde at davidedmundson.co.uk>
+ 2012 Lasath Fernando <kde at lasath.org>
+ 2012 Aleix Pol <aleixpol at kde.org>
+License: GPL-2+
+
+
+Files: contact/src/contact-delegate*
+ contact/src/abstract-contact-delegate.*
+ 50-renameKTpApplets.js
+Copyright: 2013 Dan Vrátil <dvratil at redhat.com>
+ 2011 Martin Klapetek <martin.klapetek at gmail.com>
+ 2012 Dominik Cermak <d.cermak at arcor.de>
+License: LGPL-2.1+
+
+
+Files: cmake/*
+Copyright: 2011 Dario Freddi <drf at kde.org>
+License: BSD-3-clause
+
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 2 of the License, or
+ the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
+ .
+ This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
-
- On Debian systems, the full text of the GNU General Public License
- version 2 is available in /usr/share/common-licenses/GPL-2.
-
-Files with different license and/or copyright:
-
- Files under cmake/
-
- Copyright: © 2008, Allen Winter <winter at kde.org>
- Copyright: © 2009, Andre Moreira Magalhaes <andrunko at gmail.com>
-
- These files are under this license:
-
- | 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.
-
-The Debian packaging is
-
- © 2011, George Kiagiadakis <kiagiadakis.george at gmail.com>
-
-and is licensed under the LGPL v2.1 or later, see `/usr/share/common-licenses/LGPL-2.1'.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+License: LGPL-2.1+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+ .
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License v2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
+
+License: BSD-3-clause
+ 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.
--
ktp-contact-applet packaging
More information about the pkg-kde-commits
mailing list