Skip to contentSkip to conversation

ffmpeg: fix license file

PATCH New Luca Ceresoli 2 participants 4 messages Oct 2, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 ffmpeg: fix license file

Somewhere between 1.2.7 and 2.3.1 (version bump in bf76f4319131a107) the LICENSE file has been renamed to LICENSE.md, so make legal-info is currently broken. Update to the current file name.

---
 package/ffmpeg/ffmpeg.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/ffmpeg/ffmpeg.mk +1 -1
index b4b2e56..5b7fa20 100644
@@ -10,7 +10,7 @@ FFMPEG_SITE = http://ffmpeg.org/releases
 FFMPEG_INSTALL_STAGING = YES
 
 FFMPEG_LICENSE = LGPLv2.1+, libjpeg license
-FFMPEG_LICENSE_FILES = LICENSE COPYING.LGPLv2.1
+FFMPEG_LICENSE_FILES = LICENSE.md COPYING.LGPLv2.1
 ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y)
 FFMPEG_LICENSE += and GPLv2+
 FFMPEG_LICENSE_FILES += COPYING.GPLv2
Signature · 1 line
1.9.1
#1 lore raw

PATCH 2/3 lttng-babeltrace: fix license information

---
 package/lttng-babeltrace/lttng-babeltrace.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/lttng-babeltrace/lttng-babeltrace.mk +1 -1
index 838f5f6..8183510 100644
@@ -7,7 +7,7 @@
 LTTNG_BABELTRACE_SITE    = http://lttng.org/files/babeltrace
 LTTNG_BABELTRACE_VERSION = 1.2.2
 LTTNG_BABELTRACE_SOURCE  = babeltrace-$(LTTNG_BABELTRACE_VERSION).tar.bz2
-LTTNG_BABELTRACE_LICENSE = MIT; LGPL2.1 for include/babeltrace/list.h; GPLv2+ for test code
+LTTNG_BABELTRACE_LICENSE = MIT; LGPLv2.1 for include/babeltrace/list.h; GPLv2 for test code
 LTTNG_BABELTRACE_LICENSE_FILES = mit-license.txt gpl-2.0.txt LICENSE
 
 LTTNG_BABELTRACE_DEPENDENCIES = popt util-linux libglib2
Signature · 1 line
1.9.1
#2 lore raw

PATCH 3/3 libglade: fix license information

In reply to Luca Ceresoli
---
 package/libglade/libglade.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/libglade/libglade.mk +1 -1
index 55b586c..7bec938 100644
@@ -10,7 +10,7 @@ LIBGLADE_SOURCE = libglade-$(LIBGLADE_VERSION).tar.bz2
 LIBGLADE_SITE = http://ftp.gnome.org/pub/GNOME/sources/libglade/$(LIBGLADE_VERSION_MAJOR)
 LIBGLADE_INSTALL_STAGING = YES
 LIBGLADE_DEPENDENCIES = host-pkgconf libglib2 libgtk2 atk libxml2
-LIBGLADE_LICENSE = LGPLV2+
+LIBGLADE_LICENSE = LGPLv2+
 LIBGLADE_LICENSE_FILES = COPYING
 
 define LIBGLADE_INSTALL_FIX
Signature · 1 line
1.9.1
#3 lore raw

PATCH 1/3 ffmpeg: fix license file

In reply to Luca Ceresoli

Dear Luca Ceresoli,

Quoted 8 lines · Luca Ceresoli

Somewhere between 1.2.7 and 2.3.1 (version bump in bf76f4319131a107) the LICENSE file has been renamed to LICENSE.md, so make legal-info is currently broken. Update to the current file name.

---
 package/ffmpeg/ffmpeg.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

All three patches applied, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com