Merge version 2.2.6-3+rpi1 and 2.2.6-4 to produce 2.2.6-4+rpi1

diff --cc debian/changelog
index 1f9ecfa779b41642dbf493722fcb6ae3393a1204,767b9c2567ebefd488c5b757a12cf12cac2f2fcf..9d0396ff7b058bc1f635b57ffb603741f5903c6c
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,6 -1,17 +1,21 @@@
- vlc (2.2.6-3+rpi1) buster-staging; urgency=medium
++vlc (2.2.6-4+rpi1) buster-staging; urgency=medium
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 20 Jul 2017 00:18:39 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 01 Sep 2017 08:39:30 +0000
++
+ vlc (2.2.6-4) unstable; urgency=medium
+ 
+   * debian/upstream: Add DEP-12 metadata.
+   * debian/control:
+     - Restrict Recommends on vlc-plugin-samba to linux-any kfreebsd-any.
+     - Switch to timgm6mb-soundfont. (Closes: #870790)
+     - Bump Standards-Version.
+   * debian/{rules,control,vlc-plugin-base}: No longer build directfb plugin.
+     directfb upstream is inactive and the plugin got removed for vlc 3.0.
+   * debian/vlc-plugin-base.lintian-overrides: Override
+     shlibs-with-non-pic-code. See lintian overrides of ffmpeg for more
+     details.
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Sat, 12 Aug 2017 12:56:58 +0200
  
  vlc (2.2.6-3) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge