From ec8e1178e5cfbe9cd790928dd06562af734a2d48 Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Fri, 17 Mar 2017 19:16:34 -0700
Subject: Version bumps, and fix Debian so default is to build normally and
 .static files are used in our builds.

---
 debian/changelog           |  6 ++++++
 debian/rules               |  2 +-
 debian/rules.static        | 16 ++++++++++++++++
 debian/rules.wheezy        |  2 +-
 debian/rules.wheezy.static | 11 +++++++++++
 5 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 debian/rules.static
 create mode 100644 debian/rules.wheezy.static

(limited to 'debian')

diff --git a/debian/changelog b/debian/changelog
index 86049d04..2bfb98c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+zerotier-one (1.2.2) unstable; urgency=medium
+
+  * See https://github.com/zerotier/ZeroTierOne for release notes.
+
+ -- Adam Ierymenko <adam.ierymenko@zerotier.com>  Fri, 17 Mar 2017 01:00:00 -0700
+
 zerotier-one (1.2.0) unstable; urgency=medium
 
   * See https://github.com/zerotier/ZeroTierOne for release notes.
diff --git a/debian/rules b/debian/rules
index 72c52955..0ef81e05 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ CXXFLAGS=-O3 -fstack-protector-strong
 	dh $@ --with systemd
 
 override_dh_auto_build:
-#	make -j 2
+	make -j 2
 
 override_dh_systemd_start:
 	dh_systemd_start --restart-after-upgrade
diff --git a/debian/rules.static b/debian/rules.static
new file mode 100644
index 00000000..72c52955
--- /dev/null
+++ b/debian/rules.static
@@ -0,0 +1,16 @@
+#!/usr/bin/make -f
+
+CFLAGS=-O3 -fstack-protector-strong
+CXXFLAGS=-O3 -fstack-protector-strong
+
+%:
+	dh $@ --with systemd
+
+override_dh_auto_build:
+#	make -j 2
+
+override_dh_systemd_start:
+	dh_systemd_start --restart-after-upgrade
+
+override_dh_installinit:
+	dh_installinit --name=zerotier-one -- defaults
diff --git a/debian/rules.wheezy b/debian/rules.wheezy
index 0165be37..55e2647a 100755
--- a/debian/rules.wheezy
+++ b/debian/rules.wheezy
@@ -7,5 +7,5 @@ CXXFLAGS=-O3 -fstack-protector
 	dh $@
 
 override_dh_auto_build:
-#	make -j 2
+	make -j 2
 
diff --git a/debian/rules.wheezy.static b/debian/rules.wheezy.static
new file mode 100644
index 00000000..0165be37
--- /dev/null
+++ b/debian/rules.wheezy.static
@@ -0,0 +1,11 @@
+#!/usr/bin/make -f
+
+CFLAGS=-O3 -fstack-protector
+CXXFLAGS=-O3 -fstack-protector
+
+%:
+	dh $@
+
+override_dh_auto_build:
+#	make -j 2
+
-- 
cgit v1.2.3