diff -Nru pigpio-1.68/debian/changelog pigpio-1.68/debian/changelog --- pigpio-1.68/debian/changelog 2019-01-15 23:01:01.000000000 +0000 +++ pigpio-1.68/debian/changelog 2019-01-18 01:52:27.000000000 +0000 @@ -1,3 +1,17 @@ +pigpio (1.68-2+rpi2) buster-staging; urgency=medium + + * Only install systemd unit in pigpiod package. + + -- Peter Michael Green Fri, 18 Jan 2019 01:52:27 +0000 + +pigpio (1.68-2+rpi1) buster-staging; urgency=medium + + * Fix short description for libpigpiod-if-dev package. + * 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 Wed, 16 Jan 2019 23:17:28 +0000 + pigpio (1.68-2) unstable; urgency=medium * Put packages into more appropriate sections. diff -Nru pigpio-1.68/debian/control pigpio-1.68/debian/control --- pigpio-1.68/debian/control 2019-01-15 23:01:01.000000000 +0000 +++ pigpio-1.68/debian/control 2019-01-18 01:52:27.000000000 +0000 @@ -26,8 +26,7 @@ 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 @@ -36,25 +35,77 @@ Section: libdevel Depends: ${shlibs:Depends}, ${misc:Depends}, libpigpiod-if1 (= ${binary:Version}), libpigpiod-if2-1 (= ${binary:Version}) Conflicts: pigpio (<< 1.68-1) -Description: Client tools for Raspberry Pi GPIO control +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 @@ 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 @@ 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 -Nru pigpio-1.68/debian/libpigpio1.install pigpio-1.68/debian/libpigpio1.install --- pigpio-1.68/debian/libpigpio1.install 1970-01-01 00:00:00.000000000 +0000 +++ pigpio-1.68/debian/libpigpio1.install 2019-01-18 01:52:27.000000000 +0000 @@ -0,0 +1 @@ +debian/tmp/usr/lib/libpigpio.so.1 diff -Nru pigpio-1.68/debian/libpigpio-dev.install pigpio-1.68/debian/libpigpio-dev.install --- pigpio-1.68/debian/libpigpio-dev.install 1970-01-01 00:00:00.000000000 +0000 +++ pigpio-1.68/debian/libpigpio-dev.install 2019-01-18 01:52:27.000000000 +0000 @@ -0,0 +1,2 @@ +debian/tmp/usr/lib/libpigpio.so +debian/tmp/usr/include/pigpio.h diff -Nru pigpio-1.68/debian/libpigpio-dev.manpages pigpio-1.68/debian/libpigpio-dev.manpages --- pigpio-1.68/debian/libpigpio-dev.manpages 1970-01-01 00:00:00.000000000 +0000 +++ pigpio-1.68/debian/libpigpio-dev.manpages 2019-01-18 01:52:27.000000000 +0000 @@ -0,0 +1 @@ +debian/tmp/usr/man/man3/pigpio.3 diff -Nru pigpio-1.68/debian/patches/11-fix-screwups-in-64-bit-patch.patch pigpio-1.68/debian/patches/11-fix-screwups-in-64-bit-patch.patch --- pigpio-1.68/debian/patches/11-fix-screwups-in-64-bit-patch.patch 1970-01-01 00:00:00.000000000 +0000 +++ pigpio-1.68/debian/patches/11-fix-screwups-in-64-bit-patch.patch 2019-01-18 01:52:27.000000000 +0000 @@ -0,0 +1,61 @@ +commit 4985f93f67f8ace4dab55d4413504a1c33ecc8ac +Author: Peter Michael Green +Date: Thu Jan 17 00:38:43 2019 +0000 + + Fix some screwups in 64-bit patch where PRIX64 was used where PRIXPTR should have been used. + +diff --git a/pigpio.c b/pigpio.c +index 3756765..3102e32 100644 +--- a/pigpio.c ++++ b/pigpio.c +@@ -7572,7 +7572,7 @@ static int initAllocDMAMem(void) + + close(fdPmap); + +- DBG(DBG_STARTUP, "dmaPMapBlk=%08"PRIXPTR" dmaIn=%08"PRIX64, ++ DBG(DBG_STARTUP, "dmaPMapBlk=%08"PRIXPTR" dmaIn=%08"PRIXPTR, + (uintptr_t)dmaPMapBlk, (uintptr_t)dmaIn); + } + else +@@ -7610,12 +7610,12 @@ static int initAllocDMAMem(void) + } + + DBG(DBG_STARTUP, +- "gpioReg=%08"PRIX64" pwmReg=%08"PRIX64" pcmReg=%08"PRIX64" clkReg=%08"PRIX64" auxReg=%08"PRIX64, ++ "gpioReg=%08"PRIXPTR" pwmReg=%08"PRIXPTR" pcmReg=%08"PRIXPTR" clkReg=%08"PRIXPTR" auxReg=%08"PRIXPTR, + (uintptr_t)gpioReg, (uintptr_t)pwmReg, + (uintptr_t)pcmReg, (uintptr_t)clkReg, (uintptr_t)auxReg); + + for (i=0; i= DBG_DMACBS) + { +@@ -10505,7 +10505,7 @@ int bbI2CZip( + int addr, flags, esc, setesc; + wfRx_t *w; + +- DBG(DBG_USER, "gpio=%d inBuf=%s outBuf=%08"PRIX64" len=%d", ++ DBG(DBG_USER, "gpio=%d inBuf=%s outBuf=%08"PRIXPTR" len=%d", + SDA, myBuf2Str(inLen, (char *)inBuf), (uintptr_t)outBuf, outLen); + + CHECK_INITED; +@@ -11304,7 +11304,7 @@ int eventSetFunc(unsigned event, eventFunc_t f) + + int eventSetFuncEx(unsigned event, eventFuncEx_t f, void *userdata) + { +- DBG(DBG_USER, "event=%d function=%08"PRIx64" userdata=%08"PRIx64, ++ DBG(DBG_USER, "event=%d function=%08"PRIxPTR" userdata=%08"PRIxPTR, + event, (uintptr_t)f, (uintptr_t)userdata); + + CHECK_INITED; +@@ -11406,7 +11406,7 @@ int gpioSetAlertFunc(unsigned gpio, gpioAlertFunc_t f) + + int gpioSetAlertFuncEx(unsigned gpio, gpioAlertFuncEx_t f, void *userdata) + { +- DBG(DBG_USER, "gpio=%d function=%08"PRIX64" userdata=%08"PRIX64, ++ DBG(DBG_USER, "gpio=%d function=%08"PRIXPTR" userdata=%08"PRIXPTR, + gpio, (uintptr_t)f, (uintptr_t)userdata); + + CHECK_INITED; diff -Nru pigpio-1.68/debian/patches/series pigpio-1.68/debian/patches/series --- pigpio-1.68/debian/patches/series 2019-01-15 23:01:01.000000000 +0000 +++ pigpio-1.68/debian/patches/series 2019-01-18 01:52:27.000000000 +0000 @@ -7,4 +7,5 @@ 08-dont-install-libs-as-manpages.patch 09-filelayout.patch 10-use-pthread-for-shared-libs.patch +11-fix-screwups-in-64-bit-patch.patch remove-broken-comments-from-top-of-manpa.patch diff -Nru pigpio-1.68/debian/pigpiod.install pigpio-1.68/debian/pigpiod.install --- pigpio-1.68/debian/pigpiod.install 1970-01-01 00:00:00.000000000 +0000 +++ pigpio-1.68/debian/pigpiod.install 2019-01-18 01:52:27.000000000 +0000 @@ -0,0 +1,2 @@ +debian/tmp/opt +debian/tmp/usr/bin/pigpiod diff -Nru pigpio-1.68/debian/pigpiod.manpages pigpio-1.68/debian/pigpiod.manpages --- pigpio-1.68/debian/pigpiod.manpages 1970-01-01 00:00:00.000000000 +0000 +++ pigpio-1.68/debian/pigpiod.manpages 2019-01-18 01:52:27.000000000 +0000 @@ -0,0 +1 @@ +debian/tmp/usr/man/man1/pigpiod.1 diff -Nru pigpio-1.68/debian/rules pigpio-1.68/debian/rules --- pigpio-1.68/debian/rules 2019-01-15 23:01:01.000000000 +0000 +++ pigpio-1.68/debian/rules 2019-01-18 01:52:27.000000000 +0000 @@ -14,7 +14,7 @@ dh_clean override_dh_systemd_start: - dh_systemd_start --name pigpiod --no-start + dh_systemd_start -p pigpiod --name pigpiod --no-start override_dh_systemd_enable: - dh_systemd_enable --name pigpiod --no-enable + dh_systemd_enable -p pigpiod --name pigpiod --no-enable