drop 0001-doc-fix-garbage-text-in-generated-HTML-guides.patch being in 18.11.1

Change-Id: I10c328d057c4b0061d3384668f864ec1305155c3
Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>

diff --git a/debian/patches/0001-doc-fix-garbage-text-in-generated-HTML-guides.patch b/debian/patches/0001-doc-fix-garbage-text-in-generated-HTML-guides.patch
deleted file mode 100644 (file)
index 49bb1cd..0000000
--- a/debian/patches/0001-doc-fix-garbage-text-in-generated-HTML-guides.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: doc: fix garbage text in generated HTML guides
- If the user has MAKEFLAGS set in the environment when building the
- documentation, the doc/guides/conf.py script which calls "make"
- exclusively to get the project version might pick up garbage from
- stdout, like:
- <title>FAQ &mdash; Data Plane Development Kit make[2]:
- Entering directory &#39;/build/1st/dpdk-18.11/doc/guides&#39;
- 18.11.0
- make[2]: Leaving directory &#39;/build/1st/dpdk-18.11&#39;
- documentation</title>
- Override MAKEFLAGS in the Python subprocess call to avoid this issue.
-Author: bluca@debian.org
-Forwarded: https://patches.dpdk.org/patch/48544/
---- a/doc/guides/conf.py
-+++ b/doc/guides/conf.py
-@@ -9,6 +9,7 @@ from sphinx import __version__ as sphinx
- from sphinx.highlighting import PygmentsBridge
- from pygments.formatters.latex import LatexFormatter
- from os import listdir
-+from os import environ
- from os.path import basename
- from os.path import dirname
- from os.path import join as path_join
-@@ -37,7 +38,9 @@ html_add_permalinks = ""
- html_show_copyright = False
- highlight_language = 'none'
- 
--version = subprocess.check_output(['make', '-sRrC', '../../', 'showversion'])
-+# If MAKEFLAGS is exported by the user, garbage text might end up in version
-+version = subprocess.check_output(['make', '-sRrC', '../../', 'showversion'],
-+                                  env=dict(environ, MAKEFLAGS=""))
- version = version.decode('utf-8').rstrip()
- release = version
- 

diff --git a/debian/patches/series b/debian/patches/series
index 38b80db..7cb5421 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-0001-doc-fix-garbage-text-in-generated-HTML-guides.patch
 0002-build-use-generic-march-on-arm64-when-using-default.patch
 0003-build-mention-march-in-pkg-config-description.patch
 0004-build-bump-minimum-Meson-version-to-0.47.1.patch