Merge branch 'debian/experimental' into debian/master

This commit is contained in:
Simon McVittie committed 2018-06-21 19:21:34 +01:00
commit 8bace1be73
118 files changed
+4537 -3229

No files matched your search

+12
View File
@@ -1,3 +1,15 @@
ostree (2018.5+42+gecdebeb2-1) UNRELEASED; urgency=medium
* Switch to experimental branch
* New upstream git snapshot with support for peer-to-peer software
collections, required by Flatpak's peer-to-peer app sharing feature
- d/copyright: Update
- d/libostree-1-1.symbols: Update
- Build-depend on Avahi libraries
* d/rules: Explicitly enable various desired libraries
-- Simon McVittie <smcv@debian.org> Fri, 08 Jun 2018 09:10:21 +0100
ostree (2018.5-2) unstable; urgency=medium
* d/tests/gnome-desktop-testing: Skip libostree/test-concurrency.py.test
+3 -1
View File
@@ -25,6 +25,8 @@ Build-Depends:
gtk-doc-tools <!nodoc>,
libarchive-dev,
libattr1-dev,
libavahi-client-dev (>= 0.6.31),
libavahi-glib-dev (>= 0.6.31),
libcap-dev,
libfuse-dev,
libgirepository1.0-dev,
@@ -46,7 +48,7 @@ Build-Depends-Indep:
Rules-Requires-Root: no
Standards-Version: 4.1.4
Homepage: https://github.com/ostreedev/ostree/
Vcs-Git: https://salsa.debian.org/debian/ostree.git
Vcs-Git: https://salsa.debian.org/debian/ostree.git -b debian/experimental
Vcs-Browser: https://salsa.debian.org/debian/ostree
Package: gir1.2-ostree-1.0
+1 -1
View File
@@ -21,7 +21,7 @@ Copyright:
© 2014 Owen Taylor <otaylor@redhat.com>
© 2015 Dan Nicholson <nicholson@endlessm.com>
© 2015 Canonical Ltd.
© 2017 Endless Mobile, Inc.
© 2017-2018 Endless Mobile, Inc.
© 2018 Matthew Leeds
License: LGPL-2+
+1 -1
View File
@@ -1,7 +1,7 @@
[DEFAULT]
pristine-tar = True
compression = xz
debian-branch = debian/master
debian-branch = debian/experimental
upstream-branch = upstream/latest
patch-numbers = False
upstream-vcs-tag = v%(version)s
+51
View File
@@ -25,6 +25,7 @@ libostree-1.so.1 libostree-1-1 #MINVER#
LIBOSTREE_2018.2@LIBOSTREE_2018.2 2018.2
LIBOSTREE_2018.3@LIBOSTREE_2018.3 2018.3
LIBOSTREE_2018.5@LIBOSTREE_2018.5 2018.5
LIBOSTREE_2018.6@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_async_progress_finish@LIBOSTREE_2016.3 2016.4
ostree_async_progress_get@LIBOSTREE_2017.6 2017.6
ostree_async_progress_get_status@LIBOSTREE_2016.3 2016.4
@@ -73,6 +74,14 @@ libostree-1.so.1 libostree-1-1 #MINVER#
ostree_checksum_to_bytes_v@LIBOSTREE_2016.3 2016.4
ostree_cmd__private__@LIBOSTREE_2016.3 2016.4
ostree_cmp_checksum_bytes@LIBOSTREE_2016.3 2016.4
ostree_collection_ref_dup@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_collection_ref_dupv@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_collection_ref_equal@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_collection_ref_free@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_collection_ref_freev@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_collection_ref_get_type@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_collection_ref_hash@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_collection_ref_new@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_commit_get_content_checksum@LIBOSTREE_2018.2 2018.2
ostree_commit_get_parent@LIBOSTREE_2016.3 2016.4
ostree_commit_get_timestamp@LIBOSTREE_2016.3 2016.4
@@ -145,6 +154,11 @@ libostree-1.so.1 libostree-1-1 #MINVER#
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_remote_get_name@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_remote_get_type@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_remote_get_url@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_remote_ref@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_remote_unref@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_repo_abort_transaction@LIBOSTREE_2016.3 2016.4
ostree_repo_add_gpg_signature_summary@LIBOSTREE_2016.3 2016.4
ostree_repo_append_gpg_signature@LIBOSTREE_2016.3 2016.4
@@ -191,7 +205,32 @@ libostree-1.so.1 libostree-1-1 #MINVER#
ostree_repo_file_tree_get_metadata_checksum@LIBOSTREE_2016.3 2016.4
ostree_repo_file_tree_query_child@LIBOSTREE_2016.3 2016.4
ostree_repo_file_tree_set_metadata@LIBOSTREE_2016.3 2016.4
ostree_repo_find_remotes_async@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_repo_find_remotes_finish@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_repo_finder_avahi_get_type@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_repo_finder_avahi_new@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_repo_finder_avahi_start@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_repo_finder_avahi_stop@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_repo_finder_config_get_type@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_repo_finder_config_new@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_repo_finder_get_type@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_repo_finder_mount_get_type@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_repo_finder_mount_new@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_repo_finder_override_add_uri@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_repo_finder_override_get_type@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_repo_finder_override_new@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_repo_finder_resolve_all_async@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_repo_finder_resolve_all_finish@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_repo_finder_resolve_async@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_repo_finder_resolve_finish@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_repo_finder_result_compare@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_repo_finder_result_dup@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_repo_finder_result_free@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_repo_finder_result_freev@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_repo_finder_result_get_type@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_repo_finder_result_new@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_repo_fsck_object@LIBOSTREE_2017.15 2017.15
ostree_repo_get_collection_id@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_repo_get_config@LIBOSTREE_2016.3 2016.4
ostree_repo_get_dfd@LIBOSTREE_2016.4 2016.4
ostree_repo_get_disable_fsync@LIBOSTREE_2016.3 2016.3
@@ -210,6 +249,7 @@ libostree-1.so.1 libostree-1-1 #MINVER#
ostree_repo_import_object_from_with_trust@LIBOSTREE_2016.5 2016.5
ostree_repo_is_system@LIBOSTREE_2016.3 2016.4
ostree_repo_is_writable@LIBOSTREE_2016.3 2016.4
ostree_repo_list_collection_refs@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_repo_list_commit_objects_starting_with@LIBOSTREE_2016.3 2016.4
ostree_repo_list_objects@LIBOSTREE_2016.3 2016.4
ostree_repo_list_refs@LIBOSTREE_2016.3 2016.4
@@ -233,6 +273,8 @@ libostree-1.so.1 libostree-1-1 #MINVER#
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
ostree_repo_pull_from_remotes_async@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_repo_pull_from_remotes_finish@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_repo_pull_one_dir@LIBOSTREE_2016.3 2016.4
ostree_repo_pull_with_options@LIBOSTREE_2016.3 2016.4
ostree_repo_query_object_storage_size@LIBOSTREE_2016.3 2016.4
@@ -250,18 +292,24 @@ libostree-1.so.1 libostree-1-1 #MINVER#
ostree_repo_remote_get_url@LIBOSTREE_2016.3 2016.4
ostree_repo_remote_gpg_import@LIBOSTREE_2016.3 2016.4
ostree_repo_remote_list@LIBOSTREE_2016.3 2016.4
ostree_repo_remote_list_collection_refs@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_repo_remote_list_refs@LIBOSTREE_2016.3 2016.4
ostree_repo_resolve_collection_ref@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_repo_resolve_keyring_for_collection@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_repo_resolve_rev@LIBOSTREE_2016.3 2016.4
ostree_repo_resolve_rev_ext@LIBOSTREE_2016.7 2016.7
ostree_repo_scan_hardlinks@LIBOSTREE_2016.3 2016.4
ostree_repo_set_alias_ref_immediate@LIBOSTREE_2017.10 2017.10
ostree_repo_set_cache_dir@LIBOSTREE_2016.5 2016.5
ostree_repo_set_collection_id@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_repo_set_collection_ref_immediate@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_repo_set_disable_fsync@LIBOSTREE_2016.3 2016.4
ostree_repo_set_ref_immediate@LIBOSTREE_2016.3 2016.4
ostree_repo_sign_commit@LIBOSTREE_2016.3 2016.4
ostree_repo_sign_delta@LIBOSTREE_2016.3 2016.4
ostree_repo_static_delta_execute_offline@LIBOSTREE_2016.3 2016.4
ostree_repo_static_delta_generate@LIBOSTREE_2016.3 2016.4
ostree_repo_transaction_set_collection_ref@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_repo_transaction_set_ref@LIBOSTREE_2016.3 2016.4
ostree_repo_transaction_set_refspec@LIBOSTREE_2016.3 2016.4
ostree_repo_transaction_stats_get_type@LIBOSTREE_2016.3 2016.4
@@ -271,6 +319,7 @@ libostree-1.so.1 libostree-1-1 #MINVER#
ostree_repo_traverse_new_parents@LIBOSTREE_2018.5 2018.5
ostree_repo_traverse_new_reachable@LIBOSTREE_2016.3 2016.4
ostree_repo_traverse_parents_get_commits@LIBOSTREE_2018.5 2018.5
ostree_repo_traverse_reachable_refs@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_repo_verify_commit@LIBOSTREE_2016.3 2016.4
ostree_repo_verify_commit_ext@LIBOSTREE_2016.3 2016.4
ostree_repo_verify_commit_for_remote@LIBOSTREE_2016.14 2016.14
@@ -303,6 +352,7 @@ libostree-1.so.1 libostree-1-1 #MINVER#
ostree_sepolicy_restorecon@LIBOSTREE_2016.3 2016.4
ostree_sepolicy_setfscreatecon@LIBOSTREE_2016.3 2016.4
ostree_sysroot_cleanup@LIBOSTREE_2016.3 2016.4
ostree_sysroot_cleanup_prune_repo@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_sysroot_deploy_tree@LIBOSTREE_2016.3 2016.4
ostree_sysroot_deployment_set_kargs@LIBOSTREE_2016.3 2016.4
ostree_sysroot_deployment_set_mutable@LIBOSTREE_2016.3 2016.4
@@ -356,6 +406,7 @@ libostree-1.so.1 libostree-1-1 #MINVER#
ostree_sysroot_write_deployments_with_options@LIBOSTREE_2017.4 2017.4
ostree_sysroot_write_origin_file@LIBOSTREE_2016.3 2016.4
ostree_validate_checksum_string@LIBOSTREE_2016.3 2016.4
ostree_validate_collection_id@LIBOSTREE_2018.6 2018.5+42+gecdebeb2
ostree_validate_remote_name@LIBOSTREE_2017.8 2017.8
ostree_validate_rev@LIBOSTREE_2016.3 2016.4
ostree_validate_structureof_checksum_string@LIBOSTREE_2016.3 2016.4
+6
View File
@@ -15,12 +15,18 @@ configure_options = \
GJS=some-nonexistent-gjs-binary \
--enable-installed-tests \
--libexecdir='$${prefix}/lib' \
--with-avahi \
--with-dracut \
--with-grub2 \
--with-grub2-mkconfig-path=/usr/sbin/grub-mkconfig \
--with-libarchive \
--with-libsystemd \
--with-libmount \
--with-soup \
--with-selinux \
--with-systemdsystemgeneratordir=/lib/systemd/system-generators \
--with-systemdsystemunitdir=/lib/systemd/system \
--without-smack \
$(NULL)
ifneq ($(filter libostree-doc,$(binaries)),)