diff options
| author | René Mayrhofer <rene@mayrhofer.eu.org> | 2011-05-25 10:18:38 +0200 |
|---|---|---|
| committer | René Mayrhofer <rene@mayrhofer.eu.org> | 2011-05-25 10:18:38 +0200 |
| commit | 1e3b287c0c781b0657f3056bd8b211e765ff0b37 (patch) | |
| tree | ee40927e0f0179c6a40c4d0c1f562cb0a076a47b /debian | |
| parent | 231adad58f22e62109da3c6672d8f5f6a8092d7c (diff) | |
| download | vyos-strongswan-1e3b287c0c781b0657f3056bd8b211e765ff0b37.tar.gz vyos-strongswan-1e3b287c0c781b0657f3056bd8b211e765ff0b37.zip | |
Install missing files and ignore those we don't want to install
Diffstat (limited to 'debian')
| -rwxr-xr-x | debian/rules | 5 | ||||
| -rw-r--r-- | debian/strongswan-nm.dirs | 1 | ||||
| -rw-r--r-- | debian/strongswan-starter.install | 1 |
3 files changed, 5 insertions, 2 deletions
diff --git a/debian/rules b/debian/rules index c03f49c35..b0ec84d8a 100755 --- a/debian/rules +++ b/debian/rules @@ -93,8 +93,6 @@ install: build-stamp dh_installdirs $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp - # install files from debian/tmp into proper package dirs - dh_install --fail-missing # special handling for padlock, as it is only built on i386 ifeq ($(DEB_BUILD_ARCH_CPU),i386) install $(CURDIR)/debian/tmp/usr/lib/ipsec/plugins/libstrongswan-padlock.so* $(CURDIR)/debian/libstrongswan/usr/lib/ipsec/plugins/ @@ -102,6 +100,9 @@ endif # and special handling for network-manager files - only install when built install $(CURDIR)/debian/tmp/usr/lib/ipsec/plugins/libstrongswan-nm.so* $(CURDIR)/debian/strongswan-nm/usr/lib/ipsec/plugins/ + # install files from debian/tmp into proper package dirs + dh_install --fail-missing -X\.la -X\.a -Xmedsrv -Xman3 + # and additional files not covered by upstream makefile... install --mode=0600 $(CURDIR)/debian/ipsec.secrets.proto $(CURDIR)/debian/strongswan-starter/etc/ipsec.secrets # also "patch" ipsec.conf to include the debconf-managed file diff --git a/debian/strongswan-nm.dirs b/debian/strongswan-nm.dirs new file mode 100644 index 000000000..d00915ff0 --- /dev/null +++ b/debian/strongswan-nm.dirs @@ -0,0 +1 @@ +/usr/lib/ipsec/plugins diff --git a/debian/strongswan-starter.install b/debian/strongswan-starter.install index d9ca65ca9..0bf97c02f 100644 --- a/debian/strongswan-starter.install +++ b/debian/strongswan-starter.install @@ -7,6 +7,7 @@ etc/ipsec.conf etc/ usr/share/man/man8/ipsec.8 usr/share/man/man8/ usr/share/man/man5/ipsec.conf.5 usr/share/man/man5/ usr/share/man/man5/ipsec.secrets.5 usr/share/man/man5/ +usr/share/man/man5/strongswan.conf.5 usr/share/man/man5/ # updown usr/lib/ipsec/plugins/libstrongswan-updown.so* usr/lib/ipsec/plugins/ usr/lib/ipsec/_updown usr/lib/ipsec/ |