# HG changeset patch
# User Ivo Smits <Ivo@UFO-Net.nl>
# Date 1485291542 -3600
# Node ID e0bd3a4993c220ee7df6ddc3477edeadd712cbcb
# Parent  fa53d1c548864c699b729c590c4a8d51da1be3a4
Release version 2.2.5 with small changes for debian packaging

diff -r fa53d1c54886 -r e0bd3a4993c2 build.sh
--- a/build.sh	Sat Jan 07 18:07:27 2017 +0100
+++ b/build.sh	Tue Jan 24 21:59:02 2017 +0100
@@ -23,8 +23,10 @@
 rm -rf out/ obj/ tmp/
 
 mkdir -p out
-echo Creating source archive...
-$tar --transform "s,^,quicktun-`cat version`/," -czf "out/quicktun-`cat version`.tgz" build.sh clean.sh debian src version --exclude "debian/data"
+if [ "$1" != "debian" ]; then
+	echo Creating source archive...
+	$tar --transform "s,^,quicktun-`cat version`/," -czf "out/quicktun-`cat version`.tgz" build.sh clean.sh debian src version --exclude "debian/data"
+fi
 
 mkdir -p obj tmp tmp/include tmp/lib
 
@@ -32,7 +34,7 @@
 
 echo '#include <sodium/crypto_box_curve25519xsalsa20poly1305.h>' > tmp/libtest1.c
 echo '#include <nacl/crypto_box_curve25519xsalsa20poly1305.h>' > tmp/libtest2.c
-if $cc -shared -lsodium tmp/libtest1.c -o tmp/libtest 2>/dev/null; then
+if [ "$1" = "debian" ] || $cc -shared -lsodium tmp/libtest1.c -o tmp/libtest 2>/dev/null; then
 	echo Using shared libsodium.
 	echo '#include <sodium/crypto_box_curve25519xsalsa20poly1305.h>' > tmp/include/crypto_box_curve25519xsalsa20poly1305.h
 	echo '#include <sodium/crypto_scalarmult_curve25519.h>' > tmp/include/crypto_scalarmult_curve25519.h
@@ -74,11 +76,11 @@
 $cc $CFLAGS -o out/quicktun.salty	src/proto.salty.c	-l$CRYPTLIB	$LDFLAGS
 $cc $CFLAGS -o out/quicktun.keypair	src/keypair.c		-l$CRYPTLIB	$LDFLAGS
 
-if [ -f /etc/network/interfaces ]; then
+if [ -f /etc/network/interfaces -o "$1" = "debian" ]; then
 	echo Building debian binary...
 	$cc $CFLAGS -c -DCOMBINED_BINARY -DDEBIAN_BINARY src/run.combined.c -o obj/run.debian.o
 	$cc $CFLAGS -o out/quicktun.debian obj/common.o obj/run.debian.o obj/proto.raw.o obj/proto.nacl0.o obj/proto.nacltai.o obj/proto.salty.o -l$CRYPTLIB $LDFLAGS
-	if [ -x /usr/bin/dpkg-deb -a -x /usr/bin/fakeroot ]; then
+	if [ "$1" != "debian" -a -x /usr/bin/dpkg-deb -a -x /usr/bin/fakeroot ]; then
 		echo -n Building debian package...
 		cd debian
 		./build.sh
diff -r fa53d1c54886 -r e0bd3a4993c2 version
--- a/version	Sat Jan 07 18:07:27 2017 +0100
+++ b/version	Tue Jan 24 21:59:02 2017 +0100
@@ -1,1 +1,1 @@
-2.2.4
+2.2.5