From c1fb4aee0b5f3df74f4183707704113634bb1434 Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbi...@debian.org>
Date: Mon, 30 Oct 2017 00:42:42 -0400
Subject: [PATCH 1/2] debian/rules: Set -DWITH_FFMPEG=OFF on Ubuntu
Closes: #880157
---
debian/rules | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/debian/rules b/debian/rules
index 817910b..1f17c4c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -59,6 +59,12 @@ DEB_CMAKE_EXTRA_FLAGS := -DCMAKE_INSTALL_INCLUDEDIR=include/$(shell dpkg-archit
-DWITH_CLIENT_INTERFACE=OFF \
$(WITH_NEON) \
$(NULL)
+
+# Ubuntu can't have ffmpeg in main
+ifeq ($(shell dpkg-vendor --is Ubuntu && echo yes),yes)
+DEB_CMAKE_EXTRA_FLAGS += -DWITH_FFMPEG=OFF
+endif
+
%:
dh $@ --parallel
--
2.14.1
From 8ca0f485c1537997d05f90a29a9e77b6fadc6716 Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbi...@debian.org>
Date: Mon, 30 Oct 2017 00:49:40 -0400
Subject: [PATCH 2/2] Add debian/gbp.conf
---
debian/gbp.conf | 2 ++
1 file changed, 2 insertions(+)
create mode 100644 debian/gbp.conf
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..cec628c
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+pristine-tar = True
--
2.14.1
