Merge version 239-9+rpi2 and 239-10 to produce 239-10+rpi1

diff --cc debian/changelog
index 14f66bd16792185d3f0d495bf11c70a6c039bc4f,7bfcf609e2fdefbf03984d0311a7c992f92effb1..26a4f4fa1e846195f6af9326e5deb04c776fb5cc
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,17 -1,20 +1,33 @@@
- systemd (239-9+rpi2) buster-staging; urgency=medium
- 
-   * Force build with gcc-7 (LP: #1793415)
- 
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 20 Sep 2018 22:47:19 +0000
- 
- systemd (239-9+rpi1) buster-staging; urgency=medium
++systemd (239-10+rpi1) buster-staging; urgency=medium
 +
++  [changes brought forward from 239-9+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 20 Sep 2018 20:22:45 +0000]
 +  * Disable testsuite, it fails on some of our buildboxes (probablly because of
 +    old kernels).
 +  * Add breaks on raspi-copies-and-fills, it doesn't seem to get on with
 +    this version of systemd/udev.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 20 Sep 2018 20:22:45 +0000
++  [changes brought forward from 239-9+rpi2 by Peter Michael Green <plugwash@raspbian.org> at Thu, 20 Sep 2018 22:47:19 +0000]
++  * Force build with gcc-7 (LP: #1793415)
++
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 29 Sep 2018 08:55:11 +0000
++
+ systemd (239-10) unstable; urgency=medium
+ 
+   [ Michael Biebl ]
+   * meson: Rename -Ddebug to -Ddebug-extra.
+     Meson added -Doptimization and -Ddebug options, which obviously causes
+     a conflict with our -Ddebug options. Let's rename it.
+     (Closes: #909455)
+   * Add conflicts against consolekit.
+     Letting both ConsoleKit and logind manage dynamic device permissions
+     will only lead to inconsistent and unexpected results.
+ 
+   [ Felipe Sateler ]
+   * Link systemctl binary statically against libshared.
+     This reduces the Pre-Depends list considerably, and is more resilient
+     against borked installs.
+ 
+  -- Michael Biebl <biebl@debian.org>  Tue, 25 Sep 2018 16:11:12 +0200
  
  systemd (239-9) unstable; urgency=medium
  

diff --cc debian/control
Simple merge

diff --cc debian/rules
Simple merge