[Pkg-cyrus-sasl2-commits] [cyrus-sasl2] 35/44: Update and fix d/copyright after major d/ rewrite

[Ondřej Surý]

This is an automated email from the git hooks/post-receive script.

ondrej pushed a commit to branch master
in repository cyrus-sasl2.

commit 646628d33fa318822e26f06033925685abf03b85
Author: Ondřej Surý <ondrej at sury.org>
Date:   Tue Oct 25 18:04:27 2016 +0200

    Update and fix d/copyright after major d/ rewrite
---
 debian/copyright | 66 ++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 40 insertions(+), 26 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 530fb18..881d0cd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,48 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Cyrus SASL
-Source: ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/
+Source: ftp://ftp.cyrusimap.org/cyrus-sasl/
 
 Files: *
 Copyright: 1998-2003, Carnegie Mellon University
 License: BSD-4-clause
+
+Files: debian/*
+Copyright: 2002-2004, Dima Barsky <dima at debian.org>
+           2006-2009, Fabian Fagerholm <fabbe at debian.org>
+           2006-2011, 2014, Roberto C. Sanchez <roberto at connexer.com>
+	   2015-2016 Ondřej Surý <ondrej at debian.org>
+License: GPL-3+
+
+Files: debian/saslfinger/*
+Copyright: 2004, Patrick Koetter <p at state-of-mind.de>
+License: GPL-3+
+Comment: The saslfinger utility was downloaded from
+ http://postfix.state-of-mind.de/patrick.koetter/saslfinger/
+
+Files: debian/gen-auth/*
+Copyright: 2002-2006, John Jetmore <jj33 at pobox.com>
+License: GPL-3+
+Comment: The gen-auth utility was downloaded from
+ http://jetmore.org/john/code/gen-auth
+
+License: GPL-3+
+ 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 3 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, see <http://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the full text of the GNU General Public License
+ version 3 can be found in the file `/usr/share/common-licenses/GPL-3'.
+
+License: BSD-4-clause
  /*
   * Copyright (c) 1998-2003 Carnegie Mellon University.  All rights reserved.
   *
@@ -44,27 +82,3 @@ License: BSD-4-clause
   * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
   * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   */
-
-Files: debian/*
-Copyright: 2002-2004, Dima Barsky <dima at debian.org>
-           2006-2009, Fabian Fagerholm <fabbe at debian.org>
-           2006-2011, 2014, Roberto C. Sanchez <roberto at connexer.com>
-License: GPL-2+ or BSD-2-clause
-  On Debian systems, the complete text of the GNU General Public License,
-  version 2, can be found in /usr/share/common-licenses/GPL-2.
-
-Files: debian/saslfinger/*
-Copyright: 2004, Patrick Koetter <p at state-of-mind.de>
-License: GPL-3+
-  On Debian systems, the complete text of the GNU General Public License,
-  version 3, can be found in /usr/share/common-licenses/GPL-3.
-Comment: The saslfinger utility was downloaded from
- http://postfix.state-of-mind.de/patrick.koetter/saslfinger/
-
-Files: debian/gen-auth/*
-Copyright: 2002-2006, John Jetmore <jj33 at pobox.com>
-License: GPL-3+
-  On Debian systems, the complete text of the GNU General Public License,
-  version 2, can be found in /usr/share/common-licenses/GPL-2.
-Comment: The gen-auth utility was downloaded from
- http://jetmore.org/john/code/gen-auth

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cyrus-sasl2/cyrus-sasl2.git