Merge version 9.20170808+rpi1 and 10.2018112800 to produce 10.2018112800+rpi1

diff --cc debian/changelog
index 6087ebab18ac046c6905c5ea065a752cc2a7dfc8,ddfacf8c51ce82120612562d43b7490cc3ad2655..de30997325a5d5d9c4bb90987120377dc14689a7
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,17 +1,28 @@@
- lsb (9.20170808+rpi1) buster-staging; urgency=medium
++lsb (10.2018112800+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 4.1+Debian13+rpi1+nmu1 by Peter Michael Green <plugwash@raspbian.org> at Sat, 08 Nov 2014 12:56:07 +0000]
 +  * change origin and label to look for when interrogating apt for 
 +    distribution information to match those used in the raspbian repository.
 +    (LP: 1069141)
 +  * Try and fail to fix testsuite to work with our new settings
 +  * Disable testsuite
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 01 Sep 2017 08:27:17 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Tue, 04 Dec 2018 19:54:54 +0000
++
+ lsb (10.2018112800) unstable; urgency=medium
+ 
+   * Remove support for /etc/lsb-release in favour of /usr/lib/os-release
+     (Closes: #914287)
+   * Rephrase lsb-release's README.Debian
+ 
+   * Packaging cleanup
+     - Bump S-V without changes needed
+     - Bump debhelper compat to 11
+     - Move Vcs to Salsa, update Vcs-*
+     - Drop obsolete X-Python3-Version from d/control
+     - d/copyright: use https URL
+ 
+  -- Didier Raboud <odyx@debian.org>  Wed, 28 Nov 2018 20:21:37 +0100
  
  lsb (9.20170808) unstable; urgency=medium
  

diff --cc lsb_release.py
Simple merge

diff --cc test/test_lsb_release.py
Simple merge