[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 c875b500700855730b2d27ec05940ed4a5665acf
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed Jun 1 19:52:11 2016 +0200

    Removed, included upstream

diff --git a/debian/patches/series b/debian/patches/series
index 397ce85..5795426 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-zsh-completion.patch
 fix-translation.patch
 drop-check-qt-check.patch
 the-Hurd-also-uses-the-.so-extension-for-libraries.patch
diff --git a/debian/patches/zsh-completion.patch b/debian/patches/zsh-completion.patch
deleted file mode 100644
index 1a6c6b5..0000000
--- a/debian/patches/zsh-completion.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Fix zsh completion
-Origin: upstream,
- https://git.videolan.org/?p=vlc.git;a=commit;h=32796b8960efb2421fdb79a46834dad5af1eadc0,
- https://git.videolan.org/?p=vlc.git;a=commit;h=c85a2dd8a43e5036614a6a1998a9cddb6c28ca05
-
---- vlc-2.2.2.orig/extras/analyser/zsh.cpp
-+++ vlc-2.2.2/extras/analyser/zsh.cpp
-@@ -221,7 +221,7 @@ static void ParseModule(const module_t *
- 
- int main(int argc, const char **argv)
- {
--    libvlc_instance_t *libvlc = libvlc_new(argc, argv);
-+    libvlc_instance_t *libvlc = libvlc_new(argc - 1, argv + 1);
-     if (!libvlc)
-         return 1;
- 
-@@ -235,9 +235,9 @@ int main(int argc, const char **argv)
-     module_t **max = &mod_list[modules];
- 
-     puts("#compdef vlc cvlc rvlc svlc mvlc qvlc nvlc\n"
--           "#This file is autogenerated by zsh.cpp"
--           "typeset -A opt_args"
--           "local context state line ret=1"
-+           "#This file is autogenerated by zsh.cpp\n"
-+           "typeset -A opt_args\n"
-+           "local context state line ret=1\n"
-            "local modules\n");
- 
-     printf("vlc_modules=\"");

-- 
VLC media player packaging



More information about the pkg-multimedia-commits mailing list