From 4045b9a7b748da83b4ce1acaa1403becfa592505 Mon Sep 17 00:00:00 2001
From: Colin Snover
Date: Mon, 20 Nov 2017 21:44:51 -0600
Subject: DISTS/DEBIAN: Update to current files from downstream, less patches

One patch is eliminated by the previous commit; the other patch,
for ARM, is going to get fixed one way or the other by either
landing gh-1052 or actually having the ARM assembly not be broken
any more (or the first one first, and then the second one later
when someone has enough time to do the work and test it).

Fixes Trac#7105.
---
 dists/debian/source/format  | 1 +
 dists/debian/source/options | 4 ++++
 2 files changed, 5 insertions(+)
 create mode 100644 dists/debian/source/format
 create mode 100644 dists/debian/source/options

(limited to 'dists/debian/source')

diff --git a/dists/debian/source/format b/dists/debian/source/format
new file mode 100644
index 0000000000..163aaf8d82
--- /dev/null
+++ b/dists/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/dists/debian/source/options b/dists/debian/source/options
new file mode 100644
index 0000000000..628961cb39
--- /dev/null
+++ b/dists/debian/source/options
@@ -0,0 +1,4 @@
+compression = "xz"
+
+# ignore changes on replaced (unbundled) fonts
+extend-diff-ignore = "(^|/)gui/themes/scummmodern/[^/]+\.ttf$"
-- 
cgit v1.2.3