summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/control110
-rw-r--r--debian/copyright8
-rw-r--r--debian/info0
-rw-r--r--debian/libstrongswan.dirs2
-rw-r--r--debian/strongswan-starter.dirs6
5 files changed, 84 insertions, 42 deletions
diff --git a/debian/control b/debian/control
index 9f02fcad1..5854beebf 100644
--- a/debian/control
+++ b/debian/control
@@ -3,24 +3,44 @@ Section: net
Priority: optional
Maintainer: strongSwan Maintainers <pkg-swan-devel@lists.alioth.debian.org>
Uploaders: Rene Mayrhofer <rmayr@debian.org>,
- Yves-Alexis Perez <corsac@debian.org>,
- Romain Francoise <rfrancoise@debian.org>
+ Yves-Alexis Perez <corsac@debian.org>,
+ Romain Francoise <rfrancoise@debian.org>
Standards-Version: 3.9.7
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-swan/strongswan.git;a=summary
Vcs-Git: git://anonscm.debian.org/pkg-swan/strongswan.git
-Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.2), libtool, libgmp3-dev,
- libssl-dev (>= 0.9.8), libcurl4-openssl-dev | libcurl3-dev | libcurl2-dev,
- libldap2-dev, libpam0g-dev, libkrb5-dev, bison, flex, bzip2, po-debconf,
- libfcgi-dev, clearsilver-dev, libgcrypt20-dev | libgcrypt11-dev,
- libxml2-dev, libsqlite3-dev, network-manager-dev (>= 0.7) [linux-any],
- libnm-glib-vpn-dev (>= 0.7) [linux-any], libnm-util-dev (>= 0.7) [linux-any],
- gperf, libcap-dev [linux-any], dh-autoreconf, pkg-config,
- libsystemd-dev [linux-any], dh-systemd (>= 1.5), iptables-dev
+Build-Depends: bison,
+ bzip2,
+ clearsilver-dev,
+ debhelper (>= 9),
+ dh-autoreconf,
+ dh-systemd (>= 1.5),
+ dpkg-dev (>= 1.16.2),
+ flex,
+ gperf,
+ iptables-dev,
+ libcap-dev [linux-any],
+ libcurl4-openssl-dev | libcurl3-dev | libcurl2-dev,
+ libfcgi-dev,
+ libgcrypt20-dev | libgcrypt11-dev,
+ libgmp3-dev,
+ libkrb5-dev,
+ libldap2-dev,
+ libnm-glib-vpn-dev (>= 0.7) [linux-any],
+ libnm-util-dev (>= 0.7) [linux-any],
+ libpam0g-dev,
+ libsqlite3-dev,
+ libssl-dev (>= 0.9.8),
+ libsystemd-dev [linux-any],
+ libtool,
+ libxml2-dev,
+ network-manager-dev (>= 0.7) [linux-any],
+ pkg-config,
+ po-debconf
Homepage: http://www.strongswan.org
Package: strongswan
Architecture: all
-Depends: ${misc:Depends}, strongswan-charon, strongswan-starter
+Depends: strongswan-charon, strongswan-starter, ${misc:Depends}
Description: IPsec VPN solution metapackage
The strongSwan VPN suite uses the native IPsec stack in the standard Linux
kernel. It supports both the IKEv1 and IKEv2 protocols.
@@ -30,7 +50,7 @@ Description: IPsec VPN solution metapackage
Package: libstrongswan
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Breaks: strongswan-starter (<< 5.3.5-2)
Replaces: strongswan-starter (<< 5.3.5-2)
Recommends: libstrongswan-standard-plugins
@@ -78,9 +98,11 @@ Description: strongSwan utility and crypto library
Package: libstrongswan-standard-plugins
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libstrongswan (= ${binary:Version})
+Depends: libstrongswan (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Breaks: libstrongswan (<= 5.1.1-1), strongswan-ike (<= 5.1.1-1)
-Replaces: libstrongswan (<= 5.1.1-1),strongswan-ike (<= 5.1.1-1)
+Replaces: libstrongswan (<= 5.1.1-1), strongswan-ike (<= 5.1.1-1)
Description: strongSwan utility and crypto library (standard plugins)
The strongSwan VPN suite uses the native IPsec stack in the standard
Linux kernel. It supports both the IKEv1 and IKEv2 protocols.
@@ -96,9 +118,11 @@ Description: strongSwan utility and crypto library (standard plugins)
Package: libstrongswan-extra-plugins
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libstrongswan (= ${binary:Version})
+Depends: libstrongswan (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Breaks: libstrongswan (<= 5.1.1-1), strongswan-ike (<= 5.1.1-1)
-Replaces: libstrongswan (<= 5.1.1-1),strongswan-ike (<= 5.1.1-1)
+Replaces: libstrongswan (<= 5.1.1-1), strongswan-ike (<= 5.1.1-1)
Description: strongSwan utility and crypto library (extra plugins)
The strongSwan VPN suite uses the native IPsec stack in the standard
Linux kernel. It supports both the IKEv1 and IKEv2 protocols.
@@ -124,9 +148,11 @@ Description: strongSwan utility and crypto library (extra plugins)
Package: libcharon-extra-plugins
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libstrongswan (= ${binary:Version})
+Depends: libstrongswan (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Breaks: libstrongswan (<= 5.1.1-1), strongswan-ike (<= 5.1.1-1)
-Replaces: libstrongswan (<= 5.1.1-1),strongswan-ike (<= 5.1.1-1)
+Replaces: libstrongswan (<= 5.1.1-1), strongswan-ike (<= 5.1.1-1)
Description: strongSwan charon library (extra plugins)
The strongSwan VPN suite uses the native IPsec stack in the standard
Linux kernel. It supports both the IKEv1 and IKEv2 protocols.
@@ -162,8 +188,10 @@ Description: strongSwan charon library (extra plugins)
Package: strongswan-starter
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libstrongswan (=
- ${binary:Version}), adduser
+Depends: adduser,
+ libstrongswan (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Recommends: strongswan-charon
Conflicts: openswan
Description: strongSwan daemon starter and configuration file parser
@@ -176,7 +204,9 @@ Description: strongSwan daemon starter and configuration file parser
Package: strongswan-libcharon
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libstrongswan (= ${binary:Version})
+Depends: libstrongswan (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Suggests: libcharon-extra-plugins
Description: strongSwan charon library
The strongSwan VPN suite uses the native IPsec stack in the standard
@@ -188,9 +218,11 @@ Description: strongSwan charon library
Package: strongswan-charon
Architecture: any
Pre-Depends: debconf | debconf-2.0
-Depends: ${shlibs:Depends}, ${misc:Depends},
- libstrongswan (= ${binary:Version}), strongswan-starter,
- iproute2 [linux-any] | iproute [linux-any]
+Depends: iproute2 [linux-any] | iproute [linux-any],
+ libstrongswan (= ${binary:Version}),
+ strongswan-starter,
+ ${misc:Depends},
+ ${shlibs:Depends}
Provides: ike-server
Description: strongSwan Internet Key Exchange daemon
The strongSwan VPN suite uses the native IPsec stack in the standard
@@ -204,7 +236,7 @@ Package: strongswan-ike
Architecture: all
Section: oldlibs
Priority: extra
-Depends: ${shlibs:Depends}, ${misc:Depends}, strongswan-charon
+Depends: strongswan-charon, ${misc:Depends}, ${shlibs:Depends}
Description: strongSwan Internet Key Exchange daemon (transitional package)
The strongSwan VPN suite uses the native IPsec stack in the standard
Linux kernel. It supports both the IKEv1 and IKEv2 protocols.
@@ -215,7 +247,7 @@ Description: strongSwan Internet Key Exchange daemon (transitional package)
Package: strongswan-nm
Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
Recommends: network-manager-strongswan
Description: strongSwan plugin to interact with NetworkManager
The strongSwan VPN suite uses the native IPsec stack in the standard
@@ -228,7 +260,7 @@ Description: strongSwan plugin to interact with NetworkManager
Package: strongswan-ikev1
Architecture: all
-Depends: ${misc:Depends}, strongswan-ike
+Depends: strongswan-ike, ${misc:Depends}
Section: oldlibs
Priority: extra
Description: strongSwan IKEv1 daemon, transitional package
@@ -241,7 +273,7 @@ Description: strongSwan IKEv1 daemon, transitional package
Package: strongswan-ikev2
Architecture: all
-Depends: ${misc:Depends}, strongswan-ike
+Depends: strongswan-ike, ${misc:Depends}
Section: oldlibs
Priority: extra
Description: strongSwan IKEv2 daemon, transitional package
@@ -254,7 +286,9 @@ Description: strongSwan IKEv2 daemon, transitional package
Package: charon-cmd
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libstrongswan (= ${binary:Version})
+Depends: libstrongswan (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: standalone IPsec client
The strongSwan VPN suite uses the native IPsec stack in the standard
Linux kernel. It supports both the IKEv1 and IKEv2 protocols.
@@ -264,7 +298,9 @@ Description: standalone IPsec client
Package: strongswan-pki
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libstrongswan (= ${binary:Version})
+Depends: libstrongswan (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Breaks: strongswan-starter (<< 5.3.5-2)
Replaces: strongswan-starter (<< 5.3.5-2)
Description: strongSwan IPsec client, pki command
@@ -276,7 +312,9 @@ Description: strongSwan IPsec client, pki command
Package: strongswan-scepclient
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libstrongswan (= ${binary:Version})
+Depends: libstrongswan (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Breaks: strongswan-starter (<< 5.3.5-2)
Replaces: strongswan-starter (<< 5.3.5-2)
Description: strongSwan IPsec client, SCEP client
@@ -288,7 +326,9 @@ Description: strongSwan IPsec client, SCEP client
Package: strongswan-swanctl
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libstrongswan (= ${binary:Version})
+Depends: libstrongswan (= ${binary:Version}),
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: strongSwan IPsec client, swanctl command
The strongSwan VPN suite uses the native IPsec stack in the standard
Linux kernel. It supports both the IKEv1 and IKEv2 protocols.
@@ -298,8 +338,10 @@ Description: strongSwan IPsec client, swanctl command
Package: charon-systemd
Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends},
- libstrongswan (= ${binary:Version}), strongswan-swanctl
+Depends: libstrongswan (= ${binary:Version}),
+ strongswan-swanctl,
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: strongSwan IPsec client, systemd support
The strongSwan VPN suite uses the native IPsec stack in the standard
Linux kernel. It supports both the IKEv1 and IKEv2 protocols.
diff --git a/debian/copyright b/debian/copyright
index e9865f95d..a370574e7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2566,11 +2566,11 @@ License: BSD-3
.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
+ documentation and/or other materials provided with the distribution.
.
* Neither the name of foo nor the names of its
contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
+ this software without specific prior written permission.
.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
@@ -2731,8 +2731,8 @@ License: GPL-3+
`/usr/share/common-licenses/GPL-3'.
License: LGPL-2+
- On Debian systems, the complete text of the Lesser GNU
- General Public License version 2 can be found in
+ On Debian systems, the complete text of the Lesser GNU
+ General Public License version 2 can be found in
`/usr/share/common-licenses/LGPL-2'.
License: MIT
diff --git a/debian/info b/debian/info
deleted file mode 100644
index e69de29bb..000000000
--- a/debian/info
+++ /dev/null
diff --git a/debian/libstrongswan.dirs b/debian/libstrongswan.dirs
index 3550fea6f..a7afdf5d6 100644
--- a/debian/libstrongswan.dirs
+++ b/debian/libstrongswan.dirs
@@ -2,5 +2,5 @@
/etc/logcheck/ignore.d.server
/etc/logcheck/ignore.d.workstation
/etc/logcheck/violations.ignore.d
-/usr/share/lintian/overrides
/usr/lib/ipsec/plugins
+/usr/share/lintian/overrides
diff --git a/debian/strongswan-starter.dirs b/debian/strongswan-starter.dirs
index 544e26c84..ae7ee9ea8 100644
--- a/debian/strongswan-starter.dirs
+++ b/debian/strongswan-starter.dirs
@@ -1,9 +1,9 @@
/etc
+/etc/init.d
/etc/ipsec.d
/etc/ipsec.d/cacerts
-/etc/ipsec.d/ocspcerts
/etc/ipsec.d/crls
-/etc/ipsec.d/private
+/etc/ipsec.d/ocspcerts
/etc/ipsec.d/policies
-/etc/init.d
+/etc/ipsec.d/private
/var/lib/strongswan