[SCM] vlc/master: Removed, included upstream
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Wed Jun 1 17:58:36 UTC 2016
The following commit has been merged in the master branch:
commit cd5801f5b518ef8b4fad94ff2375b05272bf9115
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Wed Jun 1 19:50:23 2016 +0200
Removed, included upstream
diff --git a/debian/patches/frenchtv-links.patch b/debian/patches/frenchtv-links.patch
deleted file mode 100644
index fe6ed2b..0000000
--- a/debian/patches/frenchtv-links.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Fix links to French TV icons
-Origin: uptream,
- https://git.videolan.org/?p=vlc.git;a=commit;h=5bcaf6c90585d6d37263bfa7ad77a31eb2996048
-
---- vlc-2.2.0~rc2.orig/share/lua/meta/art/02_frenchtv.lua
-+++ vlc-2.2.0~rc2/share/lua/meta/art/02_frenchtv.lua
-@@ -38,11 +38,11 @@ function fetch_art()
- ["W9"] = "http://cyril.bourreau.free.fr/Vectoriel/W9.png",
-
- ["Arte"] = "http://www.artepro.com/fr_fichiers/upload/10594.jpg",
-- ["TMC"] = "http://upload.wikimedia.org/wikipedia/fr/4/4b/Logo_de_TMC.gif",
-- ["i> TELE"] = "http://upload.wikimedia.org/wikipedia/fr/5/56/Logo_I_tele.png",
-- ["BFM TV"] = "http://upload.wikimedia.org/wikipedia/fr/3/30/Bfm_tv.jpg",
-+ ["TMC"] = "http://upload.wikimedia.org/wikipedia/fr/2/2e/TMC_new.svg",
-+ ["i> TELE"] = "http://upload.wikimedia.org/wikipedia/commons/a/a6/Logo_i_TELE_2013.png",
-+ ["BFM TV"] = "http://upload.wikimedia.org/wikipedia/fr/c/c9/BFMTV_HD.png",
- ["Virgin 17"] = "http://upload.wikimedia.org/wikipedia/fr/3/39/Virgin17logo.png",
-- ["La Chaîne Parlementaire"] = "http://upload.wikimedia.org/wikipedia/fr/9/98/Public-Senat-LCP-An_logo_2010.png"
-+ ["La Chaîne Parlementaire"] = "http://upload.wikimedia.org/wikipedia/fr/1/1f/LCP-Public_Senat_logo.png"
- }
- local meta = vlc.item:metas();
- local channel
diff --git a/debian/patches/series b/debian/patches/series
index d5b0a99..77b237d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-frenchtv-links.patch
zsh-completion.patch
fix-translation.patch
drop-check-qt-check.patch
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list