Merge of https://github.com/WiringPi/WiringPi

.gitignore

@@ -0,0 +1,7 @@
+*.o
+*.so
+lib*.so.*
+*~
+debian-template/wiringPi
+debian-template/wiringpi-*.deb
+gpio/gpio

VERSION

@@ -1 +1 @@
-2.25
+2.44

build

@@ -1,12 +1,12 @@
-#!/bin/sh
+#!/bin/sh -e
 
 # build
 #	Simple wiringPi build and install script
 #
 #	Copyright (c) 2012-2015 Gordon Henderson
 #################################################################################
 # This file is part of wiringPi:
-#	Wiring Compatable library for the Raspberry Pi
+#	A "wiring" library for the Raspberry Pi
 #
 #    wiringPi is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Lesser General Public License as published by
@@ -43,6 +43,8 @@ check_make_ok() {
   fi
 }
 
+sudo=${WIRINGPI_SUDO-sudo}
+
 if [ x$1 = "xclean" ]; then
   cd wiringPi
   echo -n "wiringPi:   "	; make clean
@@ -60,32 +62,34 @@ if [ x$1 = "xclean" ]; then
   echo -n "Quick2Wire: "	; make clean
   cd ../PiGlow
   echo -n "PiGlow:     "	; make clean
+  cd ../scrollPhat
+  echo -n "scrollPhat: "	; make clean
   exit
 fi
 
 if [ x$1 = "xuninstall" ]; then
   cd wiringPi
-  echo -n "wiringPi: " ; sudo make uninstall
+  echo -n "wiringPi: " ; $sudo make uninstall
   cd ../devLib
-  echo -n "DevLib:   " ; sudo make uninstall
+  echo -n "DevLib:   " ; $sudo make uninstall
   cd ../gpio
-  echo -n "gpio:     " ; sudo make uninstall
+  echo -n "gpio:     " ; $sudo make uninstall
   exit
 fi
 
 # Only if you know what you're doing!
 
 if [ x$1 = "xdebian" ]; then
   here=`pwd`
-  cd debian/wiringPi
+  cd debian-template/wiringPi
   rm -rf usr
   cd $here/wiringPi
   make install-deb
   cd $here/devLib
-  make install-deb
+  make install-deb INCLUDE='-I. -I../wiringPi'
   cd $here/gpio
-  make install-deb
-  cd $here/debian
+  make install-deb INCLUDE='-I../wiringPi -I../devLib' LDFLAGS=-L../debian-template/wiringPi/usr/lib
+  cd $here/debian-template
   fakeroot dpkg-deb --build wiringPi
   mv wiringPi.deb  wiringpi-`cat $here/VERSION`-1.deb
   exit
@@ -121,30 +125,30 @@ fi
   echo
   echo "WiringPi Library"
   cd wiringPi
-  sudo make uninstall
+  $sudo make uninstall
   if [ x$1 = "xstatic" ]; then
     make -j5 static
     check_make_ok
-    sudo make install-static
+    $sudo make install-static
   else
     make -j5
     check_make_ok
-    sudo make install
+    $sudo make install
   fi
   check_make_ok
 
   echo
   echo "WiringPi Devices Library"
   cd ../devLib
-  sudo make uninstall
+  $sudo make uninstall
   if [ x$1 = "xstatic" ]; then
     make -j5 static
     check_make_ok
-    sudo make install-static
+    $sudo make install-static
   else
     make -j5
     check_make_ok
-    sudo make install
+    $sudo make install
   fi
   check_make_ok
 
@@ -153,9 +157,17 @@ fi
   cd ../gpio
   make -j5
   check_make_ok
-  sudo make install
+  $sudo make install
   check_make_ok
 
+# echo
+# echo "wiringPi Daemon"
+# cd ../wiringPiD
+# make -j5
+# check_make_ok
+# $sudo make install
+# check_make_ok
+
 # echo
 # echo "Examples"
 # cd ../examples

debian/.gitignore

@@ -0,0 +1,9 @@
+*.debhelper.log
+*.substvars
+tmp
+wiringpi
+libwiringpi2
+libwiringpi-dev
+files
+*.postinst.debhelper
+*.postrm.debhelper

debian/changelog

@@ -0,0 +1,6 @@
+wiringpi (2.26~iwj) rpi-unstable; urgency=low
+
+  * Initial version with real Debian source package build.
+
+ -- Ian Jackson <[email protected]>  Sat, 12 Sep 2015 18:31:35 +0100
+

debian/compat

@@ -0,0 +1 @@
+8

debian/control

@@ -0,0 +1,29 @@
+Source: wiringpi
+Section: electronics
+Priority: optional
+Maintainer: Ian Jackson <[email protected]>
+Standards-Version: 3.8.0
+Homepage: http://wiringpi.com/
+Build-Depends: debhelper (>= 8)
+
+Package: libwiringpi2
+Section: libs
+Architecture: armhf
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: GPIO librariees for Raspberry Pi (runtime).
+ Runtime for the popular wiringPi library.
+
+Package: wiringpi
+Architecture: armhf
+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
+Architecture: armhf
+Depends: libwiringpi2 (= ${binary:Version}), libc6-dev, ${misc:Depends}
+Suggests: wiringpi
+Description: GPIO development library for Raspberry Pi
+ Development libraries to allow GPIO access on a Raspberry Pi from C
+ and C++ programs.

debian/copyright

@@ -0,0 +1,15 @@
+wiringPi is Copyright (C) 2012-2015 Gordon Henderson.
+
+wiringPi is free software; you can redistribute it and/or modify it
+under the terms of the GNU Lesser General Public License, as published
+by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+wiringPi is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+On all Debian and Raspbian systems, a copy of the GNU Lesser General
+Public License version 3 can be found in
+`/usr/share/common-licenses/LGPL-3'.

debian/libwiringpi-dev.dirs

@@ -0,0 +1,2 @@
+usr/lib
+usr/include

debian/libwiringpi-dev.install

@@ -0,0 +1,3 @@
+debian/tmp/usr/include
+debian/tmp/usr/lib/*.so
+examples		usr/share/doc/libwiringpi-dev

debian/libwiringpi2.install

@@ -0,0 +1 @@
+debian/tmp/usr/lib/lib*.so.*

debian/libwiringpi2.shlibs

@@ -0,0 +1,2 @@
+libwiringPi 2 libwiringpi2
+libwiringPiDev 2 libwiringpi2

debian/rules

@@ -0,0 +1,49 @@
+#!/usr/bin/make -f
+
+.PHONY: build
+
+VERSION:=$(shell cat VERSION)
+export VERSION
+
+soname:=$(shell echo $${VERSION%%.*})
+WIRINGPI_SONAME_SUFFIX:=.$(soname)
+export soname
+export WIRINGPI_SONAME_SUFFIX
+
+build:
+	dh $@
+
+override_dh_auto_configure:
+
+override_dh_prep:
+	dh_prep -Xdebian/tmp
+
+dirs:
+	dh_installdirs -A
+	mkdir debian/tmp
+	set -e; for p in `dh_listpackages`; do \
+		(cd debian/$$p; find -type d) | \
+		(cd debian/tmp; xargs mkdir -p) \
+	done
+
+override_dh_clean:
+	dh_clean
+	WIRINGPI_SUDO= bash -xe ./build clean
+
+override_dh_auto_build: dirs
+	V=1 LDCONFIG=: WIRINGPI_SUDO= WIRINGPI_SUID=0 \
+	    DESTDIR=`pwd`/debian/tmp/usr \
+	    PREFIX= WIRINGPI_SUDO= \
+	    bash -xe ./build
+
+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; \
+		ln -sf $$l.so.$${VERSION} \
+			debian/libwiringpi-dev/usr/lib/$$l.so; \
+	done
+
+%:
+	dh $@

debian/wiringpi.dirs

@@ -0,0 +1 @@
+usr/bin

debian/wiringpi.install

@@ -0,0 +1,4 @@
+debian/tmp/usr/bin
+debian/tmp/usr/man	usr/share
+README.TXT		usr/share/doc/wiringpi
+People			usr/share/doc/wiringpi