From 521ed841896136a4bb0e0e0710198d3b71c2dba4 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 26 Sep 2015 01:16:49 +0000 Subject: [PATCH] Debian build: Better installation of the examples Put the .sh exaples in wiringpi-tools But, put all the examples in /usr/share/doc/wiringpi/examples no matter which package they're in. Do not compress any of them. Signed-off-by: Ian Jackson --- debian/changelog | 4 ++++ debian/libwiringpi-dev.install | 2 +- debian/rules | 8 ++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 1302acc..5943445 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,10 @@ wiringpi (2.28~iwj1) unstable; urgency=medium will ensure that we detect such mistakes. * Do not install COPYING.LESSER, which is redundant on a Debian derivative (which will have /usr/share/common-licences). + * Better installation of the examples: put the .sh exaples in + wiringpi-tools, but put all the examples in + /usr/share/doc/wiringpi/examples no matter which package they're in; + and do not compress any of them. -- diff --git a/debian/libwiringpi-dev.install b/debian/libwiringpi-dev.install index d7ea901..a8bd6ba 100644 --- a/debian/libwiringpi-dev.install +++ b/debian/libwiringpi-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/wiringpi diff --git a/debian/rules b/debian/rules index af017e4..9a08dfc 100755 --- a/debian/rules +++ b/debian/rules @@ -40,6 +40,11 @@ override_dh_auto_install: override_dh_install: dh_install -X COPYING.LESSER + set -e; cd debian/libwiringpi-dev; \ + for f in `find usr/share/doc -name \*.sh`; do \ + mkdir -p ../wiringpi-tools/$${f%/*}; \ + mv $$f ../wiringpi-tools/$$f; \ + done set -ex; for l in libwiringPi libwiringPiDev; do \ ln -sf $$l.so.$${VERSION} \ debian/libwiringpi$$soname/usr/lib/$$l.so.$$soname; \ @@ -53,5 +58,8 @@ override_dh_fixperms: chown root.root $$b; \ chmod 4755 $$b +override_dh_compress: + dh_compress -Xexamples + %: dh $@ -- 2.30.2