diff options
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/examples | 7 | ||||
| -rwxr-xr-x | debian/rules | 28 |
3 files changed, 18 insertions, 19 deletions
diff --git a/debian/control b/debian/control index 746f5dc..0537110 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: net Priority: optional Maintainer: Alberto Gonzalez Iniesta <agi@inittab.org> Build-Depends: debhelper (>= 7.0.50~), libssl-dev (>> 0.9.8g-9), liblzo2-dev, libpam0g-dev, libpkcs11-helper1-dev -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Homepage: http://www.openvpn.net/ Package: openvpn diff --git a/debian/examples b/debian/examples index 85c5473..8d638f7 100644 --- a/debian/examples +++ b/debian/examples @@ -1,4 +1,3 @@ -sample-config-files/ -sample-keys/ -easy-rsa/ -sample-scripts/ +sample/sample-config-files/ +sample/sample-keys/ +sample/sample-scripts/ diff --git a/debian/rules b/debian/rules index 24428db..f8b271c 100755 --- a/debian/rules +++ b/debian/rules @@ -22,8 +22,8 @@ override_dh_auto_build: # The one shipped in the tarball gets rebuild (chaging /bin/sh in some cases) sed -i -e '1s%.*%#!/bin/sh%' tests/t_client.sh # make plugins -# $(MAKE) -C plugin/auth-pam/ $(shell dpkg-buildflags --export=configure) -# $(MAKE) -C plugin/down-root/ $(shell dpkg-buildflags --export=configure) + # $(MAKE) -C plugin/auth-pam/ $(shell dpkg-buildflags --export=configure) + # $(MAKE) -C plugin/down-root/ $(shell dpkg-buildflags --export=configure) # we may not want to run dh_auto_test #override_dh_auto_test: @@ -37,24 +37,24 @@ override_dh_auto_clean: -test -f distro/rpm/openvpn.spec.not && mv distro/rpm/openvpn.spec.not distro/rpm/openvpn.spec -test -f tests/t_client.sh.not && mv tests/t_client.sh.not tests/t_client.sh # clean plugins -# $(MAKE) -C plugin/auth-pam/ clean -# $(MAKE) -C plugin/down-root/ clean + # $(MAKE) -C plugin/auth-pam/ clean + # $(MAKE) -C plugin/down-root/ clean override_dh_clean: dh_clean -X win/openvpn.nsi.orig override_dh_auto_install: dh_auto_install - install -m 755 sample/sample-scripts/verify-cn $(CURDIR)/debian/openvpn/usr/share/openvpn + # install -m 755 sample/sample-scripts/verify-cn $(CURDIR)/debian/openvpn/usr/share/openvpn install -m 755 debian/openvpn.if-up.d $(CURDIR)/debian/openvpn/etc/network/if-up.d/openvpn install -m 755 debian/openvpn.if-down.d $(CURDIR)/debian/openvpn/etc/network/if-down.d/openvpn -# #install plugins -# install -m 644 plugin/auth-pam/openvpn-auth-pam.so $(CURDIR)/debian/openvpn/usr/lib/openvpn -# install -m 644 plugin/down-root/openvpn-down-root.so $(CURDIR)/debian/openvpn/usr/lib/openvpn -# install -m 644 plugin/auth-pam/README $(CURDIR)/debian/openvpn/usr/share/doc/openvpn/README.auth-pam -# install -m 644 plugin/down-root/README $(CURDIR)/debian/openvpn/usr/share/doc/openvpn/README.down-root -# # intall plugin headers -# install -m 644 openvpn-plugin.h $(CURDIR)/debian/openvpn/usr/include/openvpn/openvpn-plugin.h + # #install plugins + # install -m 644 plugin/auth-pam/openvpn-auth-pam.so $(CURDIR)/debian/openvpn/usr/lib/openvpn + # install -m 644 plugin/down-root/openvpn-down-root.so $(CURDIR)/debian/openvpn/usr/lib/openvpn + # install -m 644 plugin/auth-pam/README $(CURDIR)/debian/openvpn/usr/share/doc/openvpn/README.auth-pam + # install -m 644 plugin/down-root/README $(CURDIR)/debian/openvpn/usr/share/doc/openvpn/README.down-root + # # intall plugin headers + # install -m 644 openvpn-plugin.h $(CURDIR)/debian/openvpn/usr/include/openvpn/openvpn-plugin.h # resolvconf script install -m 755 debian/update-resolv-conf $(CURDIR)/debian/openvpn/etc/openvpn/update-resolv-conf # bash completion @@ -65,8 +65,8 @@ override_dh_installexamples: ## remove windoze stuff rm -rf $(CURDIR)/debian/openvpn/usr/share/doc/openvpn/examples/easy-rsa/Windows # clean permissions to make lintian happy - chmod a-x $(CURDIR)/debian/openvpn/usr/share/doc/openvpn/examples/easy-rsa/2.0/vars - chmod a-x $(CURDIR)/debian/openvpn/usr/share/doc/openvpn/examples/easy-rsa/2.0/openssl-*.cnf + # chmod a-x $(CURDIR)/debian/openvpn/usr/share/doc/openvpn/examples/easy-rsa/2.0/vars + # chmod a-x $(CURDIR)/debian/openvpn/usr/share/doc/openvpn/examples/easy-rsa/2.0/openssl-*.cnf override_dh_installinit: dh_installinit --no-start -- defaults 16 80 |