From 22306055e3f2f85ce333a51502b7ea02081d24a2 Mon Sep 17 00:00:00 2001
From: Mario Limonciello <mario.limonciello@dell.com>
Date: Thu, 2 Apr 2020 12:22:33 -0500
Subject: [PATCH] trivial: enable libjcat from Debian & Ubuntu distro builds

---
 contrib/ci/dependencies.xml | 10 ++++++++++
 contrib/debian/rules        | 13 -------------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/contrib/ci/dependencies.xml b/contrib/ci/dependencies.xml
index e3b514509..fb09674cf 100644
--- a/contrib/ci/dependencies.xml
+++ b/contrib/ci/dependencies.xml
@@ -641,6 +641,16 @@
     <distro id="fedora">
       <package>libjcat-devel</package>
     </distro>
+    <distro id="debian">
+      <control />
+      <package variant="x86_64" />
+      <package variant="s390x" />
+      <package variant="i386" />
+    </distro>
+    <distro id="ubuntu">
+      <control />
+      <package variant="x86_64" />
+    </distro>
   </dependency>
   <dependency type="build" id="libarchive-dev">
     <distro id="centos">
diff --git a/contrib/debian/rules b/contrib/debian/rules
index 6a0a002ec..d362fcd21 100755
--- a/contrib/debian/rules
+++ b/contrib/debian/rules
@@ -46,9 +46,6 @@ override_dh_auto_configure:
 	else \
 		export UEFI="-Dplugin_uefi=false -Dplugin_redfish=false -Dplugin_nvme=false"; \
 	fi; \
-	if [ ! -z "$$CI" ]; then \
-		export CI="-Dlibjcat:introspection=false $$CI"; \
-	fi; \
 	dh_auto_configure -- $$UEFI $$DELL $$FLASHROM $$CI -Dplugin_dummy=true -Dgtkdoc=true
 
 override_dh_install:
@@ -59,16 +56,6 @@ override_dh_install:
 	if [ -d debian/tmp/usr/libexec/fwupd/efi/ ]; then \
 		dh_install -pfwupd usr/libexec/fwupd/efi ;\
 	fi
-	#libjcat built as a subproject for CI
-	if [ ! -z "$$CI" ]; then \
-		dh_install -plibfwupd-dev usr/include/libjcat-1; \
-		dh_install -plibfwupd2 usr/lib/*/libjcat.so.*; \
-		dh_install -plibfwupd-dev usr/lib/*/libjcat.so; \
-		dh_install -plibfwupd-dev usr/lib/*/pkgconfig/jcat.pc; \
-		dh_install -plibfwupd-dev usr/libexec/jcat-tool; \
-		dh_install -plibfwupd-dev usr/share/gir-1.0/Jcat*; \
-		dh_install -pfwupd-tests usr/libexec/installed-tests/libjcat; \
-	fi
 	dh_missing -a --fail-missing
 
 	#this is placed in fwupd-tests