Debian build: Have `wiringpi' be a metapackage

Use `wiringpi-tools' as the name of the command line tool package.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/debian/.gitignore b/debian/.gitignore
index 6296064c7916206d303478f7fb43e4bc52d1562e..5145e9a3512bc8ecde09b29b723b6a70eb883292 100644 (file)
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -2,6 +2,7 @@
 *.substvars
 tmp
 wiringpi
+wiringpi-tools
 libwiringpi2
 libwiringpi-dev
 files

diff --git a/debian/changelog b/debian/changelog
index 19f972d1b922bca96617969ad85e9668acfb0c66..6f0dec768abec8ad495466c5a1aac7b7f782fe24 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ wiringpi (2.28~iwj1) unstable; urgency=medium
 
   * Make `./build debian' do a true Debian source package based
     build; provide the old style build as `./build debian-template'
+  * Have `wiringpi' be a metapackage, and use `wiringpi-tools' as
+    the name of the command line tool package.
 
  --
 

diff --git a/debian/control b/debian/control
index 1d6d228ee68fe416d3d7d6c0d6299fe389b3659d..4f511114062c516919b4c53ed9037b1a285c19ec 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,16 @@ Standards-Version: 3.8.0
 Homepage: http://wiringpi.com/
 Build-Depends: debhelper (>= 8)
 
+Package: wiringpi
+Architecture: all
+Depends: libwiringpi2, wiringpi-tools
+Description: gpio support for Raspberry Pi
+ The wiringPi gpio utility and libraries, for GPIO access on a
+ Raspberry Pi from the command line and from C programs.
+ .
+ This metapackage is provided to make it convenient to install
+ the full suite, and also for compatibility.
+
 Package: libwiringpi2
 Section: libs
 Architecture: armhf
@@ -13,7 +23,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: GPIO librariees for Raspberry Pi (runtime).
  Runtime for the popular wiringPi library.
 
-Package: wiringpi
+Package: wiringpi-tools
 Architecture: armhf
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: gpio utility for Raspberry Pi

diff --git a/debian/wiringpi.dirs b/debian/wiringpi-tools.dirs
similarity index 100%
rename from debian/wiringpi.dirs
rename to debian/wiringpi-tools.dirs

diff --git a/debian/wiringpi-tools.install b/debian/wiringpi-tools.install
new file mode 100644 (file)
index 0000000..e13fcf4
--- /dev/null
+++ b/debian/wiringpi-tools.install
@@ -0,0 +1,4 @@
+debian/tmp/usr/bin
+debian/tmp/usr/man     usr/share
+README.TXT             usr/share/doc/wiringpi-tools
+People                 usr/share/doc/wiringpi-tools

diff --git a/debian/wiringpi.install b/debian/wiringpi.install
deleted file mode 100644 (file)
index 41ae22d..0000000
--- a/debian/wiringpi.install
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/tmp/usr/bin
-debian/tmp/usr/man     usr/share
-README.TXT             usr/share/doc/wiringpi
-People                 usr/share/doc/wiringpi