[SCM] libav/experimental: Fix add Comment pseudo-fields references to shared LGPL and GPL files. Drop superfluous License pseudo-field for Apache-2.0.

js at users.alioth.debian.org js at users.alioth.debian.org
Wed Jan 2 19:54:33 UTC 2013


The following commit has been merged in the experimental branch:
commit 74bbad53d8e50e9888652ee4dd2d0ebb30347656
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Wed Jan 2 20:54:28 2013 +0100

    Fix add Comment pseudo-fields references to shared LGPL and GPL files. Drop superfluous License pseudo-field for Apache-2.0.

diff --git a/debian/copyright b/debian/copyright
index 1002fde..addc9ae 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -357,6 +357,15 @@ License: LGPL-2.1+~Libav
  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
  License for more details.
+ .
+ Comment:
+ .
+ On Debian systems the 'GNU Lesser General Public License' version 2.1
+ is located in '/usr/share/common-licenses/LGPL-2.1'.
+ .
+ You should have received a copy of the 'GNU Lesser General Public
+ License' along with this program.  If not, see
+ <http://www.gnu.org/licenses/>.
 
 License: GPL-2+~Libav
  Libav is free software; you can redistribute it and/or modify it under
@@ -368,6 +377,14 @@ License: GPL-2+~Libav
  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
  for more details.
+ .
+ Comment:
+ .
+ On Debian systems the 'GNU General Public License' version 2 is located
+ in '/usr/share/common-licenses/GPL-2'.
+ .
+ You should have received a copy of the 'GNU General Public License'
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 License: GPL-2+~GCC
  GNU CC is free software; you can redistribute it and/or modify it under
@@ -381,8 +398,6 @@ License: GPL-2+~GCC
  for more details.
 
 License: Apache-2.0
- License:
- .
  Licensed under the Apache License v2.0
  .
  http://www.apache.org/licenses/LICENSE-2.0

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list