From 4e19e1f4cdfa953e5c4abd3b0eda746d838b66d4 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Fri, 15 Sep 2017 16:58:11 +0100
Subject: [PATCH] Stop providing "ostree trivial-httpd" CLI

This follows upstream default behaviour. flatpak used to use it in its
tests, but the version in stable no longer does.
---
 debian/changelog                              |  5 +--
 debian/patches/series                         |  1 -
 ...elp.sh-Skip-trivial-httpd-if-enabled.patch | 36 -------------------
 debian/rules                                  |  1 -
 4 files changed, 3 insertions(+), 40 deletions(-)
 delete mode 100644 debian/patches/test-help.sh-Skip-trivial-httpd-if-enabled.patch

diff --git a/debian/changelog b/debian/changelog
index fc352079..c5694bcb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,10 +9,11 @@ ostree (2017.11-1) UNRELEASED; urgency=medium
   * Stop copying an old ostree-trivial-httpd.xml from debian/dist/
     into source tree. Upstream distributes it again, and has since
     2017.8.
-  * Add a patch to fix the new test-help.sh when ostree trivial-httpd
-    is enabled. At the moment we still build that tool.
   * Add a patch to fix JavaScript tests with gjs 1.50.0, which is
     more strict about 'let'
+  * Stop providing "ostree trivial-httpd" CLI, following upstream
+    default behaviour. flatpak used to use it in its tests, but
+    the version in stable no longer does.
 
  -- Simon McVittie <smcv@debian.org>  Wed, 30 Aug 2017 10:09:26 +0100
 
diff --git a/debian/patches/series b/debian/patches/series
index a9f2a3fb..d3bc5c55 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 Fix-JavaScript-tests-with-gjs-1.50.0.patch
-test-help.sh-Skip-trivial-httpd-if-enabled.patch
diff --git a/debian/patches/test-help.sh-Skip-trivial-httpd-if-enabled.patch b/debian/patches/test-help.sh-Skip-trivial-httpd-if-enabled.patch
deleted file mode 100644
index e9809ca3..00000000
--- a/debian/patches/test-help.sh-Skip-trivial-httpd-if-enabled.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Simon McVittie <smcv@collabora.com>
-Date: Fri, 15 Sep 2017 16:05:48 +0100
-Subject: test-help.sh: Skip trivial-httpd if enabled
-
-Because it runs a binary in ${libexecdir}, it will only work if
-libostree was already installed, which makes the build-time test fail.
-It also doesn't produce the output we expect: its usage mechanism
-mentions "ostree-trivial-httpd", not "ostree trivial-httpd".
-
-Signed-off-by: Simon McVittie <smcv@collabora.com>
----
- tests/test-help.sh | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/tests/test-help.sh b/tests/test-help.sh
-index 75fe0c1..ad74aaf 100755
---- a/tests/test-help.sh
-+++ b/tests/test-help.sh
-@@ -75,7 +75,16 @@ test_recursive() {
-         assert_file_empty out
- 
-         for subcmd in $builtins; do
--            test_recursive "$cmd $subcmd"
-+            case "$subcmd" in
-+                (trivial-httpd)
-+                    # Skip trivial-httpd if enabled, it doesn't work
-+                    # uninstalled (and also doesn't produce the output
-+                    # we expect).
-+                    ;;
-+                (*)
-+                    test_recursive "$cmd $subcmd"
-+                    ;;
-+            esac
-         done
-     fi
- }
diff --git a/debian/rules b/debian/rules
index 8dfef084..7c76a019 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,6 @@ override_dh_autoreconf:
 
 configure_options = \
 	--enable-installed-tests \
-	--enable-trivial-httpd-cmdline \
 	--libexecdir='$${prefix}/lib' \
 	--with-dracut \
 	--with-grub2 \