[Pkg-xmpp-commits] [SCM] Jabberd2 XMPP server branch, master, updated. upstream/2.2.17-33-g916b16f

[W. van den Akker]

The following commit has been merged in the master branch:
commit 46fa6c229e22a16ae5c2bb12bd2efec9048a58b7
Author: W. van den Akker <wvdakker at wilsoft.nl>
Date:   Tue May 7 22:10:32 2013 +0200

    New format copyright file, updated maintainer information.

diff --git a/debian/changelog b/debian/changelog
index 406ba79..fe73065 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ jabberd2 (2.2.17-2) UNRELEASED; urgency=low
   * Corrected typo in changelog.
   * debian/prerm: removed because not needed.
   * debian/control: moved adduser from Depends to Pre-Depends.
+  * debian/copyright: new format, updated maintainer information.
 
  -- Willem van den Akker <wvdakker at wilsoft.nl>  Tue, 07 May 2013 21:34:22 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 33ee0a9..4081ad7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,48 +1,47 @@
-This package was debianized by Jorge Salamero Sanz <bencer at debian.org> on
-Fri, 13 Jul 2007 17:32:28 +0000.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: jabberd2
+Source: http://jabberd2.org/
+
+Files: *
+Copyright: Copyright (C) 2002-2004 Ryan Eatmon <reatmon at jabber.org>
+    	   Copyright (C) 2002-2004 Jeremie Miller <jeremie at jabber.org>
+    	   Copyright (C) 2002-2004 Thomas Muldowney <temas at jabber.org>
+    	   Copyright (C) 2002-2004 Robert Norris <rob at cataclysm.cx>
+
+License: GNU General Public License version 2 dated June, 1991.
+ 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; version 2 dated June, 1991.
+ .
+ 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.
+ .
+ As a special exception, the authors give permission to link this program
+ with the OpenSSL library and distribute the resulting binary.
+
+Files: debian/*
+Copyright: 2013 Willem van den Akker <wvdakker at wilsoft.nl>
+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 program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
-Jamin W. Collins <jcollins at asgardsrealm.net> was the previous maintainer.
-
-It was downloaded from http://jabberd2.xiaoka.com/
-
-Upstream Authors: 
-
-    Ryan Eatmon <reatmon at jabber.org>
-    Jeremie Miller <jeremie at jabber.org>
-    Thomas Muldowney <temas at jabber.org>
-    Robert Norris <rob at cataclysm.cx>
-    Stephen Marquard <xmpp:scm at jabber.org>
-    Tomasz Sterna <xmpp:smoku at xiaoka.com>
-    and others, see AUTHORS
-
-Copyright: 
-
-    Copyright (C) 2002-2004 Ryan Eatmon <reatmon at jabber.org>
-    Copyright (C) 2002-2004 Jeremie Miller <jeremie at jabber.org>
-    Copyright (C) 2002-2004 Thomas Muldowney <temas at jabber.org>
-    Copyright (C) 2002-2004 Robert Norris <rob at cataclysm.cx>
-
-License:
-
-   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; version 2 dated June, 1991.
-
-   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.
-
-   As a special exception, the authors give permission to link this program
-   with the OpenSSL library and distribute the resulting binary.
-
-On Debian systems, the complete text of the GNU General Public License
-can be found in the file `/usr/share/common-licenses/GPL-2'.
-
-The Debian packaging is (C) 2007, Jorge Salamero Sanz <bencer at debian.org>
-and is licensed under the GPL, see `/usr/share/common-licenses/GPL-3'.

-- 
Jabberd2 XMPP server