Merge version 4.0.1+dfsg1-1+rpi1 and 4.0.2+dfsg1-2 to produce 4.0.2+dfsg1-2+rpi1

diff --cc debian/changelog
index ceef6b032c7c644cdb90f65867c8589f1d24f0b2,9283cee7f580be23115812f47959553929a4580c..e24dd6a0069d1ba65fd94ca07e7b0f27b7933cc8
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,25 +1,33 @@@
- libcec (4.0.1+dfsg1-1+rpi1) stretch-staging; urgency=medium
++libcec (4.0.2+dfsg1-2+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 3.1.0+dfsg1-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 10 Mar 2016 00:53:26 +0000]
 +  * Add symbols file hack for raspbian.
 +  * Fix clean target.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 02 Feb 2017 15:11:26 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 02 Jan 2018 06:01:40 +0000
++
+ libcec (4.0.2+dfsg1-2) unstable; urgency=medium
+ 
+   [ Debian's Automated Developer ]
+   * Update symbols file(s)
+ 
+  -- Balint Reczey <rbalint@ubuntu.com>  Mon, 25 Dec 2017 22:52:01 +0100
+ 
+ libcec (4.0.2+dfsg1-1) experimental; urgency=medium
+ 
+   * Always repack original source with xz compression
+   * New upstream version 4.0.2+dfsg1
+   * Build-depend on g++ (>= 4:7)
+   * Refresh patches
+   * Remove workaround to put pkg-config file to the right place
+   * Update symbols file with new symbols from 4.0.2
+   * Update symbols file with symbol changes due to GCC 7 transition
+     (Closes: #853485)
+   * Use my @ubuntu.com email address in Uploader field
+   * Keep installing Python modules to dist-packages despite upstream
+     changes which install them to site-packages
+ 
+  -- Balint Reczey <rbalint@ubuntu.com>  Tue, 05 Sep 2017 23:36:22 +0200
  
  libcec (4.0.1+dfsg1-1) unstable; urgency=medium
  

diff --cc debian/rules
index d005a420085ab496b81d1ff1659c0f4b808a2321,4d3b6fb1eda521509ad4378c18f2922e10542fa5..d56191626234811c00736a26496de996193dfe70
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -14,16 -13,5 +14,15 @@@ override_dh_auto_configure
  
  override_dh_auto_install:
        dh_auto_install
-       mv debian/tmp/usr/lib/pkgconfig debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
        rm debian/tmp/usr/bin/cec-client
        mv debian/tmp/usr/bin/cec-client-* debian/tmp/usr/bin/cec-client
 +
 +override_dh_auto_clean:
 +      dh_auto_clean
 +      rm -f include/platform
 +      rm -f include/version.h
 +      rm -f src/cec-client/env.h
 +      rm -f src/cecc-client/env.h
 +      rm -f src/libcec/env.h
 +      rm -f src/libcec/libcec.pc
 +      sed -i 's/(optional=raspbian)/(arch=!armel)/' debian/libcec*.symbols