drop destination path in .install files

5 files changed, 81 insertions, 79 deletions

diff --git a/debian/changelog b/debian/changelog
index b99caa438..31f528ccb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ strongswan (4.6.4-0.1) UNRELEASED; urgency=low
   * New upstream release.
   * debian/patches:
     - drop all patches, they're all included upstream now.
+  * debian/*.install:
+    - drop destination path.
 
  -- Yves-Alexis Perez <corsac@debian.org>  Thu, 28 Jun 2012 21:17:38 +0200
 
diff --git a/debian/libstrongswan.install b/debian/libstrongswan.install
index 0fee520d5..4d7926f96 100644
--- a/debian/libstrongswan.install
+++ b/debian/libstrongswan.install
@@ -1,38 +1,38 @@
-usr/lib/libstrongswan.so*                          usr/lib/
-usr/lib/libhydra.so*                               usr/lib/
-usr/lib/libfast.so*                                usr/lib/
-usr/lib/ipsec/libchecksum.so*                      usr/lib/ipsec/
-usr/lib/ipsec/plugins/libstrongswan-gmp.so*        usr/lib/ipsec/plugins/
-usr/lib/ipsec/plugins/libstrongswan-openssl.so*    usr/lib/ipsec/plugins/
-usr/lib/ipsec/plugins/libstrongswan-x509.so*       usr/lib/ipsec/plugins/
-usr/lib/ipsec/plugins/libstrongswan-pkcs11.so*     usr/lib/ipsec/plugins/
-usr/lib/ipsec/plugins/libstrongswan-pgp.so*        usr/lib/ipsec/plugins/
-usr/lib/ipsec/plugins/libstrongswan-pem.so*        usr/lib/ipsec/plugins/
-usr/lib/ipsec/plugins/libstrongswan-pkcs1.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-aes.so*        usr/lib/ipsec/plugins/
-usr/lib/ipsec/plugins/libstrongswan-des.so*        usr/lib/ipsec/plugins/
-usr/lib/ipsec/plugins/libstrongswan-xcbc.so*       usr/lib/ipsec/plugins/
-usr/lib/ipsec/plugins/libstrongswan-ctr.so*        usr/lib/ipsec/plugins/
-usr/lib/ipsec/plugins/libstrongswan-ccm.so*        usr/lib/ipsec/plugins/
-usr/lib/ipsec/plugins/libstrongswan-gcm.so*        usr/lib/ipsec/plugins/
-usr/lib/ipsec/plugins/libstrongswan-led.so*        usr/lib/ipsec/plugins/
-usr/lib/ipsec/plugins/libstrongswan-addrblock.so*  usr/lib/ipsec/plugins/
-usr/lib/ipsec/plugins/libstrongswan-md5.so*        usr/lib/ipsec/plugins/
-usr/lib/ipsec/plugins/libstrongswan-sha1.so*       usr/lib/ipsec/plugins/
-usr/lib/ipsec/plugins/libstrongswan-sha2.so*       usr/lib/ipsec/plugins/
-usr/lib/ipsec/plugins/libstrongswan-dhcp.so*       usr/lib/ipsec/plugins/
-usr/lib/ipsec/plugins/libstrongswan-dnskey.so*     usr/lib/ipsec/plugins/
-usr/lib/ipsec/plugins/libstrongswan-farp.so*       usr/lib/ipsec/plugins/
-usr/lib/ipsec/plugins/libstrongswan-fips-prf.so*   usr/lib/ipsec/plugins/
-usr/lib/ipsec/plugins/libstrongswan-resolve.so*    usr/lib/ipsec/plugins/
-usr/lib/ipsec/plugins/libstrongswan-sql.so*        usr/lib/ipsec/plugins/
-usr/lib/ipsec/plugins/libstrongswan-ha.so*         usr/lib/ipsec/plugins/
-usr/lib/ipsec/plugins/libstrongswan-xauth.so*      usr/lib/ipsec/plugins/
-usr/lib/ipsec/plugins/libstrongswan-revocation.so* usr/lib/ipsec/plugins/
-usr/lib/ipsec/plugins/libstrongswan-constraints.so* usr/lib/ipsec/plugins/
-usr/lib/ipsec/plugins/libstrongswan-test-vectors.so* usr/lib/ipsec/plugins/
-etc/strongswan.conf                                etc/
+usr/lib/libstrongswan.so*
+usr/lib/libhydra.so*
+usr/lib/libfast.so*
+usr/lib/ipsec/libchecksum.so*
+usr/lib/ipsec/plugins/libstrongswan-gmp.so*
+usr/lib/ipsec/plugins/libstrongswan-openssl.so*
+usr/lib/ipsec/plugins/libstrongswan-x509.so*
+usr/lib/ipsec/plugins/libstrongswan-pkcs11.so*
+usr/lib/ipsec/plugins/libstrongswan-pgp.so*
+usr/lib/ipsec/plugins/libstrongswan-pem.so*
+usr/lib/ipsec/plugins/libstrongswan-pkcs1.so*
+usr/lib/ipsec/plugins/libstrongswan-pubkey.so*
+usr/lib/ipsec/plugins/libstrongswan-hmac.so*
+usr/lib/ipsec/plugins/libstrongswan-xcbc.so*
+usr/lib/ipsec/plugins/libstrongswan-random.so*
+usr/lib/ipsec/plugins/libstrongswan-aes.so*
+usr/lib/ipsec/plugins/libstrongswan-des.so*
+usr/lib/ipsec/plugins/libstrongswan-xcbc.so*
+usr/lib/ipsec/plugins/libstrongswan-ctr.so*
+usr/lib/ipsec/plugins/libstrongswan-ccm.so*
+usr/lib/ipsec/plugins/libstrongswan-gcm.so*
+usr/lib/ipsec/plugins/libstrongswan-led.so*
+usr/lib/ipsec/plugins/libstrongswan-addrblock.so*
+usr/lib/ipsec/plugins/libstrongswan-md5.so*
+usr/lib/ipsec/plugins/libstrongswan-sha1.so*
+usr/lib/ipsec/plugins/libstrongswan-sha2.so*
+usr/lib/ipsec/plugins/libstrongswan-dhcp.so*
+usr/lib/ipsec/plugins/libstrongswan-dnskey.so*
+usr/lib/ipsec/plugins/libstrongswan-farp.so*
+usr/lib/ipsec/plugins/libstrongswan-fips-prf.so*
+usr/lib/ipsec/plugins/libstrongswan-resolve.so*
+usr/lib/ipsec/plugins/libstrongswan-sql.so*
+usr/lib/ipsec/plugins/libstrongswan-ha.so*
+usr/lib/ipsec/plugins/libstrongswan-xauth.so*
+usr/lib/ipsec/plugins/libstrongswan-revocation.so*
+usr/lib/ipsec/plugins/libstrongswan-constraints.so*
+usr/lib/ipsec/plugins/libstrongswan-test-vectors.so*
+etc/strongswan.conf
diff --git a/debian/strongswan-ikev1.install b/debian/strongswan-ikev1.install
index 8d4a824ca..5f91e1b7c 100644
--- a/debian/strongswan-ikev1.install
+++ b/debian/strongswan-ikev1.install
@@ -1,4 +1,4 @@
-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/
+usr/lib/ipsec/pluto
+usr/lib/ipsec/_pluto_adns
+usr/lib/ipsec/whack
+usr/share/man/man8/pluto.8
diff --git a/debian/strongswan-ikev2.install b/debian/strongswan-ikev2.install
index 5bf3cdd1b..4f3a83c12 100644
--- a/debian/strongswan-ikev2.install
+++ b/debian/strongswan-ikev2.install
@@ -1,11 +1,11 @@
-usr/lib/libcharon.so*      usr/lib/
-usr/lib/ipsec/charon       usr/lib/ipsec/
-usr/lib/ipsec/plugins/libstrongswan-kernel-netlink.so*     usr/lib/ipsec/plugins/
-usr/lib/ipsec/plugins/libstrongswan-socket*.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/
-usr/lib/ipsec/plugins/libstrongswan-attr*.so*       usr/lib/ipsec/plugins/
+usr/lib/libcharon.so*
+usr/lib/ipsec/charon
+usr/lib/ipsec/plugins/libstrongswan-kernel-netlink.so*
+usr/lib/ipsec/plugins/libstrongswan-socket*.so*
+usr/lib/ipsec/plugins/libstrongswan-eap*.so*
+usr/lib/ipsec/plugins/libstrongswan-agent.so*
+usr/lib/ipsec/plugins/libstrongswan-curl.so*
+usr/lib/ipsec/plugins/libstrongswan-ldap.so*
+usr/lib/ipsec/plugins/libstrongswan-medsrv.so*
+usr/lib/ipsec/plugins/libstrongswan-medcli.so*
+usr/lib/ipsec/plugins/libstrongswan-attr*.so*
diff --git a/debian/strongswan-starter.install b/debian/strongswan-starter.install
index 0bf97c02f..ca6ecc8e8 100644
--- a/debian/strongswan-starter.install
+++ b/debian/strongswan-starter.install
@@ -1,26 +1,26 @@
-# starter
-usr/lib/ipsec/starter                              usr/lib/ipsec/
-usr/lib/ipsec/_copyright                   usr/lib/ipsec/
-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/man5/ipsec.conf.5                 usr/share/man/man5/
-usr/share/man/man5/ipsec.secrets.5              usr/share/man/man5/
-usr/share/man/man5/strongswan.conf.5                 usr/share/man/man5/
-# updown
-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/ipsec/scepclient           usr/lib/ipsec/
-usr/lib/ipsec/openac                       usr/lib/ipsec/
-usr/lib/ipsec/pki                       usr/lib/ipsec/
-usr/lib/ipsec/pool                       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/ipsec/stroke                                                       usr/lib/ipsec/
-usr/lib/ipsec/plugins/libstrongswan-stroke.so*     usr/lib/ipsec/plugins/
+#starter
+usr/lib/ipsec/starter
+usr/lib/ipsec/_copyright
+usr/sbin/ipsec
+etc/ipsec.d
+etc/ipsec.conf
+usr/share/man/man8/ipsec.8
+usr/share/man/man5/ipsec.conf.5
+usr/share/man/man5/ipsec.secrets.5
+usr/share/man/man5/strongswan.conf.5
+#updown
+usr/lib/ipsec/plugins/libstrongswan-updown.so*
+usr/lib/ipsec/_updown
+usr/lib/ipsec/_updown_espmark
+usr/share/man/man8/_updown.8
+usr/share/man/man8/_updown_espmark.8
+#tools
+usr/lib/ipsec/scepclient
+usr/lib/ipsec/openac
+usr/lib/ipsec/pki
+usr/lib/ipsec/pool
+usr/share/man/man8/scepclient.8
+usr/share/man/man8/openac.8
+#stroke
+usr/lib/ipsec/stroke
+usr/lib/ipsec/plugins/libstrongswan-stroke.so*