diff --git a/debian/changelog b/debian/changelog index 5de85ab0..f543e927 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ ostree (2016.9-1) UNRELEASED; urgency=medium - update ostree-boot packaging: the utilities in /usr/sbin moved to /usr/lib/ostree - drop libgsystem build-dependency + - d/p/Makefile-tests.am-make-check-uses-the-built-binaries.patch: + drop, applied upstream * Explicitly build-depend on xsltproc, which is directly used -- Simon McVittie Fri, 12 Aug 2016 10:30:01 +0100 diff --git a/debian/patches/Makefile-tests.am-make-check-uses-the-built-binaries.patch b/debian/patches/Makefile-tests.am-make-check-uses-the-built-binaries.patch deleted file mode 100644 index e3fdf592..00000000 --- a/debian/patches/Makefile-tests.am-make-check-uses-the-built-binaries.patch +++ /dev/null @@ -1,57 +0,0 @@ -From: Giuseppe Scrivano -Date: Thu, 14 Jul 2016 13:42:32 +0200 -Subject: Makefile-tests.am: make check uses the built binaries - -The tests suite was failing locally as it was using the installed -version of rofiles-fuse, instead of the built one. Create the needed -symlinks in tests/ as we are already doing for the "ostree" binary. - -ostree-prepare-root and ostree-remount added for completeness. - -Signed-off-by: Giuseppe Scrivano - -Bug: #395 -Reviewed-by: cgwalters -Origin: upstream, commit:307f4b2957d0416604b1b0f9e74d72fd695c7137 ---- - Makefile-tests.am | 18 +++++++++++++----- - 1 file changed, 13 insertions(+), 5 deletions(-) - -diff --git a/Makefile-tests.am b/Makefile-tests.am -index e274c5e..0b6b64e 100644 ---- a/Makefile-tests.am -+++ b/Makefile-tests.am -@@ -33,7 +33,8 @@ TESTS_ENVIRONMENT += OT_TESTS_DEBUG=1 \ - PATH=$$(cd $(top_builddir)/tests && pwd):$${PATH} \ - $(NULL) - --uninstalled_test_data = tests/ostree-symlink-stamp -+uninstalled_test_data = tests/ostree-symlink-stamp tests/ostree-prepare-root-symlink-stamp \ -+ tests/ostree-remount-symlink-stamp tests/rofiles-fuse-symlink-stamp - - dist_uninstalled_test_scripts = tests/test-symbols.sh - -@@ -238,12 +239,19 @@ EXTRA_DIST += \ - tests/libreaddir-rand.so: Makefile - $(AM_V_GEN) ln -fns ../.libs/libreaddir-rand.so tests - ALL_LOCAL_RULES += tests/libreaddir-rand.so --CLEANFILES += tests/libreaddir-rand.so tests/ostree-symlink-stamp tests/ostree -+CLEANFILES += tests/libreaddir-rand.so tests/ostree-symlink-stamp \ -+ tests/ostree-prepare-root-symlink-stamp tests/ostree-remount-symlink-stamp \ -+ tests/rofiles-fuse-symlink-stamp tests/ostree - --tests/ostree-symlink-stamp: Makefile -+tests/%-symlink-stamp: Makefile - @set -e; \ -- real_bin=`cd $(top_builddir) && ./libtool --mode=execute echo ostree`; \ -- ln -sf "$${real_bin}" tests/ostree; \ -+ lt_bin=`cd $(top_builddir) && ./libtool --mode=execute echo $*`; \ -+ if test "$${lt_bin}" = "$*"; then \ -+ real_bin=$(abs_top_builddir)/$*; \ -+ else \ -+ real_bin="$${lt_bin}"; \ -+ fi; \ -+ ln -sf "$${real_bin}" tests/$*; \ - touch $@ - - # Unfortunately the glib test data APIs don't actually handle diff --git a/debian/patches/series b/debian/patches/series index 0642114e..e69de29b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +0,0 @@ -Makefile-tests.am-make-check-uses-the-built-binaries.patch