[SCM] audacity/master: Fix licences for RFC files.
mira-guest at users.alioth.debian.org
mira-guest at users.alioth.debian.org
Tue Nov 7 18:18:06 UTC 2017
The following commit has been merged in the master branch:
commit 0267fa36aac6eb2b30b3d145858862e5058fc155
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date: Tue Nov 7 19:17:52 2017 +0100
Fix licences for RFC files.
diff --git a/debian/copyright b/debian/copyright
index 084962a..83ebad4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2088,12 +2088,17 @@ License: Zlib
Files:
lib-src/libogg/doc/rfc3533.txt
+Copyright:
+ 2003 S. Pfeiffer
+License: RFC-3533
+
+Files:
lib-src/libogg/doc/rfc5334.txt
Copyright:
2008 I. Goncalves
- 2003-2008 S. Pfeiffer
+ 2008 S. Pfeiffer
2008 C. Montgomery
-License: RFC
+License: RFC-5334
License: Apache-2.0
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -3143,7 +3148,7 @@ License: Zlib
License: public-domain
This script is in the public domain
-License: RFC
+License: RFC-5334
RFC 5334 is distributed with the following permission:
.
12. Copying Conditions
@@ -3154,23 +3159,14 @@ License: RFC
permission is granted, redistributed modified works do not contain
misleading author, version, name of work, or endorsement information.
RFC 5334 is distributed with the following permission:
- .
- 12. Copying Conditions
- .
- The authors agree to grant third parties the irrevocable right to
- copy, use and distribute the work, with or without modification, in
- any medium, without royalty, provided that, unless separate
- permission is granted, redistributed modified works do not contain
- misleading author, version, name of work, or endorsement information.
- .
- For RFC 3533 the following additional permission is granted:
- .
+
+License: RFC-3533
Received: from mail-vw0-f52.google.com ([209.85.212.52])
- by master.debian.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16)
- (Exim 4.72)
- (envelope-from <silviapfeiffer1 at gmail.com>)
- id 1QsTXr-0004MO-Ek
- for ron at debian.org; Sun, 14 Aug 2011 05:47:35 +0000
+ by master.debian.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16)
+ (Exim 4.72)
+ (envelope-from <silviapfeiffer1 at gmail.com>)
+ id 1QsTXr-0004MO-Ek
+ for ron at debian.org; Sun, 14 Aug 2011 05:47:35 +0000
In-Reply-To: <20110813065417.GV2324 at audi.shelbyville.oz>
References: <20110813065417.GV2324 at audi.shelbyville.oz>
From: Silvia Pfeiffer <silviapfeiffer1 at gmail.com>
@@ -3179,7 +3175,7 @@ License: RFC
Subject: Re: Distributing the libogg RFCs in the Debian package
To: Ron <ron at debian.org>
Cc: Christopher Montgomery <monty at xiph.org>,
- Ivo Emanuel Goncalves <justivo at gmail.com>
+ Ivo Emanuel Goncalves <justivo at gmail.com>
.
Hi Ron,
.
@@ -3196,5 +3192,3 @@ License: RFC
> unless separate permission is granted, redistributed modified
> works do not contain misleading author, version, name of work,
> or endorsement information.
-Comment: please see this link:
- https://tracker.debian.org/media/packages/libo/libogg/copyright-1.3.2-1
--
Audacity debian packaging
More information about the pkg-multimedia-commits
mailing list