[SCM] kaffeine packaging branch, master, updated. debian/1.2.2-4-12-gf08d237
Pino Toscano
pino at moszumanska.debian.org
Sat Jun 11 09:01:53 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kaffeine.git;a=commitdiff;h=f08d237
The following commit has been merged in the master branch:
commit f08d237094fe1e9f0ec362f744365e38c1640b03
Author: Pino Toscano <pino at debian.org>
Date: Sat Jun 11 11:01:31 2016 +0200
copyright: rewrite to copyright-format 1.0, update
---
debian/changelog | 1 +
debian/copyright | 178 ++++++++++++++++++++++++++-----------------------------
2 files changed, 85 insertions(+), 94 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7056d15..1f495ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,7 @@ kaffeine (2.0.3-0r1) UNRELEASED; urgency=medium
* Add the libdvbv5-dev build dependency (only on Linux), for DVB support.
* Replace the libqt4-sql-sqlite dependency with libqt5sql5-sqlite.
* Link in as-needed mode.
+ * Rewrite copyright to copyright-format 1.0, and update.
-- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org> Wed, 08 Jun 2016 20:25:35 +0200
diff --git a/debian/copyright b/debian/copyright
index ff24dd4..22b1654 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,94 +1,84 @@
-This package was debianized by:
-
- Fathi Boudra <fabo at debian.org> on Wed, 12 Aug 2009 02:23:50 +0200
-
-It was downloaded from:
-
- http://kaffeine.kde.org
-
-Upstream Author:
-
- Christoph Pfister <christophpfister at gmail.com>
-
-Copyright:
-
- Copyright (C) 2007-2010 Christoph Pfister <christophpfister at gmail.com>
-
-Copyright for include/dmx.h file:
-
- Copyright (C) 2000 Marcus Metzler <marcus at convergence.de>
- & Ralph Metzler <ralph at convergence.de>
- for convergence integrated media GmbH
-
-Copyright for include/frontend.h file:
-
- Copyright (C) 2000 Marcus Metzler <marcus at convergence.de>
- Ralph Metzler <ralph at convergence.de>
- Holger Waechtler <holger at convergence.de>
- Andre Draszik <ad at convergence.de>
- for convergence integrated media GmbH
-
-Copyright for icons/* files:
-
- Copyright (C) 2007 The Oxygen Team
-
-Kaffeine is licensed under GPL-2 or any later version:
-
- 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'
- `/usr/share/common-licenses/GPL-3'
-
-Kaffeine include files are licensed under LGPL-2.1 or any later version:
-
- This package 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 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 Lesser 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 Lesser General
-Public License version 2.1 or any later version can be found in:
- `/usr/share/common-licenses/LGPL-2.1'
- `/usr/share/common-licenses/LGPL-3'
-
-Kaffeine icons are licensed under Creative Common Attribution-ShareAlike 3.0
-or LGPL2+:
-
- All icons are copied & hacked from oxygen
- Creative Common Attribution-ShareAlike 3.0 or LGPL2+ (+ clarification)
-
-On Debian systems, the complete text of the GNU Lesser General
-Public License version 2 or any later version can be found in:
- `/usr/share/common-licenses/LGPL-2'
- `/usr/share/common-licenses/LGPL-2.1'
- `/usr/share/common-licenses/LGPL-3'
-
-The Debian packaging is:
-
- Copyright (C) 2009-2010 Fathi Boudra <fabo at debian.org>
-
-and is licensed under the GPL version 2 or any later version,
-see above.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: kaffeine
+Upstream-Contact: Mauro Carvalho Chehab <mchehab at osg.samsung.com>
+Source: https://www.kde.org/applications/multimedia/kaffeine/
+
+Files: *
+Copyright: 2007-2012, Christoph Pfister <christophpfister at gmail.com>
+ 2014, Mauro Carvalho Chehab <mchehab at infradead.org>
+License: GPL-2+
+
+Files: cmake/modules/*
+Copyright: 2011, Michael Jansen <info at michael-jansen.biz>
+ 2016, Pino Toscano <pino at kde.org>
+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: include/*
+Copyright: 2000, Marcus Metzler <marcus at convergence.de>
+ 2000, Ralph Metzler <ralph at convergence.de>
+ 2000, Holger Waechtler <holger at convergence.de>
+ 2000, Andre Draszik <ad at convergence.de>
+License: LGPL-2.1+
+ This program 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 program 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 Lesser General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ .
+ On Debian systems, the complete texts of the GNU Lesser General Public
+ Licenses version 2.1 or any later version can be found in
+ `/usr/share/common-licenses/LGPL-2.1' and `/usr/share/common-licenses/LGPL-3'.
+
+Files: debian/*
+Copyright: 2009-2010 Fathi Boudra <fabo at debian.org>
+ 2016, Pino Toscano <pino at debian.org>
+License: GPL-2+
+
+License: GPL-2+
+ This program 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 program 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 program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ .
+ On Debian systems, the complete texts of the GNU General Public Licenses
+ version 2 and 3 can be found in `/usr/share/common-licenses/GPL-2' and
+ `/usr/share/common-licenses/GPL-3'.
--
kaffeine packaging
More information about the pkg-kde-commits
mailing list