xserver-xorg-video-intel: Changes to 'debian-unstable'

[Vincent Cheng <vcheng@moszumanska.debian.org>]

 debian/changelog            |    1 +
 debian/source/local-options |    1 +
 2 files changed, 2 insertions(+)

New commits:
commit 0e45c441be4500254d3fe01e2e0aa7f7d9c4b67d
Author: Timo Aaltonen <tjaalton@debian.org>
Date:   Wed Apr 22 15:24:44 2015 +0300

    source: Add extend-diff-ignore to not complain about symlinks.
    
    Conflicts:
    	debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 25e331c..b59a434 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ xserver-xorg-video-intel (2:2.99.917-2) UNRELEASED; urgency=medium
 
   [ Timo Aaltonen ]
   * rules: Fix valgrind-enabling check.
+  * source: Add extend-diff-ignore to not complain about symlinks.
   * README.source: Mention that dpkg-source complains about symlinks
     which are real files on the tarball, and add a command to clean
     those before source build (copied from libdrm).
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..10404f5
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1 @@
+--extend-diff-ignore=src/render_program/exa_.*.g8a