Add extra packages for Raspbian.

diff --git a/debian/changelog b/debian/changelog
index d4caedcae7dce452036a98068650e76578a8b246..a76e06f87d96603caed6390051ea1f5263adae74 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-pigpio (1.68-3) UNRELEASED; urgency=medium
+pigpio (1.68-2+rpi1) buster-staging; urgency=medium
 
   * Fix short description for libpigpiod-if-dev package.
-  * Remove systemd stuff in debian/rules, since we don't ship the server.
   * Fix some screwups in 64-bit patch where PRIX64 was used where PRIXPTR should have been used.
+  * Add back server related packages.
 
  -- Peter Michael Green <plugwash@debian.org>  Wed, 16 Jan 2019 23:17:28 +0000
 

diff --git a/debian/control b/debian/control
index ad56a708ac1869fb5dea136a884a8b24cf5d85e7..15acd65101a63d3cc802f8e7a0eaa6a9e8eb3d48 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -26,8 +26,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: pigpio (<< 1.68-1)
 Description: Client library for Raspberry Pi GPIO control (deprecated)
  Pigpio is a set of software which allows control of the General Purpose Input
- Outputs (GPIO) locally or remotely. Currently only the client side is Packaged
- in Debian as the server side is incompatible with Debian kernels.
+ Outputs (GPIO) locally or remotely.
  .
  This package provides the deprecated libpigpiod_if client library
 
@@ -38,23 +37,75 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libpigpiod-if1 (= ${binary:Version}
 Conflicts: pigpio (<< 1.68-1)
 Description: Development headers for client libraries for Raspberry Pi GPIO control
  Pigpio is a set of software which allows control of the General Purpose Input
- Outputs (GPIO) locally or remotely. Currently only the client side is Packaged
- in Debian as the server side is incompatible with Debian kernels.
+ Outputs (GPIO) locally or remotely.
  .
  This package provides development headers for the libpigpiod_if2 and
  libpigpiod_if client libraries.
 
+Package: libpigpio1
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: pigpio (<< 1.68-1)
+Description: Library 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 pigpio library used to access the GPIO directly.
+ (used by the pigpiod server, can also be used directly if desired)
+
+Package: libpigpio-dev
+Architecture: any
+Section: libdevel
+Depends: ${shlibs:Depends}, ${misc:Depends}, libpigpio1 (= ${binary:Version})
+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 development headers for the pigpio library used to
+ access the GPIO directly. 
+
 Package: pigpio-tools
 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. Currently only the client side is Packaged
- in Debian as the server side is incompatible with Debian kernels.
+ Outputs (GPIO) locally or remotely.
  .
  This package provides the pigs and pig2vcd tools.
 
+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: python-pigpio
 Section: python
 Architecture: all
@@ -62,8 +113,7 @@ 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. Currently only the client side is Packaged
- in Debian as the server side is incompatible with Debian kernels.
+ Outputs (GPIO) locally or remotely.
  .
  This package provides the python 2 client library.
 
@@ -74,7 +124,6 @@ Depends: ${misc:Depends}, ${python3:Depends}
 Recommends: pigpio
 Description: Python module which talks to the pigpio daemon (Python 3)
  Pigpio is a set of software which allows control of the General Purpose Input
- Outputs (GPIO) locally or remotely. Currently only the client side is Packaged
- in Debian as the server side is incompatible with Debian kernels.
+ Outputs (GPIO) locally or remotely.
  .
  This package provides the python 3 client library.

diff --git a/debian/libpigpio-dev.install b/debian/libpigpio-dev.install
new file mode 100644 (file)
index 0000000..5498a2f
--- /dev/null
+++ b/debian/libpigpio-dev.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/lib/libpigpio.so
+debian/tmp/usr/include/pigpio.h

diff --git a/debian/libpigpio-dev.manpages b/debian/libpigpio-dev.manpages
new file mode 100644 (file)
index 0000000..8c022e3
--- /dev/null
+++ b/debian/libpigpio-dev.manpages
@@ -0,0 +1 @@
+debian/tmp/usr/man/man3/pigpio.3

diff --git a/debian/libpigpio1.install b/debian/libpigpio1.install
new file mode 100644 (file)
index 0000000..66ce0e1
--- /dev/null
+++ b/debian/libpigpio1.install
@@ -0,0 +1 @@
+debian/tmp/usr/lib/libpigpio.so.1

diff --git a/debian/pigpiod.install b/debian/pigpiod.install
new file mode 100644 (file)
index 0000000..414f554
--- /dev/null
+++ b/debian/pigpiod.install
@@ -0,0 +1,2 @@
+debian/tmp/opt
+debian/tmp/usr/bin/pigpiod

diff --git a/debian/pigpiod.manpages b/debian/pigpiod.manpages
new file mode 100644 (file)
index 0000000..1493fbf
--- /dev/null
+++ b/debian/pigpiod.manpages
@@ -0,0 +1 @@
+debian/tmp/usr/man/man1/pigpiod.1

diff --git a/debian/rules b/debian/rules
index de11e70906fa024d89167b3e6b745d03b6acad1f..4895da5dfd799d16be2013093a8bf19d70ce72c9 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -7,9 +7,14 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_CFLAGS_MAINT_APPEND = -Wno-format-security
 
 %:
-       dh $@ --with python2,python3
+       dh $@ --with python2,python3,systemd
 
 override_dh_clean:
        rm -rf build
        dh_clean
 
+override_dh_systemd_start:
+       dh_systemd_start --name pigpiod --no-start
+
+override_dh_systemd_enable:
+       dh_systemd_enable --name pigpiod --no-enable