[SCM] krecipes packaging branch, master, updated. upstream/2.0_beta2-25-g43ce994

Sun Nov 29 09:28:05 UTC 2015

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/krecipes.git;a=commitdiff;h=43ce994

The following commit has been merged in the master branch:
commit 43ce99497e46c49db55f530c7a43fcc8102663db
Author: Pino Toscano <pino at debian.org>
Date:   Sun Nov 29 10:27:20 2015 +0100

    copyright: migrate to copyright-format v1.0, and update
---
 debian/changelog |  1 +
 debian/copyright | 54 ++++++++++++------------------------------------------
 2 files changed, 13 insertions(+), 42 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 31e4e18..5e01832 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ krecipes (2.1.0-0r1) UNRELEASED; urgency=medium
   * Update watch file to look also on download.kde.org.
   * Add the pkg-config build dependency.
   * Remove unused lintian overrides.
+  * Migrate copyright to copyright-format v1.0, and update it.
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Thu, 11 Sep 2014 10:28:36 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 1c582b3..816f135 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,6 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/?rev=48&sc=1
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Krecipes
-Upstream-Maintainer: José Manuel Santamaría Lema <panfaust at gmail.com>
-Upstream-Source: http://krecipes.sourceforge.net/
+Source: https://projects.kde.org/projects/extragear/utils/krecipes
 
 Files: *
 Copyright: © 2003-2005 Unai Garro <ugarro at gmail.com> 
@@ -15,7 +14,7 @@ Copyright: © 2003-2005 Unai Garro <ugarro at gmail.com>
            © 2005 Petri Damstén <petri.damsten at iki.fi>
            © 2005-2006 Tom Albers <tomalbers at kde.nl>
            © 2008 Montel Laurent <montel at kde.org>
-           © 2009-2010 José Manuel Santamaría Lema <panfaust at gmail.com>
+           © 2009-2012 José Manuel Santamaría Lema <panfaust at gmail.com>
            © 2010 Martin Engelmann <murphi.oss at googlemail.com>
 License: GPL-2+
 
@@ -36,52 +35,28 @@ Files: src/widgets/kdatepickerpopup.*
 Copyright: © 2004 Bram Schoenmakers <bramschoenmakers at kde.nl>
 License: LGPL-2+
 
-Files: src/widgets/kratingpainter.*
-Copyright: © 2007-2008 Sebastian Trueg <trueg at kde.org>
-License: LGPL-2+
-
-Files: src/widgets/kratingwidget.*
-Copyright: © 2006-2007 Sebastian Trueg <trueg at kde.org>
-License: LGPL-2+
-
-Files: src/widgets/kreruler.*
-Copyright: © 1998-1999 Reginald Stadlbauer <reggie at kde.org>
-           © 2005 Jason Kivlighn <jkivlighn at gmail.com>
-License: LGPL-2+
-
-Files: src/krepagelayout.*
-Copyright: © 1998-1999 Torben Weis <weis at kde.org>
-           © 2002-2003 David Faure <faure at kde.org>
-           © 2003 Nicolas GOUTTE <goutte at kde.org>
-           © 2005 Jason Kivlighn <jkivlighn at gmail.com>
-License: LGPL-2+
-
-Files: cmake/FindSqlite2.cmake
-Copyright: © 2008 Gilles Caulier <caulier.gilles at gmail.com>
-           © 2009 José Manuel Santamaría Lema <panfaust at gmail.com>
-License: BSD
-
 Files: debian/*
 Copyright: © 2006 Julien Louis <ptitlouis at sysif.net>
            © 2009 Matthias Julius <mdeb at julius-net.net>
            © 2009 José Manuel Santamaría Lema <panfaust at gmail.com>
+           © 2014-2015 Pino Toscano <pino at debian.org>
 License: GPL-2+
- 
+
 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
  (at your option) any later version.
-
+ .
  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.
-
+ .
  You should have received a copy of the GNU General Public License
  along with this package; 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 General
  Public License version 2 can be found in `/usr/share/common-licenses/GPL-2'.
 
@@ -90,17 +65,17 @@ License: LGPL-2+
  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 St, Fifth Floor, Boston,
  MA 02110-1301, USA.
-
+ .
  On Debian GNU/Linux systems, the complete text of the GNU Library General
  Public License version 2 can be found in `/usr/share/common-licenses/LGPL-2'.
 
@@ -109,11 +84,6 @@ License: GFDL-1.2+-NIV
  the terms of the GNU Free Documentation License, Version 1.2 or any later
  version published by the Free Software Foundation; with no Invariant Sections,
  with no Front-Cover Texts, and with no Back-Cover Text.
-
+ .
  On Debian GNU/Linux systems, the complete text of the GNU Library General
  Public License version 2 can be found in `/usr/share/common-licenses/LGPL-2'.
-
-License: BSD
- Redistribution and use is allowed according to the terms of the BSD license.
- For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-

-- 
krecipes packaging

