Merge PR #609: another attempt to fix launchpad builds

.travis.yml

@@ -8,7 +8,7 @@ env:
 
 matrix:
   include:
-    - env: OPENSSL_VERSION="1.0.2o"
+    - env: OPENSSL_VERSION="1.0.2o" BUILD_DEB="1"
       os: linux
       compiler: gcc
     - env: OPENSSL_VERSION="1.1.0f"
@@ -40,7 +40,7 @@ matrix:
 
 addons:
   apt:
-    packages: [ debhelper ]
+    packages: [ debhelper, devscripts, fakeroot, cmake3, dh-exec ]
 
 cache:
   directories:
@@ -58,4 +58,4 @@ script:
   - ./configure
   - make -C tmp
   - ldd bin/vpnserver/vpnserver
-  - dh build-arch
+  - if [ "${BUILD_DEB}" = "1" ]; then debuild -i -us -uc -b; fi

debian/rules

@@ -1,8 +1,9 @@
 #!/usr/bin/make -f
 
 define generate_stub
+	mkdir -p debian/usr/bin
 	echo '#!/bin/sh'                              > debian/usr/bin/$(1)
-	echo '/usr/libexec/softether/$(1)/$(1) "$@"' >> debian/usr/bin/$(1)
+	echo '/usr/libexec/softether/$(1)/$(1) "$$@"' >> debian/usr/bin/$(1)
 	echo 'exit $?'                               >> debian/usr/bin/$(1)
 	chmod +x debian/usr/bin/$(1)
 endef
@@ -13,10 +14,11 @@ export export CMAKE_INSTALL_PREFIX=../debian/usr
 %:
 	dh $@ 
 
-override_dh_auto_make:
-	make -C tmp
+override_dh_auto_configure:
+	cmake .
 
 override_dh_auto_install:
+	dh_auto_install
 	$(call generate_stub,vpnserver)
 	$(call generate_stub,vpnbridge)
 	$(call generate_stub,vpncmd)

debian/softether-vpnbridge.install

@@ -1,5 +1,5 @@
 #! /usr/bin/dh-exec
-debian/usr/libexec/softether/vpnbridge/vpnbridge  usr/libexec/softether/vpnbridge/
-debian/usr/libexec/softether/vpnbridge/hamcore.se2  usr/libexec/softether/vpnbridge/
+debian/tmp/usr/local/libexec/softether/vpnbridge/vpnbridge usr/libexec/softether/vpnbridge/
+debian/tmp/usr/local/libexec/softether/vpnbridge/hamcore.se2  usr/libexec/softether/vpnbridge/
 debian/usr/bin/vpnbridge usr/bin/
 

debian/softether-vpnclient.install

@@ -1,5 +1,5 @@
 #! /usr/bin/dh-exec
-debian/usr/libexec/softether/vpnclient/vpnclient  usr/libexec/softether/vpnclient/
-debian/usr/libexec/softether/vpnclient/hamcore.se2  usr/libexec/softether/vpnclient/
+debian/tmp/usr/local/libexec/softether/vpnclient/vpnclient  usr/libexec/softether/vpnclient/
+debian/tmp/usr/local/libexec/softether/vpnclient/hamcore.se2  usr/libexec/softether/vpnclient/
 debian/usr/bin/vpnclient usr/bin/
 

debian/softether-vpncmd.install

@@ -1,5 +1,4 @@
 #! /usr/bin/dh-exec
-debian/usr/libexec/softether/vpncmd/vpncmd  usr/libexec/softether/vpncmd/
-debian/usr/libexec/softether/vpncmd/hamcore.se2  usr/libexec/softether/vpncmd/
-debian/usr/bin/vpncmd usr/bin/
-
+debian/tmp/usr/local/libexec/softether/vpncmd/vpncmd  usr/libexec/softether/vpncmd/
+debian/tmp/usr/local/libexec/softether/vpncmd/hamcore.se2  usr/libexec/softether/vpncmd/
+debian/tmp/usr/local/bin/vpncmd usr/bin/

debian/softether-vpnserver.install

@@ -1,5 +1,4 @@
 #! /usr/bin/dh-exec
-debian/usr/libexec/softether/vpnserver/vpnserver  usr/libexec/softether/vpnserver/
-debian/usr/libexec/softether/vpnserver/hamcore.se2  usr/libexec/softether/vpnserver/
+debian/tmp/usr/local/libexec/softether/vpnserver/vpnserver  usr/libexec/softether/vpnserver/
+debian/tmp/usr/local/libexec/softether/vpnserver/hamcore.se2  usr/libexec/softether/vpnserver/
 debian/usr/bin/vpnserver usr/bin/
-