summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/compat2
-rw-r--r--debian/libstrongswan.dirs5
-rw-r--r--debian/libstrongswan.install16
-rw-r--r--debian/strongswan-ikev1.install6
-rw-r--r--debian/strongswan-ikev2.install17
-rw-r--r--debian/strongswan-starter.dirs (renamed from debian/strongswan.dirs)6
-rw-r--r--debian/strongswan-starter.install14
7 files changed, 33 insertions, 33 deletions
diff --git a/debian/compat b/debian/compat
index 7ed6ff82d..7f8f011eb 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/libstrongswan.dirs b/debian/libstrongswan.dirs
new file mode 100644
index 000000000..0a2e0a6f0
--- /dev/null
+++ b/debian/libstrongswan.dirs
@@ -0,0 +1,5 @@
+/etc/logcheck/ignore.d.paranoid
+/etc/logcheck/ignore.d.server
+/etc/logcheck/ignore.d.workstation
+/etc/logcheck/violations.ignore.d
+/usr/share/lintian/overrides
diff --git a/debian/libstrongswan.install b/debian/libstrongswan.install
index 9c2a6659b..c1a169e23 100644
--- a/debian/libstrongswan.install
+++ b/debian/libstrongswan.install
@@ -1,9 +1,11 @@
usr/lib/libstrongswan.so* usr/lib/
-usr/lib/strongswan/plugins/libstrongswan-x509.so* usr/lib/strongswan/plugins/
-usr/lib/strongswan/plugins/libstrongswan-pubkey.so* usr/lib/strongswan/plugins/
-usr/lib/strongswan/plugins/libstrongswan-hmac.so* usr/lib/strongswan/plugins/
-usr/lib/strongswan/plugins/libstrongswan-xcbc.so* usr/lib/strongswan/plugins/
-usr/lib/strongswan/plugins/libstrongswan-random.so* usr/lib/strongswan/plugins/
-usr/lib/strongswan/plugins/libstrongswan-openssl.so* usr/lib/strongswan/plugins/
-usr/lib/strongswan/plugins/libstrongswan-padlock.so* usr/lib/strongswan/plugins/
+usr/lib/ipsec/plugins/libstrongswan-kernel-netlink.so* usr/lib/ipsec/plugins/
+usr/lib/ipsec/plugins/libstrongswan-gmp.so* usr/lib/ipsec/plugins/
+usr/lib/ipsec/plugins/libstrongswan-x509.so* usr/lib/ipsec/plugins/
+usr/lib/ipsec/plugins/libstrongswan-pubkey.so* usr/lib/ipsec/plugins/
+usr/lib/ipsec/plugins/libstrongswan-hmac.so* usr/lib/ipsec/plugins/
+usr/lib/ipsec/plugins/libstrongswan-xcbc.so* usr/lib/ipsec/plugins/
+usr/lib/ipsec/plugins/libstrongswan-random.so* usr/lib/ipsec/plugins/
+usr/lib/ipsec/plugins/libstrongswan-openssl.so* usr/lib/ipsec/plugins/
+usr/lib/ipsec/plugins/libstrongswan-padlock.so* usr/lib/ipsec/plugins/
etc/strongswan.conf etc/
diff --git a/debian/strongswan-ikev1.install b/debian/strongswan-ikev1.install
index 1ac8dce5a..8d4a824ca 100644
--- a/debian/strongswan-ikev1.install
+++ b/debian/strongswan-ikev1.install
@@ -1,4 +1,4 @@
-usr/lib/strongswan/pluto usr/lib/strongswan/
-usr/lib/strongswan/_pluto_adns usr/lib/strongswan/
-usr/lib/strongswan/whack usr/lib/strongswan/
+usr/lib/ipsec/pluto usr/lib/ipsec/
+usr/lib/ipsec/_pluto_adns usr/lib/ipsec/
+usr/lib/ipsec/whack usr/lib/ipsec/
usr/share/man/man8/pluto.8 usr/share/man/man8/
diff --git a/debian/strongswan-ikev2.install b/debian/strongswan-ikev2.install
index 6827b7d6f..d056e3ebb 100644
--- a/debian/strongswan-ikev2.install
+++ b/debian/strongswan-ikev2.install
@@ -1,9 +1,8 @@
-usr/lib/strongswan/charon usr/lib/strongswan/
-usr/lib/strongswan/plugins/libstrongswan-kernel-netlink.so* usr/lib/strongswan/plugins/
-usr/lib/strongswan/plugins/libstrongswan-eapgtc.so* usr/lib/strongswan/plugins/
-usr/lib/strongswan/plugins/libstrongswan-eapidentity.so* usr/lib/strongswan/plugins/
-usr/lib/strongswan/plugins/libstrongswan-eapmd5.so* usr/lib/strongswan/plugins/
-usr/lib/strongswan/plugins/libstrongswan-eapmschapv2.so* usr/lib/strongswan/plugins/
-usr/lib/strongswan/plugins/libstrongswan-agent.so* usr/lib/strongswan/plugins/
-usr/lib/strongswan/plugins/libstrongswan-curl.so* usr/lib/strongswan/plugins/
-usr/lib/strongswan/plugins/libstrongswan-ldap.so* usr/lib/strongswan/plugins/
+usr/lib/ipsec/charon usr/lib/ipsec/
+usr/lib/ipsec/plugins/libstrongswan-kernel-netlink.so* usr/lib/ipsec/plugins/
+usr/lib/ipsec/plugins/libstrongswan-eap*.so* usr/lib/ipsec/plugins/
+usr/lib/ipsec/plugins/libstrongswan-agent.so* usr/lib/ipsec/plugins/
+usr/lib/ipsec/plugins/libstrongswan-curl.so* usr/lib/ipsec/plugins/
+usr/lib/ipsec/plugins/libstrongswan-ldap.so* usr/lib/ipsec/plugins/
+usr/lib/ipsec/plugins/libstrongswan-medsrv.so* usr/lib/ipsec/plugins/
+usr/lib/ipsec/plugins/libstrongswan-medcli.so* usr/lib/ipsec/plugins/
diff --git a/debian/strongswan.dirs b/debian/strongswan-starter.dirs
index b3075d85b..ca35d4a43 100644
--- a/debian/strongswan.dirs
+++ b/debian/strongswan-starter.dirs
@@ -6,11 +6,5 @@
/etc/ipsec.d/private
/etc/ipsec.d/policies
/etc/init.d
-/etc/logcheck/ignore.d.paranoid
-/etc/logcheck/ignore.d.server
-/etc/logcheck/ignore.d.workstation
-/etc/logcheck/violations.ignore.d
-/usr/sbin
-/usr/share/lintian/overrides
/var/lock/subsys
/var/lib/strongswan
diff --git a/debian/strongswan-starter.install b/debian/strongswan-starter.install
index 60de34d5a..1bfa8f58c 100644
--- a/debian/strongswan-starter.install
+++ b/debian/strongswan-starter.install
@@ -10,16 +10,16 @@ usr/share/man/man8/_copyright.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/
# updown
-usr/lib/strongswan/plugins/libstrongswan-updown.so* usr/lib/strongswan/plugins/
-usr/lib/strongswan/_updown usr/lib/strongswan/
-usr/lib/strongswan/_updown_espmark usr/lib/strongswan/
+usr/lib/ipsec/plugins/libstrongswan-updown.so* usr/lib/ipsec/plugins/
+usr/lib/ipsec/_updown usr/lib/ipsec/
+usr/lib/ipsec/_updown_espmark usr/lib/ipsec/
usr/share/man/man8/_updown.8 usr/share/man/man8/
usr/share/man/man8/_updown_espmark.8 usr/share/man/man8/
# tools
-usr/lib/strongswan/scepclient usr/lib/strongswan/
-usr/lib/strongswan/openac usr/lib/strongswan/
+usr/lib/ipsec/scepclient usr/lib/ipsec/
+usr/lib/ipsec/openac usr/lib/ipsec/
usr/share/man/man8/scepclient.8 usr/share/man/man8/
usr/share/man/man8/openac.8 usr/share/man/man8/
# stroke
-usr/lib/strongswan/stroke usr/lib/strongswan/
-usr/lib/strongswan/plugins/libstrongswan-stroke.so* usr/lib/strongswan/plugins/
+usr/lib/ipsec/stroke usr/lib/ipsec/
+usr/lib/ipsec/plugins/libstrongswan-stroke.so* usr/lib/ipsec/plugins/