do not operate on strongswan-padlock on non-x86
authorMartin Willi <martin@strongswan.org>
Tue, 17 Feb 2009 18:30:02 +0000 (18:30 -0000)
committerMartin Willi <martin@strongswan.org>
Tue, 17 Feb 2009 18:30:02 +0000 (18:30 -0000)
packages/strongswan/debian/changelog
packages/strongswan/debian/rules

index e1758ce..5435cea 100644 (file)
@@ -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
 
 
   * 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
 
   * 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
 
 
 strongswan (4.2.11-1~ppa1~intrepid1) intrepid; urgency=low
 
index e6367a2..f02a104 100755 (executable)
@@ -4,19 +4,15 @@
 
 CC = gcc
 CFLAGS = -Wall -Wno-format -Wno-pointer-sign -Wno-strict-aliasing -g
 
 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 \
 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
        --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)
 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_installchangelogs NEWS
        dh_installdocs README
        dh_installinit --name=ipsec
-       dh_install
+       dh_install -s
        dh_link
        dh_strip
        dh_compress
        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_makeshlibs
        dh_installdeb
        dh_shlibdeps
-       dh_gencontrol
+       dh_gencontrol -s
        dh_md5sums
        dh_md5sums
-       dh_builddeb
+       dh_builddeb -s
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install