[SCM] kwallet packaging branch, master, updated. 9152ddaac84330fc04467ffb5fba760abb139d8a

Maximiliano Curia maxy at moszumanska.debian.org
Tue Feb 24 17:14:15 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kwallet.git;a=commitdiff;h=14522e3

The following commit has been merged in the master branch:
commit 14522e301410c8b923e8475239c003dc2befc5cb
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Jan 28 19:49:04 2015 +0100

    Update copyright information.
---
 debian/changelog |   1 +
 debian/copyright | 105 ++++++++++++++++++++++++++++++++++++-------------------
 2 files changed, 70 insertions(+), 36 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 77b21f2..4c790e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ kwallet-kf5 (5.6.0-1~) UNRELEASED; urgency=medium
   * Update build dependencies to build against experimental and to
     follow cmake.
   * Bump Standards-Version to 3.9.6, no changes needed.
+  * Update copyright information.
 
  -- Maximiliano Curia <maxy at debian.org>  Tue, 27 Jan 2015 22:15:28 +0100
 
diff --git a/debian/copyright b/debian/copyright
index bb36d05..1e4c6a5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,37 +3,21 @@ Upstream-Name: kwallet
 Source: https://projects.kde.org/projects/frameworks/kwallet
 
 Files: *
-       debian/*
-Copyright: © 2002-2004 George Staikos <staikos at kde.org>
-           © 2008 Michael Leupold <lemma at confuego.org>
-           © 2007 Thomas McGuire <thomas.mcguire at gmx.net>
-           © 2011 Valentin Rusu <kde at rusu.info>
-           © 2010 Frank Osterfeld <osterfeld at kde.org>
-             2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
+Copyright: 1996, Bruce Schneier
+           1998, FSF
+           2010, Frank Osterfeld <osterfeld at kde.org>
+           2001-2004, George Staikos <staikos at kde.org>
+           2008, Michael Leupold <lemma at confuego.org>
+           2007, Pino Toscano <pino at kde.org>
+           2007, Thomas McGuire <thomas.mcguire at gmx.net>
+           2011-2014, Valentin Rusu <kde at rusu.info>
 License: LGPL-2+
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 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
- Library General Public License for more details.
- .
- You should have received a copy of the GNU Library General Public License
- along with this library; see the file COPYING.LIB.  If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- .
- On Debian systems, the complete text of the GNU Library General
- Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
 
 Files: src/runtime/kwalletd/kbetterthankdialog.cpp
- src/runtime/kwalletd/kwalletwizard.h
- src/runtime/kwalletd/kwalletwizard.cpp
- src/runtime/kwalletd/kbetterthankdialog.h
-Copyright: 2004 George Staikos <staikos at kde.org>
+       src/runtime/kwalletd/kwalletwizard.h
+       src/runtime/kwalletd/kwalletwizard.cpp
+       src/runtime/kwalletd/kbetterthankdialog.h
+Copyright: 2004, George Staikos <staikos at kde.org>
 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
@@ -48,16 +32,16 @@ License: LGPL-2.1+
  You should have received a copy of the GNU Lesser General Public
  License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  .
- On Debian systems, the complete text of the GNU Lesser General
- Public License version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1".
+ On Debian systems, the complete text of the GNU Lesser General Public License
+ version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1".
 
 Files: src/runtime/kwalletd/backend/backendpersisthandler.cpp
- src/runtime/kwalletd/backend/backendpersisthandler.h
- src/runtime/kwalletd/knewwalletdialog.cpp
- src/runtime/kwalletd/main.cpp
- src/runtime/kwalletd/knewwalletdialog.h
-Copyright: Valentin Rusu <kde at rusu.info>
- 2008 Michael Leupold <lemma at confuego.org>
+       src/runtime/kwalletd/backend/backendpersisthandler.h
+       src/runtime/kwalletd/knewwalletdialog.cpp
+       src/runtime/kwalletd/main.cpp
+       src/runtime/kwalletd/knewwalletdialog.h
+Copyright: 2008, Michael Leupold <lemma at confuego.org>
+           2013, Valentin Rusu <kde at rusu.info>
 License: LGPL-2
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Library General Public
@@ -73,5 +57,54 @@ License: LGPL-2
  the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  Boston, MA 02110-1301, USA.
  .
+ On Debian systems, the complete text of the GNU Library General Public
+ License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
+
+Files: cmake/FindLibGcrypt.cmake
+Copyright: 2014, Nicolás Alvarez <nicolas.alvarez at gmail.com>
+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.
+
+Files: debian/*
+Copyright: 2014, Scarlett Clark <scarlett at scarlettgatelyclark.com>
+License: LGPL-2+
+
+License: LGPL-2+
+ This library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public
+ License as published by the Free Software Foundation; either
+ version 2 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
+ Library General Public License for more details.
+ .
+ You should have received a copy of the GNU Library General Public License
+ along with this library; see the file COPYING.LIB.  If not, write to
+ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ Boston, MA 02110-1301, USA.
+ .
  On Debian systems, the complete text of the GNU Library General
  Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2".

-- 
kwallet packaging



More information about the pkg-kde-commits mailing list