Merge ~paelzer/ubuntu/+source/dpdk:bug-1836365-LTS-summer-2019-disco into ubuntu/+source/dpdk:debian/experimental

[Christian Ehrhardt ]

[Christian Ehrhardt  (paelzer)]

PPA: https://launchpad.net/~paelzer/+archive/ubuntu/bug-1836365-dpdk-stable-summer-2019

[Christian Ehrhardt  (paelzer)]

Resubmitted against debian/experimental as this is where the upload came from.
That should make the LP diff view more sane.

[Bryce Harrington (bryce)]

Appears to be some patch conflict in the changelog? The individual commits look sane, though.

[Christian Ehrhardt  (paelzer)]

Hmm yeah Bryce, that seems to be an LP issue.
This is based on [1] debian/experimental which except .gitignore is the same thing as git-ubuntu pkg/debian/experimental. No diff in the changelog to be expected.

In fact pkg/ubuntu/eoan-devel == pkg/debian/experimental.
So maybe the smartest target branch for this MP to "look" right in LP is pkg/ubuntu/eoan-devel.
Even thou we are clearly intending to upload this to Disco, but the diff of new code would be minimized.

[1] <email address hidden>:debian/dpdk.git

Unmerged commits

eb83359... by Christian Ehrhardt  on 2019-07-12

changelog: mention fix for mlx rdma-core dependencies (LP: #1820957)

Change-Id: I65637239c64b939eede5bdd532106c13e5400834
Signed-off-by: Christian Ehrhardt <email address hidden>

ddfe2d6... by Christian Ehrhardt  on 2019-07-12

update-maintainer

Change-Id: I24ad0550284f7b7a4ce2e6a7b4f3066c4951e172
Signed-off-by: Christian Ehrhardt <email address hidden>

8cef6df... by Christian Ehrhardt  on 2019-07-12

changelog: Make DPDK LTS release available in Disco (LP: #1784816)

Change-Id: I4645a1ad14a99d0f9564a1ba8dde4d265010f615
Signed-off-by: Christian Ehrhardt <email address hidden>

diff --git a/debian/changelog b/debian/changelog
index 96f836f..9faa279 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dpdk (18.11.2-1ubuntu0.19.04.1) disco; urgency=medium
+
+  * Make DPDK LTS release available in Disco (LP: #1784816)
+    - includes a fix for mlx rdma-core dependencies (LP: #1820957)
+
+ -- Christian Ehrhardt <[e-mail]>  Fri, 12 Jul 2019 14:35:59 +0200
+
 dpdk (18.11.2-1) experimental; urgency=medium
 
   [ Christian Ehrhardt ]
diff --git a/debian/control b/debian/control
index 5d6d224..1212e5b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,7 @@
 Source: dpdk
 Priority: optional
-Maintainer: Debian DPDK Maintainers <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian DPDK Maintainers <[e-mail]>
 Uploaders: Luca Boccassi <[e-mail]>,
            Christian Ehrhardt <[e-mail]>,
            Santiago Ruano Rincón <[e-mail]>,