summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog6
-rwxr-xr-xdebian/rules4
-rw-r--r--debian/strongswan-starter.install1
3 files changed, 7 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 21c54cbf4..d1f3af65f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,15 @@
strongswan (4.5.2-1) unstable; urgency=low
- * New upstream version 4.5.2
+ * New upstream version 4.5.2. This removes a lot of old manpages that were
+ not properly updated since freeswan.
Closes: #616482: strongswan-ikev1: virtual ips not released if xauth name
does not match id
Closes: #626169: strongswan: ipsec tunnels fail because charon segfaults
Closes: #625228: strongswan-starter: left-/rightnexthop options are broken
Closes: #614105: strongswan-ikev2: charon continually respawns
+ * Fix typo in debian/rules that precluded --enable-nm from being passed to
+ configure (LP: #771778).
+
-- Rene Mayrhofer <rmayr@debian.org> Thu, 19 May 2011 13:42:21 +0200
diff --git a/debian/rules b/debian/rules
index e3eb7b5c8..4155e29e4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,7 +54,7 @@ endif
# to do backports where the network-manager libs can not be installed, and
# thus to just ignore build-deps).
ifeq ($(shell test -d /usr/include/libnm-glib/ && echo yes),yes)
- CONFIGUREARS += --enable-nm
+ CONFIGUREARGS += --enable-nm
endif
build: build-stamp
@@ -99,7 +99,7 @@ install: build-stamp
ifeq ($(DEB_BUILD_ARCH_CPU),i386)
install $(CURDIR)/debian/tmp/usr/lib/ipsec/plugins/libstrongswan-padlock.so* $(CURDIR)/debian/libstrongswan/usr/lib/ipsec/plugins/
endif
- # and special handling for network-manager files - only install when build
+ # and special handling for network-manager files - only install when built
install -d $(CURDIR)/debian/tmp/usr/lib/ipsec/plugins/libstrongswan-nm.so* $(CURDIR)/debian/strongswan-nm/usr/lib/ipsec/plugins/
# and additional files not covered by upstream makefile...
diff --git a/debian/strongswan-starter.install b/debian/strongswan-starter.install
index d89a2d359..d9ca65ca9 100644
--- a/debian/strongswan-starter.install
+++ b/debian/strongswan-starter.install
@@ -5,7 +5,6 @@ usr/sbin/ipsec usr/sbin/
etc/ipsec.d etc/
etc/ipsec.conf etc/
usr/share/man/man8/ipsec.8 usr/share/man/man8/
-usr/share/man/man8/starter.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