[SCM] KTorrent Debian packaging. branch, master, updated. debian/4.0-beta2-1-18-gd9b534f

Modestas Vainius modax at alioth.debian.org
Tue May 25 08:15:46 UTC 2010


The following commit has been merged in the master branch:
commit 33cd00e0f556c1a0accaee01fbce7ebb60f143c2
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Tue May 25 03:09:58 2010 +0300

    Drop extra debian/copyright.* files.
    
    No longer used in the workflow.
---
 debian/changelog          |    1 +
 debian/copyright.in       |   28 -----------
 debian/copyright.licenses |  106 -------------------------------------------
 debian/copyright.po       |  110 ---------------------------------------------
 debian/copyright.source   |   24 ----------
 5 files changed, 1 insertions(+), 268 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d4158a0..4f67091 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,7 @@ ktorrent (4.0.0-0r1) UNRELEASED; urgency=low
   * Drop topgit support from debian/rules.
   * Rewrite debian/README.source: no more topgit.
   * Drop all patches. They have been applied upstream.
+  * Drop extra debian/copyright.* files. No longer used in the workflow.
 
  -- Modestas Vainius <modax at debian.org>  Sat, 08 May 2010 18:23:59 +0300
 
diff --git a/debian/copyright.in b/debian/copyright.in
deleted file mode 100644
index 10cdc9a..0000000
--- a/debian/copyright.in
+++ /dev/null
@@ -1,28 +0,0 @@
-This package was debianized by Joel Johnson <mrjoel at lixil.net> on
-Tue, 21 Jun 2005 11:19:46 -0700.
-This package has been maintained by Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
-since Thu, 10 May 2007 13:11:35 +0300
-
-The original source was downloaded from 
-http://ktorrent.org/index.php?page=downloads
-
-Upstream Authors:
-  Joris Guisson <joris.guisson at gmail.com>
-  Ivan Vasic <ivasic at gmail.com>
-
-Upstream copyright holders:
-
-[copyright.source]
-
-Translators (po/*):
-
-[copyright.po]
-
-Debian packaging (debian/*) is under:
-
-Copyright: © 2005-2007 Joel Johnson <mrjoel at lixil.net>
-           © 2007-2008 Modestas Vainius <modestas at vainius.eu>
-           © Joey Hess <joeyh at debian.org> (debhelper scripts)
-License:   GPL-2+
-
-[copyright.licenses]
diff --git a/debian/copyright.licenses b/debian/copyright.licenses
deleted file mode 100644
index 13cd60f..0000000
--- a/debian/copyright.licenses
+++ /dev/null
@@ -1,106 +0,0 @@
-License for all components unless stated otherwise:
---
-  GNU General Public License, version 2 or later (GPL-2+)
-
-  On Debian systems, the complete text of the
-  GNU General Public License version 2 can be found in
-  /usr/share/common-licenses/GPL-2
---
-
-Other used licenses:
---
-  GNU General Public License, version 3 or later (GPL-3+)
-    23 file(s) are licensed under this license:
-
-    plugins/bitfinder/*
-    plugins/bitfinder/filter/*
-    plugins/bitfinder/source/*
-
-  On Debian systems, the complete text of the
-  GNU General Public License version 3 can be found in
-  /usr/share/common-licenses/GPL-3
---
-
---
-  GNU Lesser General Public License, version 2.1 or later (LGPL-2.1+)
-    1 file(s) are licensed under this license:
-
-    + plugins/webinterface/www/default/wz_tooltip.js
-
-  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
---
-
---
-  GNU Library General Public License, version 2 or later (LGPL-2+)
-    3 file(s) are licensed under this license:
-
-    + libbtcore/btcore_export.h
-    + libktcore/ktcore_export.h
-    + libktupnp/ktupnp_export.h
-
-  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
---
-
---
-    + libbtcore/util/win32.cpp
-    + libbtcore/util/win32.h
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-  SOFTWARE.
---
-
---
-    cmake/modules/*
-    + libbtcore/config-btcore.h.cmake
-
-  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.
---
-
---
-  BSD License
-
-    + plugins/webinterface/common/sha1.js
-
-  On Debian systems, the complete text of the BSD License can be found in
-  /usr/share/common-licenses/BSD
---
diff --git a/debian/copyright.po b/debian/copyright.po
deleted file mode 100644
index a60b3f8..0000000
--- a/debian/copyright.po
+++ /dev/null
@@ -1,110 +0,0 @@
-----------------------------------------------------------------------
---                  Short Copyright Holders Report                  --
---          (104 holders out of 124 copyright statements)          --
-----------------------------------------------------------------------
-
-Copyright: © 2006-2008 Jannick Kuhr <jannick.kuhr at kdemail.net> <jakuhr-linux at gmx.de> <opensource at kuhr.org> <jannick.kuhr at gmx.de>
-Copyright: © 2008 Viesturs Zarins <viesturs.zarins at mii.lu.lv> <viesturs.zarins at algorego.com>
-Copyright: © 2006 Xavier Batlle i Pèlach <tevibp at wanadoo.es> <tevi at eltercer.cat>
-Copyright: © 2006 Canonical Ltd
-Copyright: © 2007-2008 Spiros Georgaras <sng at hellug.gr> <sngeorgaras at otenet.gr>
-Copyright: © 2007-2008 Serdar Soytetir <tulliana at gmail.com>
-Copyright: © 2005-2008 Stefan Asserhäll <stefan.asserhall at comhem.se>
-Copyright: © 2002-2008 Free Software Foundation Inc.
-Copyright: © 2005-2008 Nicola Ruggero <nixprog.adsl at tiscali.it> <nicola at nxnt.org>
-Copyright: © 2005 Waldemar Silva Júnior <wsjunior at kdemail.net>
-Copyright: © 2005-2008 Enrique Matias Sanchez (aka Quique) <cronopios at gmail.com>
-Copyright: © 2005-2008 Marek Laane <bald at starman.ee> <bald at smail.ee>
-Copyright: © 2007-2008 Nick Shaforostoff <shaforostoff at kde.ru> <shafff at ukr.net>
-Copyright: © 2008 Martin Schlander <suse at linuxin.dk> <mschlander at opensuse.org>
-Copyright: © 2005-2008 Rinse de Vries <rinsedevries at kde.nl> <RinseDeVries at home.nl>
-Copyright: © 2007-2008 mvillarino <mvillarino at users.sourceforge.net> <mvillarino at gmail.com>
-Copyright: © 2008 Freek de Kruijf <f.de.kruijf at hetnet.nl> <freek at opensuse.org>
-Copyright: © 2006 Danny Kukawka <danny.kukawka at web.de>
-Copyright: © 2008 Auk Piseth <piseth_dv at khmeros.info>
-Copyright: © 2007 Václav Čermák <vaclav.cermak at gmail.com>
-Copyright: © 2008 Mickael Sibelle <kimael at gmail.com>
-Copyright: © 2008 Madsen <jan.madsen.pt at gmail.com>
-Copyright: © 2008 Luiz Fernando Ranghetti <elchevive at opensuse.org>
-Copyright: © 2005 Maarten Rütten <maartenrutten at kde.nl>
-Copyright: © 2008 Ivan Petrouchtchak <fr.ivan at ukrainian-orthodox.org>
-Copyright: ©  Najib Zulon Idrissi Katouni <ZulonZ at gmail.com>
-Copyright: © 2005 Златко Попов <zlatkopopov at fsa-bg.org>
-Copyright: © 2006, 2008 Manfred Wiese <m.j.wiese at web.de>
-Copyright: © 2008 Jure Repinc <jlp at holodeck1.com>
-Copyright: © 2007-2008 Jerzy Trzeciak <artusek at wp.pl>
-Copyright: ©  Thomas 'Dark-Side' Refis <refis.thomas at gmail.com>
-Copyright: © 2007 Brendan Osborne <danborne.kde at gmail.com>
-Copyright: © 2008 Cristian Tarsoaga <cristian.tarsoaga at gmail.com>
-Copyright: © 2007-2008 Karl Ove Hufthammer <karl at huftis.org>
-Copyright: © 2005-2006, 2008 Bram Schoenmakers <bramschoenmakers at kde.nl>
-Copyright: ©  Pierre "delroth" Bourdon <delroth at gmail.com>
-Copyright: © 2007-2008 Sébastien Renard <Sebastien.Renard at digitalfox.org>
-Copyright: © 2008 Evgeniy Ivanov <powerfox at kde.ru>
-Copyright: © 2007-2008 Andrius Štikonas <stikonas at gmail.com>
-Copyright: ©  Kevin "Katen" Soltysiak <nightroad.katen at gmail.com>
-Copyright: © 2007 Youssef Chahibi <chahibi at gmail.com>
-Copyright: ©  Quentin "Cygal" Pradet <moi at cygal.info>
-Copyright: © 2005 Barış Metin <baris at uludag.org.tr>
-Copyright: © 2008 Maris Nartiss <maris.kde at gmail.com>
-Copyright: © 2008 Anne-Marie Mahfouf <annemarie.mahfouf at free.fr>
-Copyright: © 2008 Sergiu Bivol <sergiu at ase.md>
-Copyright: © 2006-2008 Martijn van Vliet <mvanvliet at gmail.com>
-Copyright: © 2008 Franklin Weng <franklin at mail.everfocus.com.tw>
-Copyright: © 2006 Engin Çağatay <engincagatay at yahoo.com>
-Copyright: © 2008 Vit Pelcak <vit at pelcak.org>
-Copyright: © 2005-2006 Klara Cihlarova <koty at seznam.cz>
-Copyright: © 2008 Erdal Ronahi <erdal.ronahi at gmail.com>
-Copyright: © 2006 Marcos Goienetxe <marcos at euskalgnu.org>
-Copyright: © 2005 Joris Guisson <joris.guisson at gmail.com>
-Copyright: © 2007 Richard Fric <Richard.Fric at kdemail.net>
-Copyright: © 2007-2008 Benoit Verduyn <benoit.verduyn at videotron.ca>
-Copyright: © 2007-2008 Toussis Manolis <manolis at koppermind.homelinux.org>
-Copyright: © 2007 Akın Ömeroğlu <akin at omeroglu.net>
-Copyright: © 2005 Lukáš Tinkl <lukas at kde.org>
-Copyright: © 2008 Marta Rybczyńska <kde-i18n at rybczynska.net>
-Copyright: © 2006-2008 Sönke Dibbern <s_dibbern at web.de>
-Copyright: © 2008 Frank Weng (a.k.a. Franklin) <franklin at goodhorse.idv.tw>
-Copyright: © 2008 Alexander Nicolaysen Sørnes <alex at thehandofagony.com>
-Copyright: © 2008 Artem Sereda <overmind88 at gmail.com>
-Copyright: © 2007 Darafei Praliaskouski <komzpa at licei2.com>
-Copyright: © 2008 Dobrovolny <dobrovolnyh at seznam.cz>
-Copyright: © 2007 Everest Law <tyuuuu2001 at yahoo.com.hk>
-Copyright: © 2008 Nicolas Ternisien <nicolas.ternisien at gmail.com>
-Copyright: © 2008 Tamas Szanto <tszanto at interware.hu>
-Copyright: © 2007 Markus Hietaranta <markus.hietaranta at gmail.com>
-Copyright: © 2007-2008 Jaime Robles <jaime at kde.org>
-Copyright: © 2005-2006 Patrick Trettenbrein <patrick.trettenbrein at kdemail.net>
-Copyright: © 2006 Ion Gaztañaga <igaztanaga at gmail.com>
-Copyright: © 2007 Donatas Glodenis <dgvirtual at akl.lt>
-Copyright: © 2008 Yuri Chornoivan <yurchor at ukr.net>
-Copyright: © 2005-2007 Zlatko Popov <zlatkopopov at fsa-bg.org>
-Copyright: © 2007 doutor.zero <doutor.zero at gmail.com>
-Copyright: ©  Gabriel "bluestorm" Scherer <bluestorm.dylc at gmail.com>
-Copyright: © 2008 Marce Villarino <mvillarino at users.sourceforge.net>
-Copyright: ©  Simon "asmanur" Castellan <asmanur at gmail.com>
-Copyright: © 2008 George Pantsis <gpantsis at gmail.com>
-Copyright: © 2008 Goodhorse <franklin at goodhorse.idv.tw>
-Copyright: © 2008 Khoem Sokhem <khoemsokhem at khmeros.info>
-Copyright: © 2007-2008 Hu Wei <contact at chaostone.com>
-Copyright: © 2007 Klára Cihlářová <koty at seznam.cz>
-Copyright: © 2008 Ravishankar Shrivastava <raviratlami at yahoo.com>
-Copyright: © 2007-2008 Xavier Batlle Pelach <tevi at eltercer.cat>
-Copyright: © 2005-2008 Thomas Reitelbach <tr at erdfunkstelle.de>
-Copyright: ©  Grégoire "Metzgermeister" Duchêne <duchene.g at gmail.com>
-Copyright: © 2007 Marek Stopka <marekstopka at gmail.com>
-Copyright: © 2005-2008 Yukiko Bando <ybando at k6.dion.ne.jp>
-Copyright: © 2008 Eirik U. Birkeland <eirbir at gmail.com>
-Copyright: © 2006 Hasso Tepper <hasso at kde.org>
-Copyright: © 2007-2008 Cindy McKee <cfmckee at gmail.com>
-Copyright: © 2006, 2008 Josep Ma. Ferrer <txemaq at gmail.com>
-Copyright: © 2005 sejishikong <sejishikong at 263.net>
-Copyright: ©  Laurențiu Buzdugan <lbuz at rolix.org>
-Copyright: © 2005 Stephan Johach <hunsum at gmx.de>
-Copyright: © 2005-09-23 Funda Wang <fundawang at linux.net.cn>
-Copyright: © 2007-2008 Yannig Marchegay <yannig at marchegay.org>
-Copyright: © 2008 Eng Vannak <evannak at khmeros.info>
-Copyright: © 2005 Pablo de Vicente <pablo.devicente at gmail.com>
-Copyright: © 2008 Ni Hui <shuizhuyuanluo at 126.com>
-
-
diff --git a/debian/copyright.source b/debian/copyright.source
deleted file mode 100644
index d034b1c..0000000
--- a/debian/copyright.source
+++ /dev/null
@@ -1,24 +0,0 @@
-----------------------------------------------------------------------
---                  Short Copyright Holders Report                  --
---           (18 holders out of 932 copyright statements)           --
-----------------------------------------------------------------------
-
-Copyright: © 2005-2008 Joris Guisson <joris.guisson at gmail.com>
-Copyright: © 2005-2008 Ivan Vasic <ivasic at gmail.com>
-Copyright: © 2008 Alan Jones <skyphyr at gmail.com>
-Copyright: © 2007 Krzysztof Kundzicz <athantor at gmail.com>
-Copyright: © 2006 Diego R. Brogna <dierbro at gmail.com>
-Copyright: © 2007 David Faure <faure at kde.org>
-Copyright: © 2006 Juliusz Chroboczek.
-Copyright: © 2005 Adam Treat <treat at kde.org>
-Copyright: © 2002-2005, 2007 Walter Zorn. All Rights Reserved.
-Copyright: © 2007 Modestas Vainius <modestas at vainius.eu>
-Copyright: © 2005-2007 Vincent Wagelaar <vincent at ricardis.tudelft.nl>
-Copyright: © 2006 Dan Kennedy.
-Copyright: © 2000-2002 Andrew Kepert
-Copyright: © 2007 Charles Connell <charles at connells.org>
-Copyright: © 2005 Maggioni Marcello <marcello.maggioni at gmail.com>
-Copyright: © 2007 Dagur Valberg Johannsson
-Copyright: © 2000-2002 Paul Johnston
-
-

-- 
KTorrent Debian packaging.



More information about the pkg-kde-commits mailing list