From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Thu, 15 Nov 2018 16:57:03 +0000 (+0000)
Subject: Merge changes I36520f38,I59e218b8,Iaf4dc32f,I1c88c888 into 18.11.x
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=dd48bfeef15fc0c1415e443722efa26f6e855534;p=deb_dpdk.git

Merge changes I36520f38,I59e218b8,Iaf4dc32f,I1c88c888 into 18.11.x

* changes:
  fix package version
  changelog: apply wrap-and-sort --wrap-always --trailing-comma
  d/control, d/control.modules.in, d/dpdk.install, d/dpdk-doc.install: apply wrap-and-sort --wrap-always --trailing-comma
  d/rules: d/control: drop the majority of PMDs to suggest and select only a common subset for Recommends
---

dd48bfeef15fc0c1415e443722efa26f6e855534
diff --cc debian/control
index 7e080a73,ef67c8ad..966d48a8
--- a/debian/control
+++ b/debian/control
@@@ -630,12 -692,13 +692,13 @@@ Description: Data Plane Development Ki
   This package contains the runtime libraries for librte_pmd_bond.
  
  Package: librte-pmd-caam-jr18.11
 -Architecture: amd64 arm64 i386 ppc64el
 +Architecture: amd64 arm64 armhf i386 ppc64el
  Multi-Arch: same
  Homepage: https://doc.dpdk.org/guides/cryptodevs/caam_jr.html
- Pre-Depends: ${misc:Pre-Depends}
- Depends: ${misc:Depends}, ${shlibs:Depends}
- Conflicts: libdpdk0
+ Pre-Depends: ${misc:Pre-Depends},
+ Depends: ${misc:Depends},
+          ${shlibs:Depends},
+ Conflicts: libdpdk0,
  Description: Data Plane Development Kit (librte-pmd-caam-jr runtime library)
   DPDK is a set of libraries for fast packet processing. Applications run
   in user-space and communicate directly with dedicated network interfaces.
@@@ -643,12 -706,13 +706,13 @@@
   This package contains the runtime libraries for librte_pmd_caam_jr.
  
  Package: librte-pmd-ccp18.11
 -Architecture: amd64 arm64 i386 ppc64el
 +Architecture: amd64 arm64 armhf i386 ppc64el
  Multi-Arch: same
  Homepage: https://doc.dpdk.org/guides/cryptodevs/ccp.html
- Pre-Depends: ${misc:Pre-Depends}
- Depends: ${misc:Depends}, ${shlibs:Depends}
- Conflicts: libdpdk0
+ Pre-Depends: ${misc:Pre-Depends},
+ Depends: ${misc:Depends},
+          ${shlibs:Depends},
+ Conflicts: libdpdk0,
  Description: Data Plane Development Kit (librte-pmd-cpp runtime library)
   DPDK is a set of libraries for fast packet processing. Applications run
   in user-space and communicate directly with dedicated network interfaces.
@@@ -656,12 -720,13 +720,13 @@@
   This package contains the runtime libraries for librte_pmd_ccp.
  
  Package: librte-pmd-cxgbe18.11
 -Architecture: amd64 arm64 i386 ppc64el
 +Architecture: amd64 arm64 armhf i386 ppc64el
  Multi-Arch: same
  Homepage: https://dpdk.org/doc/guides/nics/cxgbe.html
- Pre-Depends: ${misc:Pre-Depends}
- Depends: ${misc:Depends}, ${shlibs:Depends}
- Conflicts: libdpdk0
+ Pre-Depends: ${misc:Pre-Depends},
+ Depends: ${misc:Depends},
+          ${shlibs:Depends},
+ Conflicts: libdpdk0,
  Description: Data Plane Development Kit (librte-pmd-cxgbe runtime library)
   DPDK is a set of libraries for fast packet processing. Applications run
   in user-space and communicate directly with dedicated network interfaces.
@@@ -786,12 -860,13 +860,13 @@@ Description: Data Plane Development Ki
   This package contains the runtime libraries for librte_dsw_event.
  
  Package: librte-pmd-e1000-18.11
 -Architecture: amd64 arm64 i386 ppc64el
 +Architecture: amd64 arm64 armhf i386 ppc64el
  Multi-Arch: same
  Homepage: https://dpdk.org/doc/guides/nics/e1000em.html
- Pre-Depends: ${misc:Pre-Depends}
- Depends: ${misc:Depends}, ${shlibs:Depends}
- Conflicts: libdpdk0
+ Pre-Depends: ${misc:Pre-Depends},
+ Depends: ${misc:Depends},
+          ${shlibs:Depends},
+ Conflicts: libdpdk0,
  Description: Data Plane Development Kit (librte-pmd-e1000 runtime library)
   DPDK is a set of libraries for fast packet processing. Applications run
   in user-space and communicate directly with dedicated network interfaces.
@@@ -825,12 -902,13 +902,13 @@@ Description: Data Plane Development Ki
   This package contains the runtime libraries for librte_pmd_ena.
  
  Package: librte-pmd-enic18.11
 -Architecture: amd64 arm64 i386 ppc64el
 +Architecture: amd64 arm64 armhf i386 ppc64el
  Multi-Arch: same
  Homepage: https://dpdk.org/doc/guides/nics/enic.html
- Pre-Depends: ${misc:Pre-Depends}
- Depends: ${misc:Depends}, ${shlibs:Depends}
- Conflicts: libdpdk0
+ Pre-Depends: ${misc:Pre-Depends},
+ Depends: ${misc:Depends},
+          ${shlibs:Depends},
+ Conflicts: libdpdk0,
  Description: Data Plane Development Kit (librte-pmd-enic runtime library)
   DPDK is a set of libraries for fast packet processing. Applications run
   in user-space and communicate directly with dedicated network interfaces.
@@@ -851,12 -930,13 +930,13 @@@ Description: Data Plane Development Ki
   This package contains the runtime libraries for librte_pmd_failsafe.
  
  Package: librte-pmd-fm10k18.11
 -Architecture: amd64 arm64 i386 ppc64el
 +Architecture: amd64 arm64 armhf i386 ppc64el
  Multi-Arch: same
  Homepage: https://dpdk.org/doc/guides/nics/fm10k.html
- Pre-Depends: ${misc:Pre-Depends}
- Depends: ${misc:Depends}, ${shlibs:Depends}
- Conflicts: libdpdk0
+ Pre-Depends: ${misc:Pre-Depends},
+ Depends: ${misc:Depends},
+          ${shlibs:Depends},
+ Conflicts: libdpdk0,
  Description: Data Plane Development Kit (librte-pmd-fm10k runtime library)
   DPDK is a set of libraries for fast packet processing. Applications run
   in user-space and communicate directly with dedicated network interfaces.
@@@ -864,12 -944,13 +944,13 @@@
   This package contains the runtime libraries for librte_pmd_fm10k.
  
  Package: librte-pmd-i40e18.11
 -Architecture: amd64 arm64 i386 ppc64el
 +Architecture: amd64 arm64 armhf i386 ppc64el
  Multi-Arch: same
  Homepage: https://dpdk.org/doc/guides/nics/i40e.html
- Pre-Depends: ${misc:Pre-Depends}
- Depends: ${misc:Depends}, ${shlibs:Depends}
- Conflicts: libdpdk0
+ Pre-Depends: ${misc:Pre-Depends},
+ Depends: ${misc:Depends},
+          ${shlibs:Depends},
+ Conflicts: libdpdk0,
  Description: Data Plane Development Kit (librte-pmd-i40e runtime library)
   DPDK is a set of libraries for fast packet processing. Applications run
   in user-space and communicate directly with dedicated network interfaces.
@@@ -877,12 -958,13 +958,13 @@@
   This package contains the runtime libraries for librte_pmd_i40e.
  
  Package: librte-pmd-ixgbe18.11
 -Architecture: amd64 arm64 i386 ppc64el
 +Architecture: amd64 arm64 armhf i386 ppc64el
  Multi-Arch: same
  Homepage: https://dpdk.org/doc/guides/nics/ixgbe.html
- Pre-Depends: ${misc:Pre-Depends}
- Depends: ${misc:Depends}, ${shlibs:Depends}
- Conflicts: libdpdk0
+ Pre-Depends: ${misc:Pre-Depends},
+ Depends: ${misc:Depends},
+          ${shlibs:Depends},
+ Conflicts: libdpdk0,
  Description: Data Plane Development Kit (librte-pmd-ixgbe runtime library)
   DPDK is a set of libraries for fast packet processing. Applications run
   in user-space and communicate directly with dedicated network interfaces.
@@@ -941,12 -1027,13 +1027,13 @@@ Description: Data Plane Development Ki
   This package contains the runtime libraries for librte_pmd_pcap.
  
  Package: librte-pmd-openssl18.11
 -Architecture: amd64 arm64 i386 ppc64el
 +Architecture: amd64 arm64 armhf i386 ppc64el
  Multi-Arch: same
  Homepage: https://dpdk.org/doc/guides/cryptodevs/openssl.html
- Pre-Depends: ${misc:Pre-Depends}
- Depends: ${misc:Depends}, ${shlibs:Depends}
- Conflicts: libdpdk0
+ Pre-Depends: ${misc:Pre-Depends},
+ Depends: ${misc:Depends},
+          ${shlibs:Depends},
+ Conflicts: libdpdk0,
  Description: Data Plane Development Kit (librte-pmd-openssl runtime library)
   DPDK is a set of libraries for fast packet processing. Applications run
   in user-space and communicate directly with dedicated network interfaces.
@@@ -1007,12 -1098,13 +1098,13 @@@ Description: Data Plane Development Ki
   This package contains the runtime libraries for librte_pmd_virtio.
  
  Package: librte-pmd-vmxnet3-18.11
 -Architecture: amd64 arm64 i386 ppc64el
 +Architecture: amd64 arm64 armhf i386 ppc64el
  Multi-Arch: same
  Homepage: https://dpdk.org/doc/guides/nics/vmxnet3.html
- Pre-Depends: ${misc:Pre-Depends}
- Depends: ${misc:Depends}, ${shlibs:Depends}
- Conflicts: libdpdk0
+ Pre-Depends: ${misc:Pre-Depends},
+ Depends: ${misc:Depends},
+          ${shlibs:Depends},
+ Conflicts: libdpdk0,
  Description: Data Plane Development Kit (librte-pmd-vmxnet3 runtime library)
   DPDK is a set of libraries for fast packet processing. Applications run
   in user-space and communicate directly with dedicated network interfaces.
@@@ -1045,12 -1139,13 +1139,13 @@@ Description: Data Plane Development Ki
   This package contains the runtime libraries for librte_pmd_qat.
  
  Package: librte-pmd-qede18.11
 -Architecture: amd64 arm64 i386 ppc64el
 +Architecture: amd64 arm64 armhf i386 ppc64el
  Multi-Arch: same
  Homepage: https://dpdk.org/doc/guides/nics/qede.html
- Pre-Depends: ${misc:Pre-Depends}
- Depends: ${misc:Depends}, ${shlibs:Depends}
- Conflicts: libdpdk0
+ Pre-Depends: ${misc:Pre-Depends},
+ Depends: ${misc:Depends},
+          ${shlibs:Depends},
+ Conflicts: libdpdk0,
  Description: Data Plane Development Kit (librte-pmd-qede runtime library)
   DPDK is a set of libraries for fast packet processing. Applications run
   in user-space and communicate directly with dedicated network interfaces.
@@@ -1349,11 -1467,12 +1467,12 @@@ Description: Data Plane Development Ki
   This package contains the runtime libraries for librte_pmd_aesni_mb.
  
  Package: librte-pmd-ark18.11
 -Architecture: amd64 arm64 i386 ppc64el
 +Architecture: amd64 arm64 armhf i386 ppc64el
  Multi-Arch: same
- Pre-Depends: ${misc:Pre-Depends}
- Depends: ${misc:Depends}, ${shlibs:Depends}
- Conflicts: libdpdk0
+ Pre-Depends: ${misc:Pre-Depends},
+ Depends: ${misc:Depends},
+          ${shlibs:Depends},
+ Conflicts: libdpdk0,
  Description: Data Plane Development Kit (librte_pmd_ark runtime library)
   DPDK is a set of libraries for fast packet processing. Applications run
   in user-space and communicate directly with dedicated network interfaces.
@@@ -1373,12 -1493,13 +1493,13 @@@ Description: Data Plane Development Ki
   This package contains the runtime libraries for librte_pmd_avf.
  
  Package: librte-pmd-avp18.11
 -Architecture: amd64 arm64 i386 ppc64el
 +Architecture: amd64 arm64 armhf i386 ppc64el
  Multi-Arch: same
  Homepage: https://dpdk.org/doc/guides/nics/avp.html
- Pre-Depends: ${misc:Pre-Depends}
- Depends: ${misc:Depends}, ${shlibs:Depends}
- Conflicts: libdpdk0
+ Pre-Depends: ${misc:Pre-Depends},
+ Depends: ${misc:Depends},
+          ${shlibs:Depends},
+ Conflicts: libdpdk0,
  Description: Data Plane Development Kit (librte_pmd_avp runtime library)
   DPDK is a set of libraries for fast packet processing. Applications run
   in user-space and communicate directly with dedicated network interfaces.