[Pkg-xmpp-commits] [SCM] Jabber MUC (Multi User Chat) branch, master, updated. bff59b5f8249032d14034b5396f983891c0737b4

Wed May 8 09:12:51 UTC 2013

The following commit has been merged in the master branch:
commit b1e38b4fb600113f8edb151ad35b3996e75a5df6
Author: W. van den Akker <wvdakker at wilsoft.nl>
Date:   Wed May 8 11:09:21 2013 +0200

    Uses new template for the copyright file. Updated maintainer information.

diff --git a/debian/changelog b/debian/changelog
index 348d0fe..9fc1a25 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 jabber-muc (0.8-5) UNRELEASED; urgency=low
 
   * debian/control: modified the VCS-Browser field (removed ;a=summary).
+  * debian/copyright: new format, updated maintainer information.
 
  -- Willem van den Akker <wvdakker at wilsoft.nl>  Tue, 07 May 2013 23:05:00 +0200
 
diff --git a/debian/copyright b/debian/copyright
index 9d7a62d..40fd23f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,45 +1,114 @@
-This package was debianized by Jorge Salamero Sanz <bencer at debian.org> on
-Wed, 15 Apr 2009 15:35:06 +0100.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: jabber-muc
+Source: https://gna.org/projects/mu-conference/
 
-Jamin W. Collins <jcollins at asgardsrealm.net> was the previous maintainer.
+Files: *
+Copyright: Copyright © 1999-2002 Jabber.com, Inc.
+    	   Copyright © 1998-1999 Jeremie Miller
+    	   Copyright © 2003 Paul Curtis <pfc at terrapin.com>
+    	   Copyright © 2002-2005 David Sutton jid: peregrine at legend.net.uk
+    	   Copyright © 2007 Grégoire Menuel jid: mega at im.apinc.org
+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; 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.
 
-It was downloaded from http://download.gna.org/mu-conference/
+Files: src/jabberd/sha.c
+Copyright: 1995-1999 Crypography Research, Inc.
+License: Mozilla Public License Version 1.1
+ The contents of this file are subject to the Mozilla Public
+ License Version 1.1 (the "License"); you may not use this file
+ except in compliance with the License. You may obtain a copy of
+ the License at http://www.mozilla.org/MPL/
+ . 
+ Software distributed under the License is distributed on an "AS
+ IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ implied. See the License for the specific language governing
+ rights and limitations under the License.
 
-Upstream Authors:
+Files: src/jabberd/snprintf.c
+Copyright: 1995-1998 The Apache Group
+License: Apache License Version 1.0
+ 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 above copyright
+    notice, this list of conditions and the following disclaimer. 
+ .
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in
+    the documentation and/or other materials provided with the
+    distribution.
+ .
+ 3. All advertising materials mentioning features or use of this
+    software must display the following acknowledgment:
+    "This product includes software developed by the Apache Group
+    for use in the Apache HTTP server project (http://www.apache.org/)."
+ .
+ 4. The names "Apache Server" and "Apache Group" must not be used to
+    endorse or promote products derived from this software without
+    prior written permission.
+ .
+ 5. Redistributions of any form whatsoever must retain the following
+    acknowledgment:
+    "This product includes software developed by the Apache Group
+    for use in the Apache HTTP server project (http://www.apache.org/)."
+ .
+ THIS SOFTWARE IS PROVIDED BY THE APACHE GROUP ``AS IS'' AND ANY
+ EXPRESSED 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 APACHE GROUP OR
+ ITS CONTRIBUTORS 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.
+ ====================================================================
+ .
+ This software consists of voluntary contributions made by many
+ individuals on behalf of the Apache Group and was originally based
+ on public domain software written at the National Center for
+ Supercomputing Applications, University of Illinois, Urbana-Champaign.
+ For more information on the Apache Group and the Apache HTTP server
+ project, please see <http://www.apache.org/>.
+ .
+ This code is based on, and used with the permission of, the
+ SIO stdio-replacement strx_* functions by Panos Tsirigotis
+ <panos at alumni.cs.colorado.edu> for xinetd.
 
-    David Sutton jid: peregrine at legend.net.uk
-    Grégoire Menuel jid: mega at im.apinc.org
+Files: debian/*
+Copyright: 2002-2007 Jamin W. Collins <jcollins at asgardsrealm.net>
+	   2009-2013 Jorge Salamero Sanz <bencer at debian.org>
+	   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".
 
-Copyright:
-
-    Copyright © 1999-2002 Jabber.com, Inc.
-    Copyright © 1998-1999 Jeremie Miller
-    Copyright © 2003 Paul Curtis <pfc at terrapin.com>
-    Copyright © 2002-2005 David Sutton jid: peregrine at legend.net.uk
-    Copyright © 2007 Grégoire Menuel jid: mega at im.apinc.org
-
-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; 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.
-
-   src/jabberd/sha.c is Mozilla Public License Version 1.1
-   src/jabberd/snprintf.c is Apache License Version 1.0
-
-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 © 2009, Jorge Salamero Sanz <bencer at debian.org>
-and is licensed under the GPL, see `/usr/share/common-licenses/GPL'.

-- 
Jabber MUC (Multi User Chat)

