diff -Nru vlc-2.2.6/debian/changelog vlc-2.2.6/debian/changelog
--- vlc-2.2.6/debian/changelog	2017-07-11 19:35:32.000000000 +0000
+++ vlc-2.2.6/debian/changelog	2017-07-20 00:18:39.000000000 +0000
@@ -1,3 +1,7 @@
+vlc (2.2.6-3+rpi1) buster-staging; urgency=medium
+
+ -- Raspbian forward porter <root@raspbian.org>  Thu, 20 Jul 2017 00:18:39 +0000
+
 vlc (2.2.6-3) unstable; urgency=medium
 
   [ Mateusz Łukasik ]
@@ -9,6 +13,13 @@
 
  -- Sebastian Ramacher <sramacher@debian.org>  Tue, 11 Jul 2017 21:35:32 +0200
 
+vlc (2.2.6-2+rpi1) buster-staging; urgency=medium
+
+  [changes brought forward from 2.2.6-1~deb9u1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 01 Jun 2017 15:47:33 +0000]
+  * Version build-dependency on libsndio-dev so libroar-dev will not satisfy it.
+
+ -- Raspbian forward porter <root@raspbian.org>  Sat, 01 Jul 2017 23:31:17 +0000
+
 vlc (2.2.6-2) unstable; urgency=medium
 
   * Upload to unstable.
diff -Nru vlc-2.2.6/debian/control vlc-2.2.6/debian/control
--- vlc-2.2.6/debian/control	2017-07-11 18:25:20.000000000 +0000
+++ vlc-2.2.6/debian/control	2017-07-20 00:18:38.000000000 +0000
@@ -78,7 +78,7 @@
                libshout3-dev,
                libsidplay2-dev,
                libsmbclient-dev [!hurd-any],
-               libsndio-dev,
+               libsndio-dev (>> 0),
                libspeex-dev (>= 1.0.5),
                libspeexdsp-dev (>= 1.0.5),
                libssh2-1-dev,
diff -Nru vlc-2.2.6/debian/rules vlc-2.2.6/debian/rules
--- vlc-2.2.6/debian/rules	2017-07-11 18:25:20.000000000 +0000
+++ vlc-2.2.6/debian/rules	2017-07-20 00:18:38.000000000 +0000
@@ -341,6 +341,8 @@
 
 override_dh_auto_clean:
 	rm -rf $(ffmpegprefix) $(ffmpegbuild)
+	rm -rf extras/analyser/_vlc
+	rm -rf share/tmp-vlc.desktope
 	dh_auto_clean
 
 override_dh_autoreconf: