[SCM] intel-vaapi-driver/master: Refresh

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Thu Nov 10 19:36:10 UTC 2016


The following commit has been merged in the master branch:
commit e76454f092c227c3b752ef6e13797bfda64a636c
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Thu Nov 10 20:32:07 2016 +0100

    Refresh

diff --git a/debian/patches/ignore-debian.upstream.patch b/debian/patches/ignore-debian.upstream.patch
index 02dcb3d..36ad3c2 100644
--- a/debian/patches/ignore-debian.upstream.patch
+++ b/debian/patches/ignore-debian.upstream.patch
@@ -3,23 +3,19 @@ Description: Ignore files in debian.upstream
 Author: Nicholas Steeves <nsteeves at gmail.com>
 Forwarded: not-needed
 
-Index: intel-vaapi-driver/Makefile.am
-===================================================================
---- intel-vaapi-driver.orig/Makefile.am
-+++ intel-vaapi-driver/Makefile.am
+--- a/Makefile.am
++++ b/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
+ if ENABLE_TESTS
+ SUBDIRS += test
+--- a/configure.ac
++++ b/configure.ac
+@@ -197,7 +197,6 @@
  
  AC_OUTPUT([
      Makefile

-- 
intel-vaapi-driver packaging



More information about the pkg-multimedia-commits mailing list