Merge pull request #64 from ahrefs/master

update debian packaging, install init script

7 files changed, 10 insertions, 5 deletions

diff --git a/debian/compat b/debian/compat
new file mode 100644
index 00000000..ec635144
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
index e25dd74e..b3bd5843 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: softether-vpn
 Section: net
 Priority: optional
 Maintainer: Dmitry Orlov <me@mosquito.su>
-Build-Depends: debhelper (>= 7.0.50~), libncurses-dev, linux-libc-dev, libssl-dev, libreadline-dev, build-essential
+Build-Depends: debhelper (>= 7.0.50~), libncurses-dev, linux-libc-dev, libssl-dev, libreadline-dev, build-essential, dh-exec
 Standards-Version: 3.9.1
 Homepage: http://www.softether.org/
 
diff --git a/debian/softether-vpnbridge.install b/debian/softether-vpnbridge.install
index 5d506f28..8ee02007 100755
--- a/debian/softether-vpnbridge.install
+++ b/debian/softether-vpnbridge.install
@@ -1,2 +1,3 @@
+#! /usr/bin/dh-exec
 debian/bin/vpnbridge usr/bin/
 usr/vpnbridge opt/
diff --git a/debian/softether-vpnclient.install b/debian/softether-vpnclient.install
index be384a10..1c22e42a 100755
--- a/debian/softether-vpnclient.install
+++ b/debian/softether-vpnclient.install
@@ -1,2 +1,3 @@
+#! /usr/bin/dh-exec
 debian/bin/vpnclient usr/bin/
 usr/vpnclient opt/
diff --git a/debian/softether-vpncmd.install b/debian/softether-vpncmd.install
index 4b6fbf2b..e6fd6680 100755
--- a/debian/softether-vpncmd.install
+++ b/debian/softether-vpncmd.install
@@ -1,2 +1,3 @@
+#! /usr/bin/dh-exec
 debian/bin/vpncmd usr/bin/
 usr/vpncmd opt/
diff --git a/debian/init.d/vpnserver b/debian/softether-vpnserver.init
index 012e47bd..3a146ae5 100755
--- a/debian/init.d/vpnserver
+++ b/debian/softether-vpnserver.init
@@ -26,12 +26,12 @@ test -x $DAEMON || exit 0
 case "$1" in
   start)
   echo -n "Starting $DESC: $NAME"
-  $DAEMON -start
+  $DAEMON start
   echo "."
   ;;
   stop)
   echo -n "Stopping $DESC: $NAME"
-  $DAEMON -stop
+  $DAEMON stop
   echo "."
   ;;
   #reload)
@@ -54,9 +54,9 @@ case "$1" in
   # just the same as "restart".
   #
   echo -n "Restarting $DESC: $NAME"
-  $DAEMON -stop
+  $DAEMON stop
   sleep 1
-  $DAEMON -start
+  $DAEMON start
   echo "."
   ;;
   *)
diff --git a/debian/softether-vpnserver.install b/debian/softether-vpnserver.install
index c83cedb5..98d5d438 100755
--- a/debian/softether-vpnserver.install
+++ b/debian/softether-vpnserver.install
@@ -1,2 +1,3 @@
+#! /usr/bin/dh-exec
 debian/bin/vpnserver usr/bin/
 usr/vpnserver opt/