From 64a4bfeb50ae0ea09304b68c481a93dd7218c46c Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Wed, 21 Jun 2017 10:31:06 +0100
Subject: [PATCH] debian/dist/: Add ostree-trivial-httpd.xml, which was
 incorrectly excluded from the upstream release

---
 debian/changelog                     |   2 +
 debian/copyright                     |   4 +-
 debian/dist/ostree-trivial-httpd.xml | 116 +++++++++++++++++++++++++++
 debian/rules                         |   2 +
 4 files changed, 123 insertions(+), 1 deletion(-)
 create mode 100644 debian/dist/ostree-trivial-httpd.xml

diff --git a/debian/changelog b/debian/changelog
index 3f33b31f..5a47ecd7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ ostree (2017.7-1) UNRELEASED; urgency=medium
   * New upstream release
   * Standards-Version: 4.0.0
     - Use https URL for copyright-format
+  * debian/dist/: Add ostree-trivial-httpd.xml, which was incorrectly
+    excluded from the upstream release
 
  -- Simon McVittie <smcv@debian.org>  Wed, 21 Jun 2017 10:07:42 +0100
 
diff --git a/debian/copyright b/debian/copyright
index 16f0cf83..03665f36 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,7 +2,9 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: libOSTree
 Source: https://github.com/ostreedev/ostree/
 
-Files: *
+Files:
+ *
+ debian/dist/*
 Copyright:
  © 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  © 1999-2000, 2002-2005 Free Software Foundation, Inc.
diff --git a/debian/dist/ostree-trivial-httpd.xml b/debian/dist/ostree-trivial-httpd.xml
new file mode 100644
index 00000000..2b846858
--- /dev/null
+++ b/debian/dist/ostree-trivial-httpd.xml
@@ -0,0 +1,116 @@
+<?xml version='1.0'?> <!--*-nxml-*-->
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+    "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+
+<!--
+Copyright 2011,2013 Colin Walters <walters@verbum.org>
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the
+Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.
+-->
+
+<refentry id="ostree">
+
+    <refentryinfo>
+        <title>ostree trivial-httpd</title>
+        <productname>OSTree</productname>
+
+        <authorgroup>
+            <author>
+                <contrib>Developer</contrib>
+                <firstname>Colin</firstname>
+                <surname>Walters</surname>
+                <email>walters@verbum.org</email>
+            </author>
+        </authorgroup>
+    </refentryinfo>
+
+    <refmeta>
+        <refentrytitle>ostree trivial-httpd</refentrytitle>
+        <manvolnum>1</manvolnum>
+    </refmeta>
+
+    <refnamediv>
+        <refname>ostree-trivial-httpd</refname>
+        <refpurpose>Simple webserver</refpurpose>
+    </refnamediv>
+
+    <refsynopsisdiv>
+            <cmdsynopsis>
+                <command>ostree trivial-httpd</command> <arg choice="opt" rep="repeat">OPTIONS</arg> <arg choice="opt">DIR</arg>
+            </cmdsynopsis>
+    </refsynopsisdiv>
+
+<!-- Don't entirely understand this command.  Needs details, better content-->
+    <refsect1>
+        <title>Description</title>
+
+        <para>
+            This runs a simple webserver and keeps it running until killed.  If DIR is not specified, it defaults to the current directory.
+        </para>
+    </refsect1>
+
+    <refsect1>
+        <title>Options</title>
+
+        <variablelist>
+            <varlistentry>
+                <term><option>--daemonize</option>,<option>-d</option></term>
+
+                <listitem><para>
+                    Fork into background when ready.
+                </para></listitem>
+            </varlistentry>
+
+            <varlistentry>
+                <term><option>--autoexit</option></term>
+
+                <listitem><para>
+                    Automatically exit when directory is deleted.
+                </para></listitem>
+            </varlistentry>
+
+            <varlistentry>
+                <term><option>--port-file</option>,<option>-p</option>="PATH"</term>
+
+                <listitem><para>
+                    Write port number to PATH (- for standard output).
+                </para></listitem>
+            </varlistentry>
+
+            <varlistentry>
+                <term><option>--port</option>,<option>-P</option></term>
+
+                <listitem><para>
+                    Use the specified TCP port to listen on.
+                </para></listitem>
+            </varlistentry>
+
+            <varlistentry>
+                <term><option>--force-range-requests</option></term>
+
+                <listitem><para>
+                    Force range requests by only serving half of files.
+                </para></listitem>
+            </varlistentry>
+        </variablelist>
+    </refsect1>
+
+<!-- NEED EXAMPLE OUTPUT HERE!-->
+    <refsect1>
+        <title>Example</title>
+        <para><command>$ ostree trivial-httpd</command></para>
+    </refsect1>
+</refentry>
diff --git a/debian/rules b/debian/rules
index 15057ba9..c8e38178 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,10 +9,12 @@ export LC_ALL=C.UTF-8
 	dh $@ --with=gir
 
 override_dh_auto_clean:
+	rm -f man/ostree-trivial-httpd.xml
 	if [ -e Makefile ]; then dh_auto_clean; fi
 
 override_dh_autoreconf:
 	env NOCONFIGURE=1 dh_autoreconf ./autogen.sh
+	cp debian/dist/ostree-trivial-httpd.xml man/
 
 override_dh_auto_configure:
 	dh_auto_configure -- \