[SCM] zeroconf-ioslave packaging branch, master, updated. fc0a0217b098ddb6c84a58956297a57d965a8320

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/zeroconf-ioslave.git;a=commitdiff;h=2d0c71d

The following commit has been merged in the master branch:
commit 2d0c71d903acd59d667b9342e8cfb4b97b747fff
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Feb 24 15:57:33 2015 +0100

    Update copyright information.
---
 debian/changelog |   1 +
 debian/copyright | 107 +++++++++++++++++++++++++++++--------------------------
 2 files changed, 58 insertions(+), 50 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3b8ad22..f9a9d63 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ zeroconf-ioslave (4:14.12.2-1~) UNRELEASED; urgency=medium
 
   * Prepare initial Debian release.
   * Bump Standards-Version to 3.9.6, no changes needed.
+  * Update copyright information.
 
  -- Maximiliano Curia <maxy at debian.org>  Tue, 24 Feb 2015 15:49:34 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 19631e2..b1710a2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,50 +1,57 @@
-This package was package by Jonathan Riddell <jriddell at ubuntu.com> on
-Tue, 18 Jun 2013 15:03:18 +0100.
-
-It was downloaded from http://www.kde.org/download
-
-Copyright:
-    2009 Friedrich W. H. Kossebau
-    2004, 2005 Jakub Stachowski <qbast at go2.pl>
-
-License:
-ioslave/ is
-    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.
-
-The full text of the GNU General Public License version 2 is available on
-Debian systems in /usr/share/common-licenses/GPL-2.
-
-kdedmodules/ is
-   This library is free software; you can redistribute it and/or
-   modify it under the terms of the GNU Library General Public
-   License version 2 as published by the Free Software Foundation.
-
-   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.
-
-The full text of the GNU Library General Public License version 2 is available on
-Debian systems in /usr/share/common-licenses/LGPL-2.
-
-The packaging is © 2013 Jonathan Riddell and
-is licensed under the GPL version 2 or later, see `/usr/share/common-licenses/GPL'.
-
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: zeroconf-ioslave
+Source: git://anongit.kde.org/zeroconf-ioslave
+
+Files: *
+Copyright: 1989-1991, Free Software Foundation, Inc
+           2009, Friedrich W. H. Kossebau
+           2004-2005, Jakub Stachowski
+License: GPL-2+
+
+Files: kdedmodule/dnssdwatcher.cpp
+       kdedmodule/dnssdwatcher.h
+       kdedmodule/watcher.cpp
+       kdedmodule/watcher.h
+Copyright: 2004, Jakub Stachowski <qbast at go2.pl>
+License: LGPL-2
+
+Files: debian/*
+Copyright: 2013, Jonathan Riddell
+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.
+ .
+ The full text of the GNU General Public License version 2 is available on
+ Debian systems in `/usr/share/common-licenses/GPL-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 version 2 as published by the Free Software Foundation.
+ .
+ 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.
+ .
+ The full text of the GNU Library General Public License version 2 is
+ available on Debian systems in /usr/share/common-licenses/LGPL-2.

-- 
zeroconf-ioslave packaging