From 893a021a426ea1d5dbdb322060102663360723ae Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Sun, 26 Jun 2016 12:27:19 +0100 Subject: [PATCH] d/p/libostree.sym-Fix-test-symbols.patch: apply patch from upstream to fix a build-time test --- debian/changelog | 2 ++ .../libostree.sym-Fix-test-symbols.patch | 25 +++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 28 insertions(+) create mode 100644 debian/patches/libostree.sym-Fix-test-symbols.patch diff --git a/debian/changelog b/debian/changelog index e32bad85..0d66baf5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ ostree (2016.6-1) UNRELEASED; urgency=medium * d/gbp.conf: configure to use upstream/latest for upstream imports * d/gbp.conf: configure to merge upstream tags into upstream/latest (add https://github.com/ostreedev/ostree as a remote) + * d/p/libostree.sym-Fix-test-symbols.patch: apply patch from upstream + to fix a build-time test -- Simon McVittie Wed, 15 Jun 2016 14:05:53 -0400 diff --git a/debian/patches/libostree.sym-Fix-test-symbols.patch b/debian/patches/libostree.sym-Fix-test-symbols.patch new file mode 100644 index 00000000..cadbbbe6 --- /dev/null +++ b/debian/patches/libostree.sym-Fix-test-symbols.patch @@ -0,0 +1,25 @@ +From: Colin Walters +Date: Mon, 20 Jun 2016 18:13:58 -0400 +Subject: libostree.sym: Fix test-symbols + +The test isn't smart enough to ignore comments, so change the prefix. + +Closes: #356 +Approved by: jlebon +Origin: upstream, 2016.7, commit:0134c621575fcb43bb9d994251831845dac8dbd1 +--- + src/libostree/libostree.sym | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libostree/libostree.sym b/src/libostree/libostree.sym +index e8cca9d..087f987 100644 +--- a/src/libostree/libostree.sym ++++ b/src/libostree/libostree.sym +@@ -350,6 +350,6 @@ global: + /* + LIBOSTREE_2016.7 { + global: +- ostree_some_new_symbol; ++ someostree_some_new_symbol; + } LIBOSTREE_2016.6; + */ diff --git a/debian/patches/series b/debian/patches/series index e69de29b..a185cd6c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -0,0 +1 @@ +libostree.sym-Fix-test-symbols.patch