From a9c98d4807b19ca0997296f9bc898ae9bc36f37e Mon Sep 17 00:00:00 2001 From: Russell Sim Date: Sun, 26 Jul 2015 21:30:14 +1000 Subject: [PATCH] Bump version to 0.23.0 --- debian/changelog | 14 ++++++ debian/control | 16 +++---- debian/copyright | 15 ++++-- debian/docs | 2 + debian/libgit2-22.lintian-overrides | 1 - ...{libgit2-22.install => libgit2-23.install} | 0 debian/libgit2-23.lintian-overrides | 1 + ...{libgit2-22.symbols => libgit2-23.symbols} | 48 ++++++++++++++----- debian/libgit2-dev.lintian-overrides | 1 + debian/patches/disable_tests.patch | 16 +++---- debian/watch | 3 +- 11 files changed, 81 insertions(+), 36 deletions(-) delete mode 100644 debian/libgit2-22.lintian-overrides rename debian/{libgit2-22.install => libgit2-23.install} (100%) create mode 100644 debian/libgit2-23.lintian-overrides rename debian/{libgit2-22.symbols => libgit2-23.symbols} (94%) create mode 100644 debian/libgit2-dev.lintian-overrides diff --git a/debian/changelog b/debian/changelog index ab41ce3ef..7dbaea889 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +libgit2 (0.23.0-1) UNRELEASED; urgency=medium + + * New upstream release 0.23.0. + * debian/control: Added build dependency on libcurl4-openssl-dev. + * debian/control: Updated VCS URL. + * debian/copyright: Added winhttp copyright. + * debian/docs: Added missing development documentation. + * debian/libgit2-23.symbols: Updated with latest symbols. + * debian/libgit2-dev.lintian-overrides: Override comment + stripping, should work once it's supported by dh_strip. + * debian/patches/disable_tests.patch: Updated for 0.23.0. + + -- Russell Sim Sun, 26 Jul 2015 21:12:44 +1000 + libgit2 (0.22.2-2) unstable; urgency=medium * debian/control: Added dependency on pkg-config (Closes: #786494) diff --git a/debian/control b/debian/control index ff906d9f2..06b458ef8 100644 --- a/debian/control +++ b/debian/control @@ -3,21 +3,21 @@ Section: libs Priority: extra Maintainer: Russell Sim Build-Depends: debhelper (>= 9.20120417), python-minimal (>= 2.4.0), pkg-config, - cmake, libz-dev, libssl-dev, libssh2-1-dev, libhttp-parser-dev, - ca-certificates + cmake, libz-dev, libcurl4-openssl-dev, libssl-dev, + libssh2-1-dev, libhttp-parser-dev, ca-certificates Standards-Version: 3.9.6 Homepage: http://libgit2.github.com/ Vcs-Git: git://anonscm.debian.org/users/arrsim-guest/libgit2.git -Vcs-Browser: http://anonscm.debian.org/gitweb/?p=users/arrsim-guest/libgit2.git;a=summary +Vcs-Browser: http://anonscm.debian.org/cgit/users/arrsim-guest/libgit2.git/ Package: libgit2-dev Architecture: any Section: libdevel Multi-Arch: same -Depends: libgit2-22 (= ${binary:Version}), libz-dev, - libssl-dev, libssh2-1-dev, libhttp-parser-dev, - ${shlibs:Depends}, ${misc:Depends} +Depends: libgit2-23 (= ${binary:Version}), libz-dev, + libcurl4-openssl-dev, libssl-dev, libssh2-1-dev, + libhttp-parser-dev, ${shlibs:Depends}, ${misc:Depends} Description: low-level Git library (development files) libgit2 is a portable, pure C implementation of the Git distributed version control system core methods provided as a @@ -25,7 +25,7 @@ Description: low-level Git library (development files) . This package contains the development files for libgit2. -Package: libgit2-22 +Package: libgit2-23 Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} @@ -39,7 +39,7 @@ Package: libgit2-dbg Section: debug Architecture: any Multi-Arch: same -Depends: libgit2-22 (= ${binary:Version}), +Depends: libgit2-23 (= ${binary:Version}), ${misc:Depends} Description: libgit2 library and debugging symbols libgit2 is a portable, pure C implementation of the Git diff --git a/debian/copyright b/debian/copyright index b2e968ff1..3aaf1cec6 100644 --- a/debian/copyright +++ b/debian/copyright @@ -11,7 +11,7 @@ Copyright: 2013, Andreas Schneider License: BSD-2-clause Files: debian/* -Copyright: 2011-2014, Russell Sim +Copyright: 2011-2015, Russell Sim License: GPL-2+ Files: deps/regex/* @@ -27,6 +27,10 @@ Files: deps/http-parser/* Copyright: Igor Sysoev, Joyent, Inc. and other Node contributors License: MIT+NGINX +Files: deps/winhttp/winhttp.h +Copyright: 2007, Francois Gouget +License: LGPL-2.1+ + Files: examples/* Copyright: Public Domain License: CC0 @@ -44,13 +48,14 @@ Copyright: 2010, Christopher Swenson 2011, Vicent Marti License: MIT -Files: src/path.c +Files: src/path.c src/fnmatch.h Copyright: 2008, The Android Open Source Project License: BSD-2-clause -Files: src/util.c src/fnmatch.h -Copyright: 1990, Regents of the University of California. -License: BSD-3-clause +Files: src/util.c +Copyright: 2009, Public Software Group e. V., Berlin, Germany + 1990, Regents of the University of California. +License: MIT and BSD-3-clause Files: src/xdiff/* Copyright: 2003, Davide Libenzi diff --git a/debian/docs b/debian/docs index e69de29bb..ae0ec72d1 100644 --- a/debian/docs +++ b/debian/docs @@ -0,0 +1,2 @@ +THREADING.md +docs/* diff --git a/debian/libgit2-22.lintian-overrides b/debian/libgit2-22.lintian-overrides deleted file mode 100644 index d4bac99d0..000000000 --- a/debian/libgit2-22.lintian-overrides +++ /dev/null @@ -1 +0,0 @@ -libgit2-22: spelling-error-in-binary diff --git a/debian/libgit2-22.install b/debian/libgit2-23.install similarity index 100% rename from debian/libgit2-22.install rename to debian/libgit2-23.install diff --git a/debian/libgit2-23.lintian-overrides b/debian/libgit2-23.lintian-overrides new file mode 100644 index 000000000..fa2004fe2 --- /dev/null +++ b/debian/libgit2-23.lintian-overrides @@ -0,0 +1 @@ +libgit2-23: spelling-error-in-binary diff --git a/debian/libgit2-22.symbols b/debian/libgit2-23.symbols similarity index 94% rename from debian/libgit2-22.symbols rename to debian/libgit2-23.symbols index 34365569a..d5cbc5428 100644 --- a/debian/libgit2-22.symbols +++ b/debian/libgit2-23.symbols @@ -1,7 +1,8 @@ -libgit2.so.22 libgit2-22 #MINVER# +libgit2.so.23 libgit2-23 #MINVER# git_annotated_commit_free@Base 0.22.0 git_annotated_commit_from_fetchhead@Base 0.22.0 git_annotated_commit_from_ref@Base 0.22.0 + git_annotated_commit_from_revspec@Base 0.23.0 git_annotated_commit_id@Base 0.22.0 git_annotated_commit_lookup@Base 0.22.0 git_attr_add_macro@Base 0.17.0 @@ -31,6 +32,7 @@ libgit2.so.22 libgit2-22 #MINVER# git_blob_rawcontent@Base 0.17.0 git_blob_rawsize@Base 0.17.0 git_branch_create@Base 0.17.0 + git_branch_create_from_annotated@Base 0.23.0 git_branch_delete@Base 0.17.0 git_branch_is_head@Base 0.18.0 git_branch_iterator_free@Base 0.20.0 @@ -66,6 +68,7 @@ libgit2.so.22 libgit2-22 #MINVER# git_commit_create_from_ids@Base 0.21.0 git_commit_create_v@Base 0.17.0 git_commit_free@Base 0.19.0 + git_commit_header_field@Base 0.23.0 git_commit_id@Base 0.17.0 git_commit_lookup@Base 0.19.0 git_commit_lookup_prefix@Base 0.19.0 @@ -88,6 +91,7 @@ libgit2.so.22 libgit2-22 #MINVER# git_config_backend_foreach_match@Base 0.20.0 git_config_delete_entry@Base 0.18.0 git_config_delete_multivar@Base 0.20.0 + git_config_entry_free@Base 0.23.0 git_config_find_global@Base 0.17.0 git_config_find_system@Base 0.17.0 git_config_find_xdg@Base 0.18.0 @@ -100,7 +104,9 @@ libgit2.so.22 libgit2-22 #MINVER# git_config_get_int64@Base 0.17.0 git_config_get_mapped@Base 0.17.0 git_config_get_multivar_foreach@Base 0.20.0 + git_config_get_path@Base 0.23.0 git_config_get_string@Base 0.17.0 + git_config_get_string_buf@Base 0.23.0 git_config_init_backend@Base 0.21.0 git_config_iterator_free@Base 0.20.0 git_config_iterator_glob_new@Base 0.20.0 @@ -116,6 +122,7 @@ libgit2.so.22 libgit2-22 #MINVER# git_config_parse_bool@Base 0.18.0 git_config_parse_int32@Base 0.18.0 git_config_parse_int64@Base 0.18.0 + git_config_parse_path@Base 0.23.0 git_config_set_bool@Base 0.17.0 git_config_set_int32@Base 0.17.0 git_config_set_int64@Base 0.17.0 @@ -127,6 +134,7 @@ libgit2.so.22 libgit2-22 #MINVER# git_cred_ssh_custom_new@Base 0.20.0 git_cred_ssh_interactive_new@Base 0.21.0 git_cred_ssh_key_from_agent@Base 0.21.0 + git_cred_ssh_key_memory_new@Base 0.23.0 git_cred_ssh_key_new@Base 0.20.0 git_cred_username_new@Base 0.22.0 git_cred_userpass@Base 0.18.0 @@ -169,20 +177,25 @@ libgit2.so.22 libgit2-22 #MINVER# git_diff_tree_to_tree@Base 0.17.0 git_diff_tree_to_workdir@Base 0.18.0 git_diff_tree_to_workdir_with_index@Base 0.20.0 + git_fetch_init_options@Base 0.23.0 git_filter_list_apply_to_blob@Base 0.20.0 git_filter_list_apply_to_data@Base 0.20.0 git_filter_list_apply_to_file@Base 0.20.0 + git_filter_list_contains@Base 0.23.0 git_filter_list_free@Base 0.20.0 git_filter_list_length@Base 0.20.0 git_filter_list_load@Base 0.20.0 git_filter_list_new@Base 0.20.0 git_filter_list_push@Base 0.20.0 + git_filter_list_stream_blob@Base 0.23.0 + git_filter_list_stream_data@Base 0.23.0 + git_filter_list_stream_file@Base 0.23.0 git_filter_lookup@Base 0.20.0 git_filter_register@Base 0.20.0 git_filter_source_filemode@Base 0.20.0 + git_filter_source_flags@Base 0.23.0 git_filter_source_id@Base 0.20.0 git_filter_source_mode@Base 0.20.0 - git_filter_source_options@Base 0.21.0 git_filter_source_path@Base 0.20.0 git_filter_source_repo@Base 0.20.0 git_filter_unregister@Base 0.20.0 @@ -198,7 +211,9 @@ libgit2.so.22 libgit2-22 #MINVER# git_index_add@Base 0.17.0 git_index_add_all@Base 0.19.0 git_index_add_bypath@Base 0.18.0 + git_index_add_frombuffer@Base 0.23.0 git_index_caps@Base 0.18.0 + git_index_checksum@Base 0.23.0 git_index_clear@Base 0.17.0 git_index_conflict_add@Base 0.18.0 git_index_conflict_cleanup@Base 0.18.0 @@ -207,6 +222,7 @@ libgit2.so.22 libgit2-22 #MINVER# git_index_conflict_iterator_new@Base 0.19.0 git_index_conflict_next@Base 0.19.0 git_index_conflict_remove@Base 0.18.0 + git_index_entry_is_conflict@Base 0.23.0 git_index_entry_stage@Base 0.17.0 git_index_entrycount@Base 0.17.0 git_index_find@Base 0.17.0 @@ -355,7 +371,9 @@ libgit2.so.22 libgit2-22 #MINVER# git_packbuilder_hash@Base 0.20.0 git_packbuilder_insert@Base 0.18.0 git_packbuilder_insert_commit@Base 0.19.0 + git_packbuilder_insert_recur@Base 0.23.0 git_packbuilder_insert_tree@Base 0.18.0 + git_packbuilder_insert_walk@Base 0.23.0 git_packbuilder_new@Base 0.18.0 git_packbuilder_object_count@Base 0.18.0 git_packbuilder_set_callbacks@Base 0.20.0 @@ -476,7 +494,6 @@ libgit2.so.22 libgit2-22 #MINVER# git_remote_add_fetch@Base 0.19.0 git_remote_add_push@Base 0.19.0 git_remote_autotag@Base 0.18.0 - git_remote_clear_refspecs@Base 0.19.0 git_remote_connect@Base 0.17.0 git_remote_connected@Base 0.17.0 git_remote_create@Base 0.18.0 @@ -489,7 +506,6 @@ libgit2.so.22 libgit2-22 #MINVER# git_remote_dup@Base 0.21.0 git_remote_fetch@Base 0.20.0 git_remote_free@Base 0.17.0 - git_remote_get_callbacks@Base 0.21.0 git_remote_get_fetch_refspecs@Base 0.19.0 git_remote_get_push_refspecs@Base 0.19.0 git_remote_get_refspec@Base 0.19.0 @@ -506,18 +522,11 @@ libgit2.so.22 libgit2-22 #MINVER# git_remote_pushurl@Base 0.18.0 git_remote_refspec_count@Base 0.19.0 git_remote_rename@Base 0.18.0 - git_remote_save@Base 0.17.0 git_remote_set_autotag@Base 0.18.0 - git_remote_set_callbacks@Base 0.18.0 - git_remote_set_fetch_refspecs@Base 0.20.0 - git_remote_set_push_refspecs@Base 0.20.0 git_remote_set_pushurl@Base 0.18.0 - git_remote_set_transport@Base 0.18.0 - git_remote_set_update_fetchhead@Base 0.18.0 git_remote_set_url@Base 0.18.0 git_remote_stats@Base 0.18.0 git_remote_stop@Base 0.18.0 - git_remote_update_fetchhead@Base 0.18.0 git_remote_update_tips@Base 0.17.0 git_remote_upload@Base 0.22.0 git_remote_url@Base 0.17.0 @@ -533,6 +542,7 @@ libgit2.so.22 libgit2-22 #MINVER# git_repository_head@Base 0.17.0 git_repository_head_detached@Base 0.17.0 git_repository_head_unborn@Base 0.20.0 + git_repository_ident@Base 0.23.0 git_repository_index@Base 0.17.0 git_repository_init@Base 0.17.0 git_repository_init_ext@Base 0.18.0 @@ -555,6 +565,8 @@ libgit2.so.22 libgit2-22 #MINVER# git_repository_set_config@Base 0.17.0 git_repository_set_head@Base 0.18.0 git_repository_set_head_detached@Base 0.18.0 + git_repository_set_head_detached_from_annotated@Base 0.23.0 + git_repository_set_ident@Base 0.23.0 git_repository_set_index@Base 0.17.0 git_repository_set_namespace@Base 0.19.0 git_repository_set_odb@Base 0.17.0 @@ -566,6 +578,7 @@ libgit2.so.22 libgit2-22 #MINVER# git_repository_wrap_odb@Base 0.18.0 git_reset@Base 0.18.0 git_reset_default@Base 0.18.0 + git_reset_from_annotated@Base 0.23.0 git_revert@Base 0.21.0 git_revert_commit@Base 0.22.0 git_revert_init_options@Base 0.21.0 @@ -597,8 +610,10 @@ libgit2.so.22 libgit2-22 #MINVER# git_smart_subtransport_git@Base 0.18.0 git_smart_subtransport_http@Base 0.18.0 git_smart_subtransport_ssh@Base 0.20.0 + git_stash_apply@Base 0.23.0 git_stash_drop@Base 0.18.0 git_stash_foreach@Base 0.18.0 + git_stash_pop@Base 0.23.0 git_stash_save@Base 0.18.0 git_status_byindex@Base 0.19.0 git_status_file@Base 0.17.0 @@ -630,10 +645,9 @@ libgit2.so.22 libgit2-22 #MINVER# git_submodule_owner@Base 0.18.0 git_submodule_path@Base 0.18.0 git_submodule_reload@Base 0.18.0 - git_submodule_reload_all@Base 0.18.0 git_submodule_repo_init@Base 0.22.0 git_submodule_resolve_url@Base 0.21.0 - git_submodule_save@Base 0.18.0 + git_submodule_set_branch@Base 0.23.0 git_submodule_set_fetch_recurse_submodules@Base 0.18.0 git_submodule_set_ignore@Base 0.18.0 git_submodule_set_update@Base 0.18.0 @@ -666,6 +680,14 @@ libgit2.so.22 libgit2-22 #MINVER# git_tag_target_id@Base 0.18.0 git_tag_target_type@Base 0.18.0 git_trace_set@Base 0.18.0 + git_transaction_commit@Base 0.23.0 + git_transaction_free@Base 0.23.0 + git_transaction_lock_ref@Base 0.23.0 + git_transaction_new@Base 0.23.0 + git_transaction_remove@Base 0.23.0 + git_transaction_set_reflog@Base 0.23.0 + git_transaction_set_symbolic_target@Base 0.23.0 + git_transaction_set_target@Base 0.23.0 git_transport_init@Base 0.21.0 git_transport_local@Base 0.18.0 git_transport_new@Base 0.18.0 diff --git a/debian/libgit2-dev.lintian-overrides b/debian/libgit2-dev.lintian-overrides new file mode 100644 index 000000000..493dab4ed --- /dev/null +++ b/debian/libgit2-dev.lintian-overrides @@ -0,0 +1 @@ +libgit2-dev: static-library-has-unneeded-section diff --git a/debian/patches/disable_tests.patch b/debian/patches/disable_tests.patch index 31cc45190..e9df5517b 100644 --- a/debian/patches/disable_tests.patch +++ b/debian/patches/disable_tests.patch @@ -6,15 +6,15 @@ blame::simple::trivial_libgit2 - requires the libgit2 directory to be a repository diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6bd25aa..f44190e 100644 +index 5c55ddd..e28a16f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -349,7 +349,7 @@ IF (BUILD_CLAR) - ENDIF () +@@ -577,7 +577,7 @@ IF (BUILD_CLAR) ENABLE_TESTING() -- ADD_TEST(libgit2_clar libgit2_clar -ionline) -+ ADD_TEST(libgit2_clar libgit2_clar -xonline -xblame::simple::trivial_libgit2 -xnetwork::remote::remotes::single_branch -xnetwork::remote::remotes::restricted_refspecs) - ENDIF () - - IF (TAGS) + IF (WINHTTP OR OPENSSL_FOUND OR SECURITY_FOUND) +- ADD_TEST(libgit2_clar libgit2_clar -ionline) ++ ADD_TEST(libgit2_clar libgit2_clar -xonline -xnetwork::remote::remotes -xobject::cache -xthreads::diff -xthreads::iterator) + ELSE () + ADD_TEST(libgit2_clar libgit2_clar -v) + ENDIF () diff --git a/debian/watch b/debian/watch index a94b1edaf..614432a98 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,3 @@ version=3 -https://github.com/libgit2/libgit2/tags /libgit2/libgit2/archive/v(.+)\.tar\.gz +opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/libgit2-$1\.tar\.gz/ \ + https://github.com/libgit2/libgit2/releases .*/v?([\d.]*)\.tar\.gz