From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 12 Sep 2015 17:25:39 +0000 (+0000)
Subject: Build system: Move template-based debian build into debian-template
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=wiringPi.git;a=commitdiff_plain;h=ac0f074ff7b79eb5201fdbbb5a44200ada2a6f99

Build system: Move template-based debian build into debian-template

We are going to want to introduce a real Debian source package build
system.  But that needs to contain a lot of things in debian/ which
ought not to appear in the .deb made by the existing ad-hoc `./build
debian' arrangements, which we want to keep so as not to unduly
disturb existing users.

So rename the whole debian/ directory to debian-template/ and change
all references in the build system.

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

diff --git a/.gitignore b/.gitignore
index c1855e9..ed2ec80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,6 @@
 *.so
 lib*.so.*
 *~
-debian/wiringPi
-debian/wiringpi-*.deb
+debian-template/wiringPi
+debian-template/wiringpi-*.deb
 gpio/gpio
diff --git a/build b/build
index 00a366b..524c14a 100755
--- a/build
+++ b/build
@@ -77,15 +77,15 @@ fi
 
 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 INCLUDE='-I. -I../wiringPi'
   cd $here/gpio
-  make install-deb INCLUDE='-I../wiringPi -I../devLib' LDFLAGS=-L../debian/wiringPi/usr/lib
-  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
diff --git a/debian/wiringPi/DEBIAN/control b/debian-template/wiringPi/DEBIAN/control
similarity index 100%
rename from debian/wiringPi/DEBIAN/control
rename to debian-template/wiringPi/DEBIAN/control
diff --git a/debian/wiringPi/DEBIAN/postinst b/debian-template/wiringPi/DEBIAN/postinst
similarity index 100%
rename from debian/wiringPi/DEBIAN/postinst
rename to debian-template/wiringPi/DEBIAN/postinst
diff --git a/debian/wiringPi/DEBIAN/postrm b/debian-template/wiringPi/DEBIAN/postrm
similarity index 100%
rename from debian/wiringPi/DEBIAN/postrm
rename to debian-template/wiringPi/DEBIAN/postrm
diff --git a/devLib/Makefile b/devLib/Makefile
index 5cac38e..48cf3ae 100644
--- a/devLib/Makefile
+++ b/devLib/Makefile
@@ -104,12 +104,12 @@ install-static:	$(STATIC)
 .PHONY:	install-deb
 install-deb:	$(DYNAMIC)
 	$Q echo "[Install Headers: deb]"
-	$Q install -m 0755 -d							~/wiringPi/debian/wiringPi/usr/include
-	$Q install -m 0644 $(HEADERS)						~/wiringPi/debian/wiringPi/usr/include
+	$Q install -m 0755 -d							~/wiringPi/debian-template/wiringPi/usr/include
+	$Q install -m 0644 $(HEADERS)						~/wiringPi/debian-template/wiringPi/usr/include
 	$Q echo "[Install Dynamic Lib: deb]"
-	install -m 0755 -d							~/wiringPi/debian/wiringPi/usr/lib
-	install -m 0755 libwiringPiDev.so.$(VERSION)				~/wiringPi/debian/wiringPi/usr/lib/libwiringPiDev.so.$(VERSION)
-	ln -sf ~/wiringPi/debian/wiringPi/usr/lib/libwiringPiDev.so.$(VERSION)	~/wiringPi/debian/wiringPi/usr/lib/libwiringPiDev.so
+	install -m 0755 -d							~/wiringPi/debian-template/wiringPi/usr/lib
+	install -m 0755 libwiringPiDev.so.$(VERSION)				~/wiringPi/debian-template/wiringPi/usr/lib/libwiringPiDev.so.$(VERSION)
+	ln -sf ~/wiringPi/debian-template/wiringPi/usr/lib/libwiringPiDev.so.$(VERSION)	~/wiringPi/debian-template/wiringPi/usr/lib/libwiringPiDev.so
 
 .PHONY:	uninstall
 uninstall:
diff --git a/gpio/Makefile b/gpio/Makefile
index 82416a7..82a817c 100644
--- a/gpio/Makefile
+++ b/gpio/Makefile
@@ -81,8 +81,8 @@ install: gpio
 .PHONY:	install-deb
 install-deb:	gpio
 	$Q echo "[Install: deb]"
-	$Q install -m 0755 -d							~/wiringPi/debian/wiringPi/usr/bin
-	$Q install -m 0755 gpio							~/wiringPi/debian/wiringPi/usr/bin
+	$Q install -m 0755 -d							~/wiringPi/debian-template/wiringPi/usr/bin
+	$Q install -m 0755 gpio							~/wiringPi/debian-template/wiringPi/usr/bin
 
 .PHONY:	uninstall
 uninstall:
diff --git a/wiringPi/Makefile b/wiringPi/Makefile
index bc8c848..3a1b99f 100644
--- a/wiringPi/Makefile
+++ b/wiringPi/Makefile
@@ -128,12 +128,12 @@ install-static:	$(STATIC)
 .PHONY:	install-deb
 install-deb:	$(DYNAMIC)
 	$Q echo "[Install Headers: deb]"
-	$Q install -m 0755 -d							~/wiringPi/debian/wiringPi/usr/include
-	$Q install -m 0644 $(HEADERS)						~/wiringPi/debian/wiringPi/usr/include
+	$Q install -m 0755 -d							~/wiringPi/debian-template/wiringPi/usr/include
+	$Q install -m 0644 $(HEADERS)						~/wiringPi/debian-template/wiringPi/usr/include
 	$Q echo "[Install Dynamic Lib: deb]"
-	install -m 0755 -d							~/wiringPi/debian/wiringPi/usr/lib
-	install -m 0755 libwiringPi.so.$(VERSION)				~/wiringPi/debian/wiringPi/usr/lib/libwiringPi.so.$(VERSION)
-	ln -sf ~/wiringPi/debian/wiringPi/usr/lib/libwiringPi.so.$(VERSION)	~/wiringPi/debian/wiringPi/usr/lib/libwiringPi.so
+	install -m 0755 -d							~/wiringPi/debian-template/wiringPi/usr/lib
+	install -m 0755 libwiringPi.so.$(VERSION)				~/wiringPi/debian-template/wiringPi/usr/lib/libwiringPi.so.$(VERSION)
+	ln -sf ~/wiringPi/debian-template/wiringPi/usr/lib/libwiringPi.so.$(VERSION)	~/wiringPi/debian-template/wiringPi/usr/lib/libwiringPi.so
 
 .PHONY:	uninstall
 uninstall: