Manual merge of version 1.68-3+rpi1 and 1.68-4 to produce 1.68-4+rpi1

diff --cc debian/changelog
index a9fd9c97680e8f3f051b3e61f1980b1a73be1508,4f079c80ff8efdf74ea3cd4b7835633b9fa0af80..e32a408a6114fc5c177134c8c385242f4e42bdae
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,18 @@@
- pigpio (1.68-3+rpi1) buster-staging; urgency=medium
++pigpio (1.68-4+rpi1) bullseye-staging; urgency=medium
 +
++  [changes brought forward from 1.68-3+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 24 Jan 2019 13:31:37 +0000]
 +  * Add back systemd stuff and ensure systemd unit is only installed in pigpiod package.
 +  * Add server related packages and metapackage.
 +
-  -- Peter Michael Green <plugwash@raspbian.org>  Thu, 24 Jan 2019 13:31:37 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Sat, 07 Sep 2019 03:14:40 +0000
++
+ pigpio (1.68-4) unstable; urgency=medium
+ 
+   * Remove python 2 support (Closes: 937289).
+     + Drop python-pigpio package.
+     + Update control and rules.
+ 
+  -- Peter Michael Green <plugwash@debian.org>  Fri, 30 Aug 2019 20:31:21 +0000
  
  pigpio (1.68-3) unstable; urgency=medium
  

diff --cc debian/control
index 15acd65101a63d3cc802f8e7a0eaa6a9e8eb3d48,4d8990d0e7c8f0386115adb35a3eb6ba693a473f..c7bb24fe9ba8448e4656e234d2bf065facf06c3b
--- 1/debian/control
--- 2/debian/control
+++ b/debian/control
@@@ -76,47 -55,6 +76,36 @@@ Description: Client tools for Raspberr
   .
   This package provides the pigs and pig2vcd tools.
  
- Package: python-pigpio
- Section: python
- Architecture: all
- Depends: ${misc:Depends}, ${python:Depends}
- Recommends: pigpio
- Description: Python module which talks to the pigpio daemon (Python 2)
-  Pigpio is a set of software which allows control of the General Purpose Input
-  Outputs (GPIO) locally or remotely.
-  .
-  This package provides the python 2 client library.
- 
 +Package: pigpiod
 +Architecture: any
 +Depends: ${shlibs:Depends}, ${misc:Depends}
 +Conflicts: pigpio (<< 1.68-1)
 +Description: Client tools for Raspberry Pi GPIO control
 + Pigpio is a set of software which allows control of the General Purpose Input
 + Outputs (GPIO) locally or remotely.
 + .
 + This package provides the pigpiod daemon which offers a socket and pipe
 + interface to the underlying library.
 +
 +Package: pigpio
 +Architecture: any
 +Depends: 
 + libpigpiod-if2-1 (= ${binary:Version}),
 + libpigpiod-if1 (= ${binary:Version}),
 + libpigpiod-if-dev (= ${binary:Version}),
 + pigpio-tools (= ${binary:Version}),
 + libpigpio1 (= ${binary:Version}),
 + libpigpio-dev (= ${binary:Version}),
 + pigpio-tools (= ${binary:Version}),
 + pigpiod (= ${binary:Version}),
 + pigpio (= ${binary:Version})
 +Description:  Raspberry Pi GPIO control transitional package.
 + Pigpio is a set of software which allows control of the General Purpose Input
 + Outputs (GPIO) locally or remotely.
 + .
 + This is a transitional package that installs everything that was previously
 + included in the pigpio package before the package split 
 +
  Package: python3-pigpio
  Section: python
  Architecture: all

diff --cc debian/rules
index 9bb1ae3b6001a36d2b95213faa8b6aa9bccac8eb,b95412f5ee478d4daa5404ee3ef9acd29f8cacf5..055a6f28d85a41d95418ec3ba367120319341190
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -7,7 -7,7 +7,7 @@@ export DEB_BUILD_MAINT_OPTIONS = harden
  export DEB_CFLAGS_MAINT_APPEND = -Wno-format-security
  
  %:
-       dh $@ --with python2,python3,systemd --parallel
 -      dh $@ --with python3 --parallel
++      dh $@ --with python3,systemd --parallel
  
  override_dh_clean:
        rm -rf build