Merge version 0.32-1+rpi1 and 0.33-3.3+deb9u1 to produce 0.33-3.3+deb9u1+rpi1

diff --cc debian/changelog
index ab7df621e01671bf860f99914c76e654b9aff37f,fc8326cd878dace329b753e36acf73a1a38acb0d..2c985ed669318cf99bc2bc79f07f497e5c612ca9
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,70 +1,77 @@@
- spice-gtk (0.32-1+rpi1) stretch-staging; urgency=medium
++spice-gtk (0.33-3.3+deb9u1+rpi1) stretch-staging; urgency=medium
 +
++  [changes brought forward from 0.32-1+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 15 Sep 2016 13:21:14 +0000]
 +  * Add build-depends on libegl1-mesa-dev.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 15 Sep 2016 13:21:14 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Fri, 21 Jun 2019 22:27:25 +0000
++
+ spice-gtk (0.33-3.3+deb9u1) stretch; urgency=medium
+ 
+   * Non-maintainer upload.
+   * Fix flexible array buffer overflow (CVE-2018-10873) (Closes: #906316)
+ 
+  -- Salvatore Bonaccorso <carnil@debian.org>  Fri, 26 Oct 2018 17:52:24 +0200
+ 
+ spice-gtk (0.33-3.3) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * debian/rules: delete generated files to ensure they're re-generated
+     from source (Closes: #797855).
+   * Replace OpenSSL 1.1 compatibility patch with the version applied
+     upstream (Closes: #851127).
+   * debian/copyright: fix empty short license field (spotted by Lintian).
+ 
+  -- intrigeri <intrigeri@debian.org>  Sat, 14 Jan 2017 11:34:36 +0000
+ 
+ spice-gtk (0.33-3.2) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * debian_843471-clipboard_Fix_crash_by_handling_error.patch:
+     new patch, cherry-picked from upstream (Closes: #843471).
+ 
+  -- intrigeri <intrigeri@debian.org>  Sun, 25 Dec 2016 08:30:43 +0000
+ 
+ spice-gtk (0.33-3.1) unstable; urgency=medium
+ 
+   * Non-maintainer upload.
+   * Fix FTBFS with OpenSSL 1.1, patch by Sebastian Andrzej Siewior (Closes:
+     #828554).
+ 
+  -- Andrey Rahmatullin <wrar@debian.org>  Sat, 10 Dec 2016 20:06:07 +0500
+ 
+ spice-gtk (0.33-3) unstable; urgency=medium
+ 
+   * debian/control:
+     - Add gstreamer1.0-tools, gstreamer1.0-libav and gstreamer1.0-plugins-*
+       to Build-Depends (Closes: #841932)
+     - Add gstreamer1.0-libav and gstreamer1.0-plugins-* to 
+       libspice-client-glib-2.0-8 Depends
+   * debian/rules
+     - Remove dh_strip on python-spice-client-gtk, package already removed
+   * Install missed docs
+ 
+  -- Liang Guo <guoliang@debian.org>  Tue, 25 Oct 2016 10:00:32 +0800
+ 
+ spice-gtk (0.33-2) unstable; urgency=medium
+ 
+   * debian/control:
+     - Add libphodav-2.0-dev to Build-Depends, enable webdav
+       support (Closes: #841764)
+     - Add libgstreamer1.0-dev and libgstreamer-plugins-base1.0-dev 
+       to Build-Depends, enable gstreamer support
+ 
+  -- Liang Guo <guoliang@debian.org>  Mon, 24 Oct 2016 20:06:17 +0800
+ 
+ spice-gtk (0.33-1) unstable; urgency=medium
+ 
+   * New upstream release (Closes: #840603)
+   * debian/control:
+     - Update Build-Depends on spice-protocol to 0.12.12
+   * debian/patches:
+     - Refresh explicitly-enable-subdir-objects.patch
+   * Refresh libspice-client-glib-2.0-8.symbols
+ 
+  -- Liang Guo <guoliang@debian.org>  Fri, 07 Oct 2016 23:14:27 +0800
  
  spice-gtk (0.32-1) unstable; urgency=medium
  

diff --cc debian/control
index c516059cdad6a8452bca110c358b1667e7238713,9b1bd46e932f00bcd75108ecf9a92ff1e6ac5612..616f2e6c26f46f1ab695fa7ae21f38ec0ab2bcee
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -35,8 -35,15 +35,16 @@@ Build-Depends
   gtk-doc-tools (>= 1.14),
   liblz4-dev,
   libcacard-dev (>= 0.1.2),
-  libspice-protocol-dev (>= 0.12.11),
+  libspice-protocol-dev (>= 0.12.12),
+  libphodav-2.0-dev, 
+  libgstreamer1.0-dev,
+  libgstreamer-plugins-base1.0-dev,
+  gstreamer1.0-tools,
+  gstreamer1.0-plugins-bad,
+  gstreamer1.0-plugins-base,
+  gstreamer1.0-plugins-good,
+  gstreamer1.0-libav,
 + libegl1-mesa-dev
  Standards-Version: 3.9.8
  X-Python-Version: >= 2.5
  Homepage: http://www.spice-space.org/