1
0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2025-09-19 17:59:19 +03:00

fix debian package builds (#554)

* fix debian builds

issue described: https://github.com/SoftEtherVPN/SoftEtherVPN/issues/550

* add cmake3 dependency (for ubuntu 14.04)

* "compat" belongs to debian/ subfolder

that file is not needed in root folder

* update debian package version

* compare debian/changelog and src/CurrentBuild.txt
This commit is contained in:
Ilya Shipitsin
2018-06-28 16:23:21 +05:00
committed by Moataz Elmasry
parent 1e8cf1dc5d
commit be0ebb65c1
11 changed files with 54 additions and 12 deletions

4
debian/changelog vendored
View File

@ -1,5 +1,5 @@
softether-vpn (0:4.23.9647) unstable; urgency=low
softether-vpn (0:5.01.9657) unstable; urgency=low
* Updated release version
-- Quintin Beukes <github.com@last.za.net> Thu, 14 Dec 2017 13:41:00 +0000
-- Ilya Shipitsin <chipitsine@gmail.com> Mon, 11 Jun 2018 22:50:39 +05

2
debian/control vendored
View File

@ -2,7 +2,7 @@ Source: softether-vpn
Section: net
Priority: optional
Maintainer: Dmitry Orlov <me@mosquito.su>
Build-Depends: debhelper (>= 7.0.50~), libncurses5-dev, linux-libc-dev, libssl-dev, zlib1g-dev, libreadline-dev, build-essential, cmake, dh-exec
Build-Depends: debhelper (>= 7.0.50~), libncurses5-dev, linux-libc-dev, libssl-dev, zlib1g-dev, libreadline-dev, build-essential, cmake3 | cmake, dh-exec
Standards-Version: 3.9.1
Homepage: http://www.softether.org/

8
debian/rules vendored
View File

@ -1,6 +1,7 @@
#!/usr/bin/make -f
export DH_VERBOSE=1
export CMAKE_INSTALL_PREFIX=`pwd`/../../usr
CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
@ -9,13 +10,14 @@ LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
override_dh_auto_configure: configure_config
override_dh_auto_make:
make -C tmp
override_dh_auto_clean:
rm -fr Makefile* usr bin tmp src/bin/BuiltHamcoreFiles
override_dh_auto_install:
patch -f < debian/makefile.patch
mkdir -p usr/bin
make install
make -C tmp install
configure_config:
if [ $(shell uname -m) = 'x86_64' ]; then echo -e "1\n2\n" | ./configure; fi

View File

@ -1,3 +1,3 @@
#! /usr/bin/dh-exec
debian/bin/vpnbridge usr/bin/
usr/vpnbridge opt/
usr/bin/vpnbridge opt/

View File

@ -1,3 +1,3 @@
#! /usr/bin/dh-exec
debian/bin/vpnclient usr/bin/
usr/vpnclient opt/
usr/bin/vpnclient opt/

View File

@ -1,3 +1,3 @@
#! /usr/bin/dh-exec
debian/bin/vpncmd usr/bin/
usr/vpncmd opt/
usr/bin/vpncmd opt/

View File

@ -1,3 +1,3 @@
#! /usr/bin/dh-exec
debian/bin/vpnserver usr/bin/
usr/vpnserver opt/
usr/bin/vpnserver opt/