- drop changes upstream in 18.11.2

[deb_dpdk.git] / debian / control

diff --git a/debian/control b/debian/control
index 8d13043..7e0345d 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,6 @@ Build-Depends: debhelper (>= 10.3~),
                graphviz <!nodoc>,
                inkscape <!nodoc>,
                libbsd-dev,
-               libcap-dev,
                libelf-dev,
                libibverbs-dev (>= 16~),
                libipsec-mb-dev [amd64],
@@ -28,7 +27,7 @@ Build-Depends: debhelper (>= 10.3~),
                texlive-fonts-recommended <!nodoc>,
                texlive-latex-extra <!nodoc>,
                zlib1g-dev,
-Standards-Version: 4.2.1
+Standards-Version: 4.3.0
 Rules-Requires-Root: no
 Section: libs
 Homepage: https://www.dpdk.org
@@ -43,8 +42,8 @@ Depends: hwdata,
          pciutils,
          ${misc:Depends},
          ${python3:Depends},
-         ${shlibs:Depends},
 Recommends: librte-mempool18.11,
+            librte-mempool-ring18.11,
             librte-pmd-af-packet18.11,
             librte-pmd-bond18.11,
             librte-pmd-e1000-18.11,
@@ -68,7 +67,7 @@ Suggests: dpdk-doc,
           dpdk-rte-kni-dkms (= ${binary:Version}),
           linux-image-generic,
           ${librte:Suggests},
-Breaks: dpdk-dev (<< 18.11-4),
+Breaks: dpdk-dev (<< 18.11-4~),
 Replaces: dpdk-dev (<< 18.11),
 Description: Data Plane Development Kit (runtime)
  DPDK is a set of libraries for fast packet processing. Applications run
@@ -79,7 +78,7 @@ Description: Data Plane Development Kit (runtime)
 Package: dpdk-dev
 Section: oldlibs
 Architecture: amd64 arm64 armhf i386 ppc64el
-Breaks: dpdk (<< 18.11-4),
+Breaks: dpdk (<< 18.11-4~),
 Replaces: dpdk (<< 18.11-4),
 Depends: libdpdk-dev (>= ${source:Version}),
          ${misc:Depends},
@@ -143,6 +142,9 @@ Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends},
 Depends: libbsd-dev,
          libibverbs-dev,
+         libipsec-mb-dev [amd64],
+         libelf-dev,
+         libjansson-dev,
          libmnl-dev,
          libnuma-dev,
          libpcap-dev,
@@ -1743,6 +1745,7 @@ Homepage: https://dpdk.org/doc/guides/nics/mlx4.html
 Pre-Depends: ${misc:Pre-Depends},
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+         rdma-core,
 Conflicts: libdpdk0,
 Description: Data Plane Development Kit (librte-pmd-mlx4 runtime library)
  DPDK is a set of libraries for fast packet processing. Applications run
@@ -1757,6 +1760,7 @@ Homepage: https://dpdk.org/doc/guides/nics/mlx5.html
 Pre-Depends: ${misc:Pre-Depends},
 Depends: ${misc:Depends},
          ${shlibs:Depends},
+         rdma-core,
 Conflicts: libdpdk0,
 Description: Data Plane Development Kit (librte-pmd-mlx5 runtime library)
  DPDK is a set of libraries for fast packet processing. Applications run