aboutsummaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorMartin Willi <martin@strongswan.org>2009-02-17 18:30:02 +0000
committerMartin Willi <martin@strongswan.org>2009-02-17 18:30:02 +0000
commit6ce32d8719ad3b0678c350938e2c6fd5a998948b (patch)
tree02d68fa481878a72560b1424214416c77d1aa546 /packages
parentabe1dafaa4adcf0e1e1b5f41da1d6c319069b3c0 (diff)
downloadstrongswan-6ce32d8719ad3b0678c350938e2c6fd5a998948b.tar.bz2
strongswan-6ce32d8719ad3b0678c350938e2c6fd5a998948b.tar.xz
do not operate on strongswan-padlock on non-x86
Diffstat (limited to 'packages')
-rw-r--r--packages/strongswan/debian/changelog10
-rwxr-xr-xpackages/strongswan/debian/rules14
2 files changed, 7 insertions, 17 deletions
diff --git a/packages/strongswan/debian/changelog b/packages/strongswan/debian/changelog
index e1758ceb0..5435cea03 100644
--- a/packages/strongswan/debian/changelog
+++ b/packages/strongswan/debian/changelog
@@ -1,16 +1,10 @@
-strongswan (4.2.11-4~ppa1~intrepid1) intrepid; urgency=low
-
- * fixed build on non-i386 architectures
+strongswan (4.2.11-9~ppa1~intrepid1) intrepid; urgency=low
* added missing kernel-netlink plugin
- -- Martin Willi <martin@strongswan.org> Tue, 17 Feb 2009 10:25:53 +0100
-
-strongswan (4.2.11-3~ppa1~intrepid1) intrepid; urgency=low
-
* build strongswan-padlock on i386 only
- -- Martin Willi <martin@strongswan.org> Mon, 16 Feb 2009 17:28:20 +0100
+ -- Martin Willi <martin@strongswan.org> Tue, 17 Feb 2009 13:28:20 +0100
strongswan (4.2.11-1~ppa1~intrepid1) intrepid; urgency=low
diff --git a/packages/strongswan/debian/rules b/packages/strongswan/debian/rules
index e6367a294..f02a1049c 100755
--- a/packages/strongswan/debian/rules
+++ b/packages/strongswan/debian/rules
@@ -4,19 +4,15 @@
CC = gcc
CFLAGS = -Wall -Wno-format -Wno-pointer-sign -Wno-strict-aliasing -g
-INSTALL_PROGRAM = install
CONFIGURE_ARGS = \
--disable-fips-prf --enable-openssl --enable-nm --enable-ldap \
--enable-eap-gtc --enable-eap-md5 --enable-agent --enable-curl \
- --enable-padlock --sysconfdir=/etc --prefix=/usr --libexecdir=/usr/lib \
+ --sysconfdir=/etc --prefix=/usr --libexecdir=/usr/lib \
--with-ipsecdir=/usr/lib/strongswan
ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O2
endif
-ifeq (,$(filter nostrip,$(DEB_BUILD_OPTIONS)))
- INSTALL_PROGRAM += -s
-endif
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
MAKEFLAGS += -j$(NUMJOBS)
@@ -52,17 +48,17 @@ binary-arch: build install
dh_installchangelogs NEWS
dh_installdocs README
dh_installinit --name=ipsec
- dh_install
+ dh_install -s
dh_link
dh_strip
dh_compress
- dh_fixperms -X etc/ipsec.secrets -X etc/ipsec.d
+ dh_fixperms -Xetc/ipsec.secrets -Xetc/ipsec.d
dh_makeshlibs
dh_installdeb
dh_shlibdeps
- dh_gencontrol
+ dh_gencontrol -s
dh_md5sums
- dh_builddeb
+ dh_builddeb -s
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install