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

diff --cc debian/changelog
index 9d0396ff7b058bc1f635b57ffb603741f5903c6c,056f484bc01eebfb9d60a6f3264ca87ac33cb1e1..76c37a24abb2454d4342b5c1d652f82b4274291b
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,6 -1,9 +1,13 @@@
- vlc (2.2.6-4+rpi1) buster-staging; urgency=medium
++vlc (2.2.6-5+rpi1) buster-staging; urgency=medium
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 01 Sep 2017 08:39:30 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 05 Sep 2017 12:08:58 +0000
++
+ vlc (2.2.6-5) unstable; urgency=medium
+ 
+   * debian/control: Bump Standards-Version.
+   * debian/patches: Add support for libupnp 1.8. (Closes: #868936)
+ 
+  -- Sebastian Ramacher <sramacher@debian.org>  Wed, 30 Aug 2017 20:57:06 +0200
  
  vlc (2.2.6-4) unstable; urgency=medium
  

diff --cc debian/control
Simple merge