From 825e8818640cf2c52d29a2c343050beeb9504efc Mon Sep 17 00:00:00 2001
From: Mario Limonciello <mario.limonciello@dell.com>
Date: Thu, 8 Jun 2017 09:08:10 -0500
Subject: [PATCH] get debian travis builds working too

For now they'll need to build with debian experimental until
appstream-glib 0.6.13 flows up to unstable (probably after
stretch releases)
---
 .travis.yml                               |  5 ++-
 contrib/ci/Dockerfile-debian-experimental | 40 +++++++++++++++++++++++
 contrib/ci/Dockerfile-debian-unstable     |  4 +--
 3 files changed, 44 insertions(+), 5 deletions(-)
 create mode 100644 contrib/ci/Dockerfile-debian-experimental

diff --git a/.travis.yml b/.travis.yml
index aa075fea6..43dc5192c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,9 +7,8 @@ services:
 
 before_script:
   - docker build -t fwupd-fedora-25 -f contrib/ci/Dockerfile-fedora-25 .
-# currently failing with "Unknown instruction: LIBFWUP-DEV"
-#  - docker build -t fwupd-debian-unstable -f contrib/ci/Dockerfile-debian-unstable .
+  - docker build -t fwupd-debian-experimental -f contrib/ci/Dockerfile-debian-experimental .
 
 script:
   - docker run -t -v `pwd`:/build fwupd-fedora-25 ./contrib/ci/build_and_test.sh
-#  - docker run -t -v `pwd`:/build fwupd-debian-unstable ./contrib/ci/build_and_test.sh
+  - docker run -t -v `pwd`:/build fwupd-debian-experimental ./contrib/ci/build_and_test.sh
diff --git a/contrib/ci/Dockerfile-debian-experimental b/contrib/ci/Dockerfile-debian-experimental
new file mode 100644
index 000000000..875d5dcc3
--- /dev/null
+++ b/contrib/ci/Dockerfile-debian-experimental
@@ -0,0 +1,40 @@
+FROM debian:experimental
+
+RUN echo "deb-src http://deb.debian.org/debian/ unstable main" >> /etc/apt/sources.list
+RUN echo "deb-src http://deb.debian.org/debian/ experimental main" >> /etc/apt/sources.list
+RUN apt-get update -qq
+RUN apt-get install -yq --no-install-recommends \
+	docbook-utils \
+	gcab \
+	gettext \
+	gobject-introspection \
+	gtk-doc-tools \
+	libarchive-dev \
+	libcolord-dev \
+	libcolorhug-dev \
+	libefivar-dev \
+	libelf-dev \
+	libfwup-dev \
+	libgcab-dev \
+	libgirepository1.0-dev \
+	libglib2.0-dev \
+	libgpgme11-dev \
+	libgudev-1.0-dev \
+	libgusb-dev \
+	libpolkit-gobject-1-dev \
+	libsmbios-dev \
+	libsoup2.4-dev \
+	libsqlite3-dev \
+	libtool-bin \
+	meson \
+	pkg-config \
+	policykit-1 \
+	udev \
+	systemd
+#deps not yet in unstable:
+# - new appstream-glib is fwupd dependency
+RUN apt-get -t experimental install -yq --no-install-recommends \
+	gir1.2-appstreamglib-1.0 \
+	libappstream-glib-dev
+RUN mkdir /build
+WORKDIR /build
diff --git a/contrib/ci/Dockerfile-debian-unstable b/contrib/ci/Dockerfile-debian-unstable
index 6dfff7d25..b32a2cf29 100644
--- a/contrib/ci/Dockerfile-debian-unstable
+++ b/contrib/ci/Dockerfile-debian-unstable
@@ -3,7 +3,6 @@ FROM debian:unstable
 RUN echo "deb-src http://deb.debian.org/debian/ unstable main" >> /etc/apt/sources.list
 RUN apt-get update -qq
 RUN apt-get install -yq --no-install-recommends \
-	debhelper \
 	docbook-utils \
 	gcab \
 	gettext \
@@ -15,7 +14,7 @@ RUN apt-get install -yq --no-install-recommends \
 	libcolord-dev \
 	libcolorhug-dev \
 	libefivar-dev \
-	libelf-dev
+	libelf-dev \
 	libfwup-dev \
 	libgcab-dev \
 	libgirepository1.0-dev \
@@ -31,6 +30,7 @@ RUN apt-get install -yq --no-install-recommends \
 	meson \
 	pkg-config \
 	policykit-1 \
+	udev \
 	systemd
 RUN mkdir /build
 WORKDIR /build