[SCM] intel-vaapi-driver/master: Ignore-debian.upstream.patch: replicate patch from libva.

[sten-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b18484b05c135719da2fe7be3bc95ad2b6816f62
Author: Nicholas D Steeves <nsteeves at gmail.com>
Date:   Mon Jul 25 13:02:31 2016 -0400

    Ignore-debian.upstream.patch: replicate patch from libva.

diff --git a/debian/changelog b/debian/changelog
index 97d9c7a..d843983 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+intel-vaapi-driver (1.7.1-2) UNRELEASED; urgency=medium
+
+  * debian/patches/ignore-debian.upstream.patch: replicate patch from libva
+
+ -- Nicholas D Steeves <nsteeves at gmail.com>  Mon, 25 Jul 2016 12:23:21 -0400
+
 intel-vaapi-driver (1.7.1-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/ignore-debian.upstream.patch b/debian/patches/ignore-debian.upstream.patch
new file mode 100644
index 0000000..2954124
--- /dev/null
+++ b/debian/patches/ignore-debian.upstream.patch
@@ -0,0 +1,24 @@
+Index: intel-vaapi-driver/Makefile.am
+===================================================================
+--- intel-vaapi-driver.orig/Makefile.am
++++ intel-vaapi-driver/Makefile.am
+@@ -1,6 +1,6 @@
+ AUTOMAKE_OPTIONS = foreign
+ 
+-SUBDIRS = debian.upstream src
++SUBDIRS = src
+ 
+ # Extra clean files so that maintainer-clean removes *everything*
+ MAINTAINERCLEANFILES = \
+Index: intel-vaapi-driver/configure.ac
+===================================================================
+--- intel-vaapi-driver.orig/configure.ac
++++ intel-vaapi-driver/configure.ac
+@@ -190,7 +190,6 @@ AM_CONDITIONAL(USE_WAYLAND, test "$USE_W
+ 
+ AC_OUTPUT([
+     Makefile
+-    debian.upstream/Makefile 
+     src/Makefile
+     src/shaders/Makefile
+     src/shaders/h264/Makefile
diff --git a/debian/patches/series b/debian/patches/series
index f1f963d..d34f447 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-Fix_FTBFS_on_kFreeBSD.patch
+ignore-debian.upstream.patch

-- 
intel-vaapi-driver packaging