[Pkg-xmpp-commits] [gsasl] 03/03: Reformat debian/copyright file to follow DEP5.

Simon Josefsson jas-guest at moszumanska.debian.org
Mon Oct 6 13:56:40 UTC 2014


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

jas-guest pushed a commit to branch master
in repository gsasl.

commit 1f9ff7605a65917d6f91a74671e1693002bef535
Author: Simon Josefsson <simon at josefsson.org>
Date:   Mon Oct 6 15:56:29 2014 +0200

    Reformat debian/copyright file to follow DEP5.
---
 debian/changelog |   3 +-
 debian/copyright | 103 ++++++++++++++++++++++++++-----------------------------
 2 files changed, 50 insertions(+), 56 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fd35235..b8039a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 gsasl (1.8.0-6) unstable; urgency=low
 
   * Acknowledge NMU.
+  * Reformat debian/copyright file to follow DEP5.
 
- -- Simon Josefsson <simon at josefsson.org>  Mon, 06 Oct 2014 13:08:47 +0200
+ -- Simon Josefsson <simon at josefsson.org>  Mon, 06 Oct 2014 15:08:47 +0200
 
 gsasl (1.8.0-5.1) unstable; urgency=low
 
diff --git a/debian/copyright b/debian/copyright
index 1c0ed31..a258e9a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,55 +1,48 @@
-This package was debianized by Yvan Bassuel <yvan at brutux.org> on
-Thu, 16 Mar 2006 10:27:26 +0100.
-
-It was downloaded from ftp://ftp.gnu.org/gnu/gsasl
-
-Upstream Author:
-
-    Simon Josefsson <simon at josefsson.org>
-
-Copyright:
-
-    Copyright (c) 2002-2010 Simon Josefsson <simon at josefsson.org>
-    Copyright (c) 1987-2010 Free Software Foundation, Inc. <http://fsf.org/>
-
-License:
-
-The following copyright and license applies to the GNU SASL Library:
-
-This software is copyright (c) 1991-2010 Simon Josefsson and the Free
-Software Foundation, Inc.
-
-You are free to distribute the GNU SASL Library under the terms of the
-GNU Lesser General Public License version 2.1 or later.  On Debian
-systems, the complete text of the GNU Lesser General Public License
-version 2.1 can be found in the file
-`/usr/share/common-licenses/LGPL-2.1'.
-
-=====================================================================
-
-The following copyright and license applies to the GNU SASL
-command-line interface, self-tests and examples:
-
-This software is copyright (c) 1987-2010 Simon Josefsson and the Free
-Software Foundation, Inc.
-
-You are free to distribute the GNU SASL under the terms of the GNU
-General Public License version 3 or later. On Debian systems, the
-complete text of the GNU General Public License version 3 can be found
-in the file `/usr/share/common-licenses/GPL-3'.
-
-=====================================================================
-
-The following copyright and license applies to the GNU SASL manual:
-
-Copyright (c) 2002-2010 Simon Josefsson.
-
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.3 or
-any later version published by the Free Software Foundation; with no
-Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.  On
-Debian systems, the complete text of the GNU Free Documentation
-License version 1.3 can be found in the file
-`/usr/share/common-licenses/GFDL-1.3'.
-
-=====================================================================
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: GNU SASL
+Upstream-Contact: Simon Josefsson <simon at josefsson.org>
+Source: https://www.gnu.org/software/gsasl/
+
+Files: *
+Copyright: Copyright (c) 2002-2010 Simon Josefsson <simon at josefsson.org>
+           Copyright (c) 1987-2010 Free Software Foundation, Inc. <http://fsf.org/>
+License: GPL-3+
+ The following copyright and license applies to the GNU SASL
+ command-line interface, self-tests and examples:
+ .
+ You are free to distribute the GNU SASL under the terms of the GNU
+ General Public License version 3 or later. On Debian systems, the
+ complete text of the GNU General Public License version 3 can be found
+ in the file `/usr/share/common-licenses/GPL-3'.
+
+Files: lib/*
+Copyright: Copyright (c) 2002-2010 Simon Josefsson <simon at josefsson.org>
+           Copyright (c) 1987-2010 Free Software Foundation, Inc. <http://fsf.org/>
+License: LGPL-2+
+ The following copyright and license applies to the GNU SASL Library:
+ .
+ You are free to distribute the GNU SASL Library under the terms of the
+ GNU Lesser General Public License version 2.1 or later.  On Debian
+ systems, the complete text of the GNU Lesser General Public License
+ version 2.1 can be found in the file
+ `/usr/share/common-licenses/LGPL-2.1'.
+
+Files: doc/gsasl.texi
+Copyright: Copyright (c) 2002-2010 Simon Josefsson.
+License: GFDL-1.3+
+ The following copyright and license applies to the GNU SASL manual:
+ .
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the GNU Free Documentation License, Version 1.3 or
+ any later version published by the Free Software Foundation; with no
+ Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.  On
+ Debian systems, the complete text of the GNU Free Documentation
+ License version 1.3 can be found in the file
+ `/usr/share/common-licenses/GFDL-1.3'.
+
+Files: debian/*
+Copyright: Copyright (c) 2006 Yvan Bassuel <yvan at brutux.org>
+           Copyright (c) 2014 Simon Josefsson <simon at josefsson.org>
+License: other
+ Work done by Simon Josefsson is offered under GPL-3+.
+ License on work done by Yvan Bassuel was not clear from the old copyright file.

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



More information about the Pkg-xmpp-commits mailing list