Manual merge of version 2017.12-1+rpi1 and 2017.14-1 to produce 2017.14-1+rpi1

diff --cc debian/changelog
index 07dcc1334724fdf3a0a72261007bb42776d9b0f8,5ac75656b8816920af5852bd56f07fa216e2b40d..96d5356e31d86f70c0cc6586643190dd440401b1
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,57 +1,64 @@@
- ostree (2017.12-1+rpi1) buster-staging; urgency=medium
++ostree (2017.14-1+rpi1) buster-staging; urgency=medium
 +
 +  [changes brought forward from 2017.11-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Thu, 28 Sep 2017 16:17:06 +0000]
 +  * Disable testsuite.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 12 Oct 2017 11:52:04 +0000
++ -- Peter Michael Green <plugwash@raspbian.org>  Sat, 23 Dec 2017 00:07:40 +0000
++
+ ostree (2017.14-1) unstable; urgency=medium
+ 
+   * New upstream release
+     - d/libostree-1-1.symbols: Update
+   * Standards-Version: 4.1.2 (no changes required)
+   * d/p/tests-Don-t-assume-uid-primary-gid.patch:
+     Add patch to fix automated test failure when uid != primary gid
+ 
+  -- Simon McVittie <smcv@debian.org>  Sun, 10 Dec 2017 19:42:36 +0000
+ 
+ ostree (2017.13-1) unstable; urgency=medium
+ 
+   * New upstream release
+     - d/patches: Drop all patches
+     - d/copyright: Update
+     - Update symbols file
+   * d/control: Require dh-exec 0.23~, for build-profile support.
+     Strictly speaking we might only need 0.15, but I'm not going to
+     test versions older than the jessie backport.
+   * Set Rules-Requires-Root to no
+   * Standards-Version: 4.1.1 (no changes required)
+ 
+  -- Simon McVittie <smcv@debian.org>  Sat, 04 Nov 2017 14:05:06 +0000
+ 
+ ostree (2017.12-2) unstable; urgency=medium
+ 
+   * Disable gtk-doc if we are not going to build libostree-doc,
+     in particular for architecture-specific builds. Note that it remains
+     in Build-Depends (not Build-Depends-Indep) because it is also needed
+     for gtkdocize during dh_autoreconf.
+     - In particular this might fix FTBFS on sparc64, where highlight(1)
+       fails.
+   * d/p/2017.13/lib-core-Init-struct-stat-buffer.patch,
+     d/p/2017.13/lib-sysroot-Fix-pointer-going-out-of-scope-in-unlock-code.patch,
+     d/p/2017.13/lib-deploy-Ignore-FIFREEZE-FITHAW-errors-when-already-in-.patch,
+     d/p/2017.13/lib-deploy-Use-_exit-for-FIFREEZE-watchdog.patch,
+     d/p/2017.13/lib-deltas-Check-cancellable-during-processing.patch,
+     d/p/2017.13/lib-utils-Check-for-invalid-UTF-8-in-filenames.patch,
+     d/p/2017.13/Cope-with-xattr-syscalls-raising-EOPNOTSUPP.patch,
+     d/p/2017.13/lib-sysroot-Fix-error-handling-when-mounting-overlayfs-fa.patch,
+     d/p/2017.13/lib-repo-Properly-handle-NULL-homedir-when-signing-commit.patch,
+     d/p/2017.13/fdio-allow-NULL-for-fstatat_allow_noent-stbuf.patch,
+     d/p/2017.13/lib-repo-Fix-loading-commitstate-with-parent-repos.patch:
+     Add various bugfix patches from upstream
+     - In particular, dealing with the possibility that EOPNOTSUPP != ENOTSUP
+       should fix test failures on hppa.
+   * d/p/2017.13/tests-Add-test-pull-bareuseronly.patch:
+     Add more test coverage from upstream
+     - d/rules: Make the new test executable
+   * d/test.sh: Clean up ostree-trivial-httpd processes
+   * d/test.sh: Don't repeat build-time tests if they fail once. They seem
+     to be somewhat reliable now.
+ 
+  -- Simon McVittie <smcv@debian.org>  Fri, 27 Oct 2017 00:19:45 +0100
  
  ostree (2017.12-1) unstable; urgency=medium
  

diff --cc debian/rules
index fcd0f843e95b243555752ac14275e072a4c733c7,60855cbc7e81cbb1fe2d9bd58fc335fca8ceee34..415b6037a1c7d60bc5a089dd70c15b94a4b8473d
--- 1/debian/rules
--- 2/debian/rules
+++ b/debian/rules
@@@ -34,8 -40,8 +40,9 @@@ override_dh_auto_configure
  
  override_dh_auto_test-arch:
  ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
 -      debian/test.sh
+       chmod +x tests/test-pull-bareuseronly.sh
 +      echo testsuite disabled
 +      #debian/test.sh
  endif
  
  override_dh_auto_test-indep: