wayland-protocols: Changes to 'debian-unstable'
debian/changelog | 3 +--
debian/source/local-options | 1 +
debian/source/options | 1 -
3 files changed, 2 insertions(+), 3 deletions(-)
New commits:
commit 4de1ca690b40d639b2d97172f43a334aa39ab3bd
Author: Jordan Justen <jordan.l.justen@intel.com>
Date: Mon Jul 24 23:37:32 2017 -0700
debian: Use local-options and extend-diff-ignore to allow debuild -i to work
This matches the mesa packaging.
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
diff --git a/debian/changelog b/debian/changelog
index 79651e1..f634d11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,7 @@ wayland-protocols (1.9-1) UNRELEASED; urgency=medium
* Update Standards-Version to 4.0.0
* Update debhelper to 10
* Add debian/source/format file to select 3.0 (quilt)
- * Ignore some files for diff generation. (.git, .gitignore,
- autogen.sh and m4/compat.m4)
+ * Ignore some files for diff generation. (autogen.sh and m4/compat.m4)
-- Jordan Justen <jordan.l.justen@intel.com> Fri, 21 Jul 2017 14:48:58 -0700
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..9ac0e4d
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1 @@
+extend-diff-ignore = autogen\.sh|m4/compat\.m4
diff --git a/debian/source/options b/debian/source/options
deleted file mode 100644
index b222f94..0000000
--- a/debian/source/options
+++ /dev/null
@@ -1 +0,0 @@
-diff-ignore = "\.git(/.+|ignore)|autogen.sh|m4/compat.m4"
Reply to: