New upstream release

debian/changelog

@@ -1,6 +1,13 @@
-ostree (2016.15-4) UNRELEASED; urgency=medium
+ostree (2017.1-1) UNRELEASED; urgency=medium
 
+  * Branch to experimental to avoid interfering with the Debian 9 freeze
   * Remove an unintended line in the previous changelog
+  * New upstream release
+    - trivial-httpd is now a separate binary. Move it to ostree-tests,
+      so that it doesn't continue to pull in libsoup if the ostree
+      downloader is ported to libcurl.
+    - d/copyright: update
+    - d/patches: drop all patches, applied upstream
 
  -- Simon McVittie <smcv@debian.org>  Thu, 19 Jan 2017 16:45:47 +0000
 

debian/copyright

@@ -7,7 +7,7 @@ Copyright:
  © 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  © 1999-2000, 2002-2005 Free Software Foundation, Inc.
  © 2010-2016 Red Hat, Inc
- © 2011-2016 Colin Walters <walters@verbum.org>
+ © 2011-2017 Colin Walters <walters@verbum.org>
  © 2011 Avery Pennarun
  © 2013 Collabora Ltd.
  © 2013 Stef Walter <stef@redhat.com>
@@ -57,6 +57,7 @@ Files: debian/*
 Copyright:
  © 2015 David King <amigadave@amigadave.com>
  © 2016 Collabora Ltd.
+ © 2017 Simon McVittie
 License: LGPL-2+
 
 License: GPL-2+ with Autoconf exception

debian/libostree-1-1.symbols

@@ -7,6 +7,7 @@ libostree-1.so.1 libostree-1-1 #MINVER#
  LIBOSTREE_2016.7@LIBOSTREE_2016.7 2016.7
  LIBOSTREE_2016.8@LIBOSTREE_2016.8 2016.8
  LIBOSTREE_2016.14@LIBOSTREE_2016.14 2016.14
+ LIBOSTREE_2017.1@LIBOSTREE_2017.1 2017.1
  ostree_async_progress_finish@LIBOSTREE_2016.3 2016.4
  ostree_async_progress_get_status@LIBOSTREE_2016.3 2016.4
  ostree_async_progress_get_type@LIBOSTREE_2016.3 2016.4
@@ -190,6 +191,7 @@ libostree-1.so.1 libostree-1-1 #MINVER#
  ostree_repo_open@LIBOSTREE_2016.3 2016.4
  ostree_repo_prepare_transaction@LIBOSTREE_2016.3 2016.4
  ostree_repo_prune@LIBOSTREE_2016.3 2016.4
+ ostree_repo_prune_from_reachable@LIBOSTREE_2017.1 2017.1
  ostree_repo_prune_static_deltas@LIBOSTREE_2016.3 2016.4
  ostree_repo_pull@LIBOSTREE_2016.3 2016.4
  ostree_repo_pull_default_console_progress_changed@LIBOSTREE_2016.3 2016.4

debian/ostree-tests.install

@@ -1,2 +1,3 @@
 usr/lib/installed-tests/ostree
+usr/lib/ostree/ostree-trivial-httpd
 usr/share/installed-tests/ostree

debian/patches/Fix-TAP-syntax-in-test-basic-user.sh-and-run-it.patch

@@ -1,53 +0,0 @@
-From: Simon McVittie <smcv@debian.org>
-Date: Thu, 19 Jan 2017 11:21:58 +0000
-Subject: Fix TAP syntax in test-basic-user.sh, and run it
-
-In its initial commit, Alexander Larsson wrote
-
-    This works standalone, but unfortunately it breaks in
-    gnome-desktop-testing-runner as /tmp doesn't support
-    xattrs, so it is not installed atm.
-
-but we now (a) use /var/tmp, and (b) explicitly skip the test if
-xattr support is unavailable. So it should be OK to run now.
-
-Forwarded: https://github.com/ostreedev/ostree/pull/652
----
- Makefile-tests.am        | 2 +-
- tests/test-basic-user.sh | 3 ---
- 2 files changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/Makefile-tests.am b/Makefile-tests.am
-index 1f9cad48..02668ed3 100644
---- a/Makefile-tests.am
-+++ b/Makefile-tests.am
-@@ -44,6 +44,7 @@ dist_uninstalled_test_scripts = tests/test-symbols.sh
- 
- dist_test_scripts = \
- 	tests/test-basic.sh \
-+	tests/test-basic-user.sh \
- 	tests/test-pull-subpath.sh \
- 	tests/test-archivez.sh \
- 	tests/test-remote-add.sh \
-@@ -118,7 +119,6 @@ dist_installed_test_data = tests/archive-test.sh \
- 	tests/pull-test.sh \
- 	tests/admin-test.sh \
- 	tests/basic-test.sh \
--	tests/test-basic-user.sh \
- 	tests/corrupt-repo-ref.js \
- 	tests/pre-endian-deltas-repo-big.tar.xz \
- 	tests/pre-endian-deltas-repo-little.tar.xz \
-diff --git a/tests/test-basic-user.sh b/tests/test-basic-user.sh
-index 42e6a864..3e11545e 100755
---- a/tests/test-basic-user.sh
-+++ b/tests/test-basic-user.sh
-@@ -23,9 +23,6 @@ set -euo pipefail
- 
- skip_without_user_xattrs
- 
--echo "1..1"
--
- setup_test_repository "bare-user"
--echo "ok setup"
- 
- . $(dirname $0)/basic-test.sh

debian/patches/Make-corrupt-repo-ref.js-executable.patch

@@ -1,44 +0,0 @@
-From: Simon McVittie <smcv@debian.org>
-Date: Thu, 19 Jan 2017 11:34:57 +0000
-Subject: Make corrupt-repo-ref.js executable
-
-Debian's Lintian packaging consistency check complains that it isn't
-executable but has a #! line. In fact it's reasonable to run this
-script directly, so make it executable, and put it in a _scripts
-variable so it will be installed executable.
-
-Forwarded: https://github.com/ostreedev/ostree/pull/652
----
- Makefile-tests.am         | 8 +++++---
- tests/corrupt-repo-ref.js | 0
- 2 files changed, 5 insertions(+), 3 deletions(-)
- mode change 100644 => 100755 tests/corrupt-repo-ref.js
-
-diff --git a/Makefile-tests.am b/Makefile-tests.am
-index 02668ed3..202e108a 100644
---- a/Makefile-tests.am
-+++ b/Makefile-tests.am
-@@ -119,15 +119,17 @@ dist_installed_test_data = tests/archive-test.sh \
- 	tests/pull-test.sh \
- 	tests/admin-test.sh \
- 	tests/basic-test.sh \
--	tests/corrupt-repo-ref.js \
- 	tests/pre-endian-deltas-repo-big.tar.xz \
- 	tests/pre-endian-deltas-repo-little.tar.xz \
- 	$(NULL)
- 
- EXTRA_DIST += tests/libtest.sh 
- 
--dist_test_extra_scripts = tests/bootloader-entries-crosscheck.py \
--     tests/ostree-grub-generator
-+dist_test_extra_scripts = \
-+	tests/bootloader-entries-crosscheck.py \
-+	tests/corrupt-repo-ref.js \
-+	tests/ostree-grub-generator \
-+	$(NULL)
- 
- # We can't use nobase_ as we need to strip off the tests/, can't
- # use plain installed_ as we do need the gpghome/ prefix.
-diff --git a/tests/corrupt-repo-ref.js b/tests/corrupt-repo-ref.js
-old mode 100644
-new mode 100755

debian/patches/Sourced-test-snippets-remove-shebang-and-make-non-executa.patch

@@ -1,77 +0,0 @@
-From: Simon McVittie <smcv@debian.org>
-Date: Thu, 19 Jan 2017 11:23:30 +0000
-Subject: Sourced test snippets: remove shebang and make non-executable
-
-They are installed non-executable, which makes Debian's Lintian
-packaging consistency check complain that #! is only useful
-in executable scripts. But in fact they are not useful to execute
-directly (they rely on setup being done in the script that sources
-them), so just chmod them -x.
-
-Forwarded: https://github.com/ostreedev/ostree/pull/652
----
- tests/admin-test.sh   | 3 ++-
- tests/archive-test.sh | 4 ++--
- tests/basic-test.sh   | 4 ++--
- tests/pull-test.sh    | 4 ++--
- 4 files changed, 8 insertions(+), 7 deletions(-)
- mode change 100755 => 100644 tests/admin-test.sh
- mode change 100755 => 100644 tests/archive-test.sh
- mode change 100755 => 100644 tests/basic-test.sh
- mode change 100755 => 100644 tests/pull-test.sh
-
-diff --git a/tests/admin-test.sh b/tests/admin-test.sh
-old mode 100755
-new mode 100644
-index 76fc8b85..cc06fe6f
---- a/tests/admin-test.sh
-+++ b/tests/admin-test.sh
-@@ -1,4 +1,5 @@
--#!/bin/bash
-+# This file is to be sourced, not executed
-+
- # Copyright (C) 2011,2014 Colin Walters <walters@verbum.org>
- #
- # This library is free software; you can redistribute it and/or
-diff --git a/tests/archive-test.sh b/tests/archive-test.sh
-old mode 100755
-new mode 100644
-index e6f67cf5..9c5f8a47
---- a/tests/archive-test.sh
-+++ b/tests/archive-test.sh
-@@ -1,5 +1,5 @@
--#!/bin/bash
--#
-+# This file is to be sourced, not executed
-+
- # Copyright (C) 2011 Colin Walters <walters@verbum.org>
- #
- # This library is free software; you can redistribute it and/or
-diff --git a/tests/basic-test.sh b/tests/basic-test.sh
-old mode 100755
-new mode 100644
-index bb387501..f3e37239
---- a/tests/basic-test.sh
-+++ b/tests/basic-test.sh
-@@ -1,5 +1,5 @@
--#!/bin/bash
--#
-+# This file is to be sourced, not executed
-+
- # Copyright (C) 2011 Colin Walters <walters@verbum.org>
- #
- # This library is free software; you can redistribute it and/or
-diff --git a/tests/pull-test.sh b/tests/pull-test.sh
-old mode 100755
-new mode 100644
-index 56258b6c..56b24a0c
---- a/tests/pull-test.sh
-+++ b/tests/pull-test.sh
-@@ -1,5 +1,5 @@
--#!/bin/bash
--#
-+# This file is to be sourced, not executed
-+
- # Copyright (C) 2011 Colin Walters <walters@verbum.org>
- #
- # This library is free software; you can redistribute it and/or

debian/patches/series

@@ -1,3 +0,0 @@
-Fix-TAP-syntax-in-test-basic-user.sh-and-run-it.patch
-Sourced-test-snippets-remove-shebang-and-make-non-executa.patch
-Make-corrupt-repo-ref.js-executable.patch