From 7cfba1440738126a33255501f18ba8b280f5eb4b Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 10 Mar 2017 23:51:01 +0000 Subject: [PATCH] New upstream release - d/copyright: update - symbols file: update - tests, ostree-tests.install: update for new location of tests - d/control: ostree-tests now needs python-yaml --- debian/changelog | 7 ++++++- debian/control | 1 + debian/copyright | 5 +++-- debian/libostree-1-1.symbols | 4 ++++ debian/ostree-tests.install | 4 ++-- debian/tests/gnome-desktop-testing | 4 ++-- debian/tests/test-local-pull | 2 +- 7 files changed, 19 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8a9fbebb..bbfebc0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,11 @@ -ostree (2017.1-2) UNRELEASED; urgency=medium +ostree (2017.3-1) UNRELEASED; urgency=medium * d/watch, d/copyright: upstream project is now named libostree + * New upstream release + - d/copyright: update + - symbols file: update + - tests, ostree-tests.install: update for new location of tests + - d/control: ostree-tests now needs python-yaml -- Simon McVittie Fri, 10 Mar 2017 23:09:00 +0000 diff --git a/debian/control b/debian/control index b2f1f925..24795026 100644 --- a/debian/control +++ b/debian/control @@ -144,6 +144,7 @@ Depends: gjs [!sparc64], ostree, python, + python-yaml, ${misc:Depends}, ${shlibs:Depends}, Description: content-addressed filesystem for operating system binaries - tests diff --git a/debian/copyright b/debian/copyright index 827270f9..c21f8b5b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -6,14 +6,15 @@ Files: * Copyright: © 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald © 1999-2000, 2002-2005 Free Software Foundation, Inc. - © 2010-2016 Red Hat, Inc + © 1999-2003 Ximian, Inc. + © 2008-2017 Red Hat, Inc © 2011-2017 Colin Walters © 2011 Avery Pennarun © 2013 Collabora Ltd. © 2013 Stef Walter © 2013 Javier Martinez © 2013 Jeremy Whiting - © 2013 Sjoerd Simons + © 2013-2016 Sjoerd Simons © 2014-2016 Alexander Larsson © 2014 Owen Taylor © 2015 Dan Nicholson diff --git a/debian/libostree-1-1.symbols b/debian/libostree-1-1.symbols index 38d47cd7..3a44f398 100644 --- a/debian/libostree-1-1.symbols +++ b/debian/libostree-1-1.symbols @@ -8,6 +8,8 @@ libostree-1.so.1 libostree-1-1 #MINVER# LIBOSTREE_2016.8@LIBOSTREE_2016.8 2016.8 LIBOSTREE_2016.14@LIBOSTREE_2016.14 2016.14 LIBOSTREE_2017.1@LIBOSTREE_2017.1 2017.1 + LIBOSTREE_2017.2@LIBOSTREE_2017.2 2017.2 + LIBOSTREE_2017.3@LIBOSTREE_2017.3 2017.3 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 @@ -113,6 +115,7 @@ libostree-1.so.1 libostree-1-1 #MINVER# ostree_object_type_to_string@LIBOSTREE_2016.3 2016.4 ostree_parse_refspec@LIBOSTREE_2016.3 2016.4 ostree_raw_file_to_archive_z2_stream@LIBOSTREE_2016.6 2016.6 + ostree_raw_file_to_archive_z2_stream_with_options@LIBOSTREE_2017.3 2017.3 ostree_raw_file_to_content_stream@LIBOSTREE_2016.3 2016.4 ostree_repo_abort_transaction@LIBOSTREE_2016.3 2016.4 ostree_repo_add_gpg_signature_summary@LIBOSTREE_2016.3 2016.4 @@ -201,6 +204,7 @@ libostree-1.so.1 libostree-1-1 #MINVER# ostree_repo_read_commit@LIBOSTREE_2016.3 2016.4 ostree_repo_read_commit_detached_metadata@LIBOSTREE_2016.3 2016.4 ostree_repo_regenerate_summary@LIBOSTREE_2016.3 2016.4 + ostree_repo_reload_config@LIBOSTREE_2017.2 2017.2 ostree_repo_remote_add@LIBOSTREE_2016.3 2016.4 ostree_repo_remote_change@LIBOSTREE_2016.3 2016.4 ostree_repo_remote_delete@LIBOSTREE_2016.3 2016.4 diff --git a/debian/ostree-tests.install b/debian/ostree-tests.install index 3e3c075d..f28de121 100644 --- a/debian/ostree-tests.install +++ b/debian/ostree-tests.install @@ -1,3 +1,3 @@ -usr/lib/installed-tests/ostree +usr/lib/installed-tests/libostree usr/lib/ostree/ostree-trivial-httpd -usr/share/installed-tests/ostree +usr/share/installed-tests/libostree diff --git a/debian/tests/gnome-desktop-testing b/debian/tests/gnome-desktop-testing index 0bf126dd..b5d57a76 100755 --- a/debian/tests/gnome-desktop-testing +++ b/debian/tests/gnome-desktop-testing @@ -5,11 +5,11 @@ exec 2>&1 e=0 -tests="$(gnome-desktop-testing-runner -l ostree | while read t; do +tests="$(gnome-desktop-testing-runner -l libostree | while read t; do t="${t%% *}" case "$t" in - (ostree/test-local-pull.sh.test) + (libostree/test-local-pull.sh.test) # frequently times out, https://bugs.debian.org/842606 # https://github.com/ostreedev/ostree/issues/605 continue diff --git a/debian/tests/test-local-pull b/debian/tests/test-local-pull index 36f64d85..ab4e5fe7 100755 --- a/debian/tests/test-local-pull +++ b/debian/tests/test-local-pull @@ -7,7 +7,7 @@ N=3 passed=0 for i in `seq 1 $N`; do - if gnome-desktop-testing-runner ostree/test-local-pull.sh.test; then + if gnome-desktop-testing-runner libostree/test-local-pull.sh.test; then passed=$(( $passed + 1)) fi done