From 90742598af1b410cb02f2224ad0a620186dbd871 Mon Sep 17 00:00:00 2001 From: Erik Date: Sat, 18 Feb 2023 13:19:48 -0500 Subject: [PATCH 01/15] fixed packaging errors with bzr builddeb -- -us -uc --- debian/wiringpi.install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/wiringpi.install b/debian/wiringpi.install index 41ae22d..da3761f 100644 --- a/debian/wiringpi.install +++ b/debian/wiringpi.install @@ -1,4 +1,4 @@ debian/tmp/usr/bin -debian/tmp/usr/man usr/share -README.TXT usr/share/doc/wiringpi +debian/tmp/usr/share/man usr/share +README.md usr/share/doc/wiringpi People usr/share/doc/wiringpi From 2bca7b95582dc4922f06f2d60bf9a6603612d84d Mon Sep 17 00:00:00 2001 From: Erik Date: Sat, 18 Feb 2023 18:41:20 -0500 Subject: [PATCH 02/15] renamed package for opi --- .gitignore | 2 +- build | 4 ++-- debian/.gitignore | 6 +++--- debian/changelog | 2 +- debian/compat | 2 +- debian/control | 12 +++++------ ...ngpi-dev.dirs => libwiringpi-opi-dev.dirs} | 0 ...ev.install => libwiringpi-opi-dev.install} | 2 +- ...ngpi2.install => libwiringpi-opi2.install} | 0 debian/libwiringpi-opi2.shlibs | 2 ++ debian/libwiringpi2.shlibs | 2 -- debian/rules | 4 ++-- debian/{wiringpi.dirs => wiringpi-opi.dirs} | 0 debian/wiringpi-opi.install | 4 ++++ debian/wiringpi.install | 4 ---- newVersion | 2 +- wiringPiD/Makefile | 20 +++++++++---------- 17 files changed, 34 insertions(+), 34 deletions(-) rename debian/{libwiringpi-dev.dirs => libwiringpi-opi-dev.dirs} (100%) rename debian/{libwiringpi-dev.install => libwiringpi-opi-dev.install} (51%) rename debian/{libwiringpi2.install => libwiringpi-opi2.install} (100%) create mode 100644 debian/libwiringpi-opi2.shlibs delete mode 100644 debian/libwiringpi2.shlibs rename debian/{wiringpi.dirs => wiringpi-opi.dirs} (100%) create mode 100644 debian/wiringpi-opi.install delete mode 100644 debian/wiringpi.install diff --git a/.gitignore b/.gitignore index e6ad4ba..722a856 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ lib*.so.* *~ debian-template/wiringPi -debian-template/wiringpi-*.deb +debian-template/wiringpi-opi-*.deb gpio/gpio examples/speed examples/blink diff --git a/build b/build index d738b59..e516d50 100755 --- a/build +++ b/build @@ -65,7 +65,7 @@ if [ x$1 = "xclean" ]; then cd ../scrollPhat echo -n "scrollPhat: " ; make clean cd ../.. - echo -n "Deb: " ; rm -f debian-template/wiringpi*.deb + echo -n "Deb: " ; rm -f debian-template/wiringpi-opi*.deb echo exit fi @@ -99,7 +99,7 @@ if [ x$1 = "xdebian" ]; then echo "Building deb package" cd $here/debian-template fakeroot dpkg-deb --build wiringPi - mv wiringPi.deb wiringpi-`cat $here/VERSION`-1.deb + mv wiringPi.deb wiringpi-opi-`cat $here/VERSION`-1.deb exit fi diff --git a/debian/.gitignore b/debian/.gitignore index 6296064..13989f4 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -1,9 +1,9 @@ *.debhelper.log *.substvars tmp -wiringpi -libwiringpi2 -libwiringpi-dev +wiringpi-opi +libwiringpi-opi2 +libwiringpi-opi-dev files *.postinst.debhelper *.postrm.debhelper diff --git a/debian/changelog b/debian/changelog index 7f04ad5..a04892a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -wiringpi (2.26~iwj) rpi-unstable; urgency=low +wiringpi-opi (2.26~iwj) rpi-unstable; urgency=low * Initial version with real Debian source package build. diff --git a/debian/compat b/debian/compat index 45a4fb7..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +10 diff --git a/debian/control b/debian/control index 5f33b7b..d769c5f 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: wiringpi +Source: wiringpi-opi Section: electronics Priority: optional Maintainer: Ian Jackson @@ -6,24 +6,24 @@ Standards-Version: 3.8.0 Homepage: http://wiringpi.com/ Build-Depends: debhelper (>= 8) -Package: libwiringpi2 +Package: libwiringpi-opi2 Section: libs Architecture: arm64 Depends: ${shlibs:Depends}, ${misc:Depends} Description: GPIO librariees for Raspberry Pi (runtime). Runtime for the popular wiringPi library. -Package: wiringpi +Package: wiringpi-opi Architecture: arm64 Depends: ${shlibs:Depends}, ${misc:Depends} Description: gpio utility for Raspberry Pi The wiringPi gpio command line utility, for GPIO access on a Raspberry Pi from the command line. -Package: libwiringpi-dev +Package: libwiringpi-opi-dev Architecture: arm64 -Depends: libwiringpi2 (= ${binary:Version}), libc6-dev, ${misc:Depends} -Suggests: wiringpi +Depends: libwiringpi-opi2 (= ${binary:Version}), libc6-dev, ${misc:Depends} +Suggests: wiringpi-opi Description: GPIO development library for Raspberry Pi Development libraries to allow GPIO access on a Raspberry Pi from C and C++ programs. diff --git a/debian/libwiringpi-dev.dirs b/debian/libwiringpi-opi-dev.dirs similarity index 100% rename from debian/libwiringpi-dev.dirs rename to debian/libwiringpi-opi-dev.dirs diff --git a/debian/libwiringpi-dev.install b/debian/libwiringpi-opi-dev.install similarity index 51% rename from debian/libwiringpi-dev.install rename to debian/libwiringpi-opi-dev.install index d7ea901..916721d 100644 --- a/debian/libwiringpi-dev.install +++ b/debian/libwiringpi-opi-dev.install @@ -1,3 +1,3 @@ debian/tmp/usr/include debian/tmp/usr/lib/*.so -examples usr/share/doc/libwiringpi-dev +examples usr/share/doc/libwiringpi-opi-dev diff --git a/debian/libwiringpi2.install b/debian/libwiringpi-opi2.install similarity index 100% rename from debian/libwiringpi2.install rename to debian/libwiringpi-opi2.install diff --git a/debian/libwiringpi-opi2.shlibs b/debian/libwiringpi-opi2.shlibs new file mode 100644 index 0000000..c7b4668 --- /dev/null +++ b/debian/libwiringpi-opi2.shlibs @@ -0,0 +1,2 @@ +libwiringPi 2 libwiringpi-opi2 +libwiringPiDev 2 libwiringpi-opi2 diff --git a/debian/libwiringpi2.shlibs b/debian/libwiringpi2.shlibs deleted file mode 100644 index 0be8db1..0000000 --- a/debian/libwiringpi2.shlibs +++ /dev/null @@ -1,2 +0,0 @@ -libwiringPi 2 libwiringpi2 -libwiringPiDev 2 libwiringpi2 diff --git a/debian/rules b/debian/rules index 423a473..969c624 100755 --- a/debian/rules +++ b/debian/rules @@ -40,9 +40,9 @@ override_dh_auto_install: dh_install set -ex; for l in libwiringPi libwiringPiDev; do \ ln -sf $$l.so.$${VERSION} \ - debian/libwiringpi$$soname/usr/lib/$$l.so.$$soname; \ + debian/libwiringpi-opi$$soname/usr/lib/$$l.so.$$soname; \ ln -sf $$l.so.$${VERSION} \ - debian/libwiringpi-dev/usr/lib/$$l.so; \ + debian/libwiringpi-opi-dev/usr/lib/$$l.so; \ done %: diff --git a/debian/wiringpi.dirs b/debian/wiringpi-opi.dirs similarity index 100% rename from debian/wiringpi.dirs rename to debian/wiringpi-opi.dirs diff --git a/debian/wiringpi-opi.install b/debian/wiringpi-opi.install new file mode 100644 index 0000000..b132e17 --- /dev/null +++ b/debian/wiringpi-opi.install @@ -0,0 +1,4 @@ +debian/tmp/usr/bin +debian/tmp/usr/share/man usr/share +README.md usr/share/doc/wiringpi-opi +People usr/share/doc/wiringpi-opi diff --git a/debian/wiringpi.install b/debian/wiringpi.install deleted file mode 100644 index da3761f..0000000 --- a/debian/wiringpi.install +++ /dev/null @@ -1,4 +0,0 @@ -debian/tmp/usr/bin -debian/tmp/usr/share/man usr/share -README.md usr/share/doc/wiringpi -People usr/share/doc/wiringpi diff --git a/newVersion b/newVersion index 4d4ece0..e23b92b 100755 --- a/newVersion +++ b/newVersion @@ -34,7 +34,7 @@ echo "#define VERSION_MINOR $vMin" >> version.h rm -f debian-template/wiringPi/DEBIAN/control cat > debian-template/wiringPi/DEBIAN/control < Date: Sat, 18 Feb 2023 19:33:08 -0500 Subject: [PATCH 03/15] updated changelog --- debian/changelog | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index a04892a..efc517f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,3 +4,8 @@ wiringpi-opi (2.26~iwj) rpi-unstable; urgency=low -- Ian Jackson Sat, 12 Sep 2015 18:31:35 +0100 +wiringpi-opi (2.27~iwj) rpi-unstable; urgency=low + + * Reworked package with official changes from Orange Pi + + -- Erik Sat, 18 Feb 2023 18:31:35 +0100 \ No newline at end of file From 431824f9c646798f5d1aae1dad53eb9fd424d895 Mon Sep 17 00:00:00 2001 From: Erik Date: Sat, 18 Feb 2023 19:34:51 -0500 Subject: [PATCH 04/15] fixed channgelog --- debian/changelog | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index efc517f..566bd98 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -wiringpi-opi (2.26~iwj) rpi-unstable; urgency=low +wiringpi-opi (2.27~iwj) rpi-unstable; urgency=low - * Initial version with real Debian source package build. + * Reworked package with official changes from Orange Pi - -- Ian Jackson Sat, 12 Sep 2015 18:31:35 +0100 + -- Erik P Sat, 18 Feb 2023 18:31:35 +0100 -wiringpi-opi (2.27~iwj) rpi-unstable; urgency=low +wiringpi-opi (2.26~iwj) rpi-unstable; urgency=low - * Reworked package with official changes from Orange Pi + * Initial version with real Debian source package build. - -- Erik Sat, 18 Feb 2023 18:31:35 +0100 \ No newline at end of file + -- Ian Jackson Sat, 12 Sep 2015 18:31:35 +0100 From e3032ad9c9050ab7498a98f54a16f81026fce8a0 Mon Sep 17 00:00:00 2001 From: Erik Date: Sat, 18 Feb 2023 19:53:07 -0500 Subject: [PATCH 05/15] fixed distroseries --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 566bd98..764180c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,7 @@ wiringpi-opi (2.27~iwj) rpi-unstable; urgency=low -- Erik P Sat, 18 Feb 2023 18:31:35 +0100 -wiringpi-opi (2.26~iwj) rpi-unstable; urgency=low +wiringpi-opi (2.26~iwj) jammy; urgency=low * Initial version with real Debian source package build. From ac7832dba4752da525d4a2405749d400e21cf0ec Mon Sep 17 00:00:00 2001 From: Erik Date: Sat, 18 Feb 2023 19:58:50 -0500 Subject: [PATCH 06/15] another changelog fix --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 764180c..2266a9d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -wiringpi-opi (2.27~iwj) rpi-unstable; urgency=low +wiringpi-opi (2.27~iwj) jammy; urgency=low * Reworked package with official changes from Orange Pi -- Erik P Sat, 18 Feb 2023 18:31:35 +0100 -wiringpi-opi (2.26~iwj) jammy; urgency=low +wiringpi-opi (2.26~iwj) rpi-unstable; urgency=low * Initial version with real Debian source package build. From c78eb05ccd7e32551d93f94a612ebf61d8c08f50 Mon Sep 17 00:00:00 2001 From: Erik Date: Sat, 18 Feb 2023 20:14:11 -0500 Subject: [PATCH 07/15] additional fixes --- debian/changelog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2266a9d..7178825 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,10 +2,10 @@ wiringpi-opi (2.27~iwj) jammy; urgency=low * Reworked package with official changes from Orange Pi - -- Erik P Sat, 18 Feb 2023 18:31:35 +0100 - + -- Erik P Sat, 18 Feb 2023 + wiringpi-opi (2.26~iwj) rpi-unstable; urgency=low * Initial version with real Debian source package build. - -- Ian Jackson Sat, 12 Sep 2015 18:31:35 +0100 + -- Ian Jackson Sat, 12 Sep 2015 18:31:35 +0100 \ No newline at end of file From f9f5e9156a16ec4e6731d0d1447d88755d90c564 Mon Sep 17 00:00:00 2001 From: Erik Date: Sat, 18 Feb 2023 20:14:33 -0500 Subject: [PATCH 08/15] more fixes --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7178825..758bf7b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ wiringpi-opi (2.27~iwj) jammy; urgency=low * Reworked package with official changes from Orange Pi - -- Erik P Sat, 18 Feb 2023 + -- Erik P Sat, 18 Feb 2023 18:31:35 +0100 wiringpi-opi (2.26~iwj) rpi-unstable; urgency=low From b9e862ee792128e004d43fdc9ed52f8a9458fb33 Mon Sep 17 00:00:00 2001 From: Erik Date: Sat, 18 Feb 2023 20:15:31 -0500 Subject: [PATCH 09/15] more --- debian/changelog | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 758bf7b..8442fec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ wiringpi-opi (2.27~iwj) jammy; urgency=low - * Reworked package with official changes from Orange Pi +* Reworked package with official changes from Orange Pi - -- Erik P Sat, 18 Feb 2023 18:31:35 +0100 +-- Erik P Sat, 18 Feb 2023 18:31:35 +0100 wiringpi-opi (2.26~iwj) rpi-unstable; urgency=low - * Initial version with real Debian source package build. +* Initial version with real Debian source package build. - -- Ian Jackson Sat, 12 Sep 2015 18:31:35 +0100 \ No newline at end of file +-- Ian Jackson Sat, 12 Sep 2015 18:31:35 +0100 From ec4fea9d3efca3e3c86c045ec05024d22bb4d5db Mon Sep 17 00:00:00 2001 From: Erik Date: Sat, 18 Feb 2023 22:49:29 -0500 Subject: [PATCH 10/15] tentative fix for ppa build error --- Packaging.md | 24 ++++++++++++++++++++++++ debian/changelog | 8 ++++---- devLib/gertboard.c | 2 ++ devLib/piFace.c | 3 ++- 4 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 Packaging.md diff --git a/Packaging.md b/Packaging.md new file mode 100644 index 0000000..4f285ff --- /dev/null +++ b/Packaging.md @@ -0,0 +1,24 @@ +# Instructions + +## Build binary + +`bzr builddeb -- -us -uc` + +## Cleanup + +`rm *.deb *.ddeb *.buildinfo *.changes *.dsc *.tar.gz *.upload` + +## Rename all files + +``` +pwsh +gci -Recurse *wiringpi* | Rename-Item -NewName {$_.Name.Replace("wiringpi","wiringpi-opi")} +``` + +## Build from Source + +``` +bzr builddeb -S +dput wiringpi-opi_2.27~iwj_source.changes +``` + diff --git a/debian/changelog b/debian/changelog index 8442fec..0907524 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ wiringpi-opi (2.27~iwj) jammy; urgency=low -* Reworked package with official changes from Orange Pi + * Reworked package with official changes from Orange Pi --- Erik P Sat, 18 Feb 2023 18:31:35 +0100 + -- Erik P Sat, 18 Feb 2023 18:31:35 +0100 wiringpi-opi (2.26~iwj) rpi-unstable; urgency=low -* Initial version with real Debian source package build. + * Initial version with real Debian source package build. --- Ian Jackson Sat, 12 Sep 2015 18:31:35 +0100 + -- Ian Jackson Sat, 12 Sep 2015 18:31:35 +0100 diff --git a/devLib/gertboard.c b/devLib/gertboard.c index 6a84415..96aae54 100644 --- a/devLib/gertboard.c +++ b/devLib/gertboard.c @@ -33,7 +33,9 @@ #include +#include #include +#include #include #include #include diff --git a/devLib/piFace.c b/devLib/piFace.c index 4475c7f..6e5cd0f 100644 --- a/devLib/piFace.c +++ b/devLib/piFace.c @@ -26,8 +26,9 @@ #include +#include #include - +#include #include #include From 97892f4cd4676518d66021ab95cb76b1a48e6db5 Mon Sep 17 00:00:00 2001 From: Erik Date: Sat, 18 Feb 2023 23:31:18 -0500 Subject: [PATCH 11/15] updated include path to fix launchpad build --- devLib/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devLib/Makefile b/devLib/Makefile index 7f313dc..6a30465 100644 --- a/devLib/Makefile +++ b/devLib/Makefile @@ -37,7 +37,7 @@ DYNAMIC=libwiringPiDev.so.$(VERSION) #DEBUG = -g -O0 DEBUG = -O2 CC = gcc -INCLUDE = -I. +INCLUDE = -I$(DESTDIR)$(PREFIX)/include DEFS = -D_GNU_SOURCE CFLAGS = $(DEBUG) $(DEFS) -Wformat=2 -Wall -Winline $(INCLUDE) -pipe -fPIC From 98e5eb6a6f218d63d41ef16263d736d09a30766e Mon Sep 17 00:00:00 2001 From: Erik Date: Sun, 19 Feb 2023 11:58:51 -0500 Subject: [PATCH 12/15] updated package names --- debian/changelog | 14 ++++++++++++- debian/control | 2 +- ...-opi2.install => libwiringpi2-opi.install} | 0 ...pi-opi2.shlibs => libwiringpi2-opi.shlibs} | 0 wiringPiD/Makefile | 20 +++++++++---------- 5 files changed, 24 insertions(+), 12 deletions(-) rename debian/{libwiringpi-opi2.install => libwiringpi2-opi.install} (100%) rename debian/{libwiringpi-opi2.shlibs => libwiringpi2-opi.shlibs} (100%) diff --git a/debian/changelog b/debian/changelog index 0907524..36dd786 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,16 @@ -wiringpi-opi (2.27~iwj) jammy; urgency=low +wiringpi-opi (2.272~iwj) jammy; urgency=low + + * Renamed packages from PR feedback + + -- Erik P Sat, 18 Feb 2023 18:31:35 +0100 + + wiringpi-opi (2.271~iwj) jammy; urgency=low + + * Fixed include path for device library + + -- Erik P Sat, 18 Feb 2023 18:31:35 +0100 + + wiringpi-opi (2.27~iwj) jammy; urgency=low * Reworked package with official changes from Orange Pi diff --git a/debian/control b/debian/control index d769c5f..a86e279 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Standards-Version: 3.8.0 Homepage: http://wiringpi.com/ Build-Depends: debhelper (>= 8) -Package: libwiringpi-opi2 +Package: libwiringpi2-opi Section: libs Architecture: arm64 Depends: ${shlibs:Depends}, ${misc:Depends} diff --git a/debian/libwiringpi-opi2.install b/debian/libwiringpi2-opi.install similarity index 100% rename from debian/libwiringpi-opi2.install rename to debian/libwiringpi2-opi.install diff --git a/debian/libwiringpi-opi2.shlibs b/debian/libwiringpi2-opi.shlibs similarity index 100% rename from debian/libwiringpi-opi2.shlibs rename to debian/libwiringpi2-opi.shlibs diff --git a/wiringPiD/Makefile b/wiringPiD/Makefile index f0e9d79..3df7695 100644 --- a/wiringPiD/Makefile +++ b/wiringPiD/Makefile @@ -41,13 +41,13 @@ LIBS = -lwiringPi -lwiringPiDev -lpthread -lrt -lm -lcrypt # May not need to alter anything below this line ############################################################################### -SRC = wiringpi-opid.c network.c runRemote.c daemonise.c +SRC = wiringpid.c network.c runRemote.c daemonise.c OBJ = $(SRC:.c=.o) -all: wiringpi-opid +all: wiringpid -wiringpi-opid: $(OBJ) +wiringpid: $(OBJ) $Q echo [Link] $Q $(CC) -o $@ $(OBJ) $(LDFLAGS) $(LIBS) @@ -58,7 +58,7 @@ wiringpi-opid: $(OBJ) .PHONY: clean clean: $Q echo "[Clean]" - $Q rm -f $(OBJ) wiringpi-opid *~ core tags *.bak + $Q rm -f $(OBJ) wiringpid *~ core tags *.bak .PHONY: tags tags: $(SRC) @@ -66,11 +66,11 @@ tags: $(SRC) $Q ctags $(SRC) .PHONY: install -install: wiringpi-opid +install: wiringpid $Q echo "[Install]" $Q mkdir -p $(DESTDIR)$(PREFIX)/sbin - $Q cp wiringpi-opid $(DESTDIR)$(PREFIX)/sbin/ - $Q chown root.root $(DESTDIR)$(PREFIX)/sbin/wiringpi-opid + $Q cp wiringpid $(DESTDIR)$(PREFIX)/sbin/ + $Q chown root.root $(DESTDIR)$(PREFIX)/sbin/wiringpid # $Q mkdir -p $(DESTDIR)$(PREFIX)/man/man8 # $Q cp gpio.1 $(DESTDIR)$(PREFIX)/man/man8/ @@ -86,15 +86,15 @@ install-deb: gpio .PHONY: uninstall uninstall: $Q echo "[UnInstall]" - $Q rm -f $(DESTDIR)$(PREFIX)/sbin/wiringpi-opid - $Q rm -f $(DESTDIR)$(PREFIX)/man/man8/wiringpi-opid.8 + $Q rm -f $(DESTDIR)$(PREFIX)/sbin/wiringpid + $Q rm -f $(DESTDIR)$(PREFIX)/man/man8/wiringpid.8 .PHONY: depend depend: makedepend -Y $(SRC) # DO NOT DELETE -wiringpi-opid.o: drcNetCmd.h network.h runRemote.h daemonise.h +wiringpid.o: drcNetCmd.h network.h runRemote.h daemonise.h network.o: network.h runRemote.o: drcNetCmd.h network.h runRemote.h daemonise.o: daemonise.h From 4b27236d93692bf3c4100fdd46669808cb55e3b0 Mon Sep 17 00:00:00 2001 From: Erik Date: Sun, 19 Feb 2023 11:59:26 -0500 Subject: [PATCH 13/15] fixed shlibs --- debian/libwiringpi2-opi.shlibs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/libwiringpi2-opi.shlibs b/debian/libwiringpi2-opi.shlibs index c7b4668..6a3d4de 100644 --- a/debian/libwiringpi2-opi.shlibs +++ b/debian/libwiringpi2-opi.shlibs @@ -1,2 +1,2 @@ -libwiringPi 2 libwiringpi-opi2 -libwiringPiDev 2 libwiringpi-opi2 +libwiringPi 2 libwiringpi2-opi +libwiringPiDev 2 libwiringpi2-opi From e48385fbbaabde4a5a558f8230d6fa70a624598f Mon Sep 17 00:00:00 2001 From: Erik Date: Sun, 19 Feb 2023 12:00:17 -0500 Subject: [PATCH 14/15] fixed dependency --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index a86e279..4933767 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,7 @@ Description: gpio utility for Raspberry Pi Package: libwiringpi-opi-dev Architecture: arm64 -Depends: libwiringpi-opi2 (= ${binary:Version}), libc6-dev, ${misc:Depends} +Depends: libwiringpi2-opi (= ${binary:Version}), libc6-dev, ${misc:Depends} Suggests: wiringpi-opi Description: GPIO development library for Raspberry Pi Development libraries to allow GPIO access on a Raspberry Pi from C From cd57d9ee485e857c1ce35512a96c5834b6663f7e Mon Sep 17 00:00:00 2001 From: Erik Date: Sun, 19 Feb 2023 12:01:51 -0500 Subject: [PATCH 15/15] another package fix --- debian/.gitignore | 2 +- debian/rules | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/.gitignore b/debian/.gitignore index 13989f4..c53a0f6 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -2,7 +2,7 @@ *.substvars tmp wiringpi-opi -libwiringpi-opi2 +libwiringpi2-opi libwiringpi-opi-dev files *.postinst.debhelper diff --git a/debian/rules b/debian/rules index 969c624..1e39052 100755 --- a/debian/rules +++ b/debian/rules @@ -40,7 +40,7 @@ override_dh_auto_install: dh_install set -ex; for l in libwiringPi libwiringPiDev; do \ ln -sf $$l.so.$${VERSION} \ - debian/libwiringpi-opi$$soname/usr/lib/$$l.so.$$soname; \ + debian/libwiringpi$$soname-opi/usr/lib/$$l.so.$$soname; \ ln -sf $$l.so.$${VERSION} \ debian/libwiringpi-opi-dev/usr/lib/$$l.so; \ done