diff options
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control | 4 | ||||
| -rw-r--r-- | debian/gbp.conf | 2 | ||||
| -rw-r--r-- | debian/libabsl20200225.lintian-overrides | 24 | ||||
| -rw-r--r-- | debian/libabsl20200225.shlibs | 69 | ||||
| -rw-r--r-- | debian/libabsl20200923.install (renamed from debian/libabsl20200225.install) | 0 | ||||
| -rw-r--r-- | debian/libabsl20200923.lintian-overrides | 24 | ||||
| -rw-r--r-- | debian/libabsl20200923.shlibs | 69 | ||||
| -rw-r--r-- | debian/patches/bug970333.diff | 20 | ||||
| -rw-r--r-- | debian/patches/configure.diff | 31 | ||||
| -rw-r--r-- | debian/patches/license.diff | 59 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
12 files changed, 118 insertions, 192 deletions
diff --git a/debian/changelog b/debian/changelog index f89ce271..61050aff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +abseil (0~20200923-1) UNRELEASED; urgency=medium + + * New upstream release. + + -- Benjamin Barenblat <bbaren@debian.org> Fri, 25 Sep 2020 10:42:24 -0400 + abseil (0~20200225.2-4) unstable; urgency=medium * Fix "autopkgtest needs update for new version of cmake: warning on diff --git a/debian/control b/debian/control index cb64a6e2..b490ddce 100644 --- a/debian/control +++ b/debian/control @@ -36,7 +36,7 @@ Architecture: any Multi-Arch: same Section: libdevel Depends: - libabsl20200225 (= ${binary:Version}), + libabsl20200923 (= ${binary:Version}), ${misc:Depends}, Recommends: cmake (>= 2.6), g++ (>= 4.7) Description: ${source:Synopsis} (development files) @@ -45,7 +45,7 @@ Description: ${source:Synopsis} (development files) This package contains header files and other data necessary for developing with Abseil. -Package: libabsl20200225 +Package: libabsl20200923 Architecture: any Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends} diff --git a/debian/gbp.conf b/debian/gbp.conf index b7d8655d..0187d849 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -13,4 +13,4 @@ # the License. [DEFAULT] -upstream-tag = 20200225.2 +upstream-tag = 20200923 diff --git a/debian/libabsl20200225.lintian-overrides b/debian/libabsl20200225.lintian-overrides deleted file mode 100644 index 1eba3430..00000000 --- a/debian/libabsl20200225.lintian-overrides +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 2020 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not -# use this file except in compliance with the License. You may obtain a copy of -# the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations under -# the License. - -libabsl20200225: no-symbols-control-file usr/lib/*/libabsl_* -libabsl20200225: package-name-doesnt-match-sonames libabsl-* -libabsl20200225: shared-lib-without-dependency-information usr/lib/*/libabsl_city.so.20200225.0.2 -libabsl20200225: shared-lib-without-dependency-information usr/lib/*/libabsl_flags.so.20200225.0.2 -libabsl20200225: shared-lib-without-dependency-information usr/lib/*/libabsl_leak_check.so.20200225.0.2 -libabsl20200225: shared-lib-without-dependency-information usr/lib/*/libabsl_leak_check_disable.so.20200225.0.2 -libabsl20200225: shared-lib-without-dependency-information usr/lib/*/libabsl_random_internal_randen_hwaes_impl.so.20200225.0.2 -libabsl20200225: shared-lib-without-dependency-information usr/lib/*/libabsl_random_internal_randen_hwaes_impl.so.20200225.0.2 -libabsl20200225: shared-lib-without-dependency-information usr/lib/*/libabsl_random_internal_randen_slow.so.20200225.0.2 -libabsl20200225: spelling-error-in-binary usr/lib/*/libabsl_flags_usage_internal.so.20200225.0.2 helpfull helpful diff --git a/debian/libabsl20200225.shlibs b/debian/libabsl20200225.shlibs deleted file mode 100644 index 994c1657..00000000 --- a/debian/libabsl20200225.shlibs +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 2020 Google LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may not -# use this file except in compliance with the License. You may obtain a copy of -# the License at -# -# https://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -# License for the specific language governing permissions and limitations under -# the License. -# -libabsl_bad_any_cast_impl 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_bad_optional_access 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_bad_variant_access 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_base 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_city 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_civil_time 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_cord 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_debugging_internal 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_demangle_internal 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_dynamic_annotations 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_examine_stack 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_exponential_biased 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_failure_signal_handler 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_flags 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_flags_config 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_flags_internal 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_flags_marshalling 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_flags_parse 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_flags_program_name 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_flags_registry 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_flags_usage 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_flags_usage_internal 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_graphcycles_internal 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_hash 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_hashtablez_sampler 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_int128 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_leak_check 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_leak_check_disable 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_log_severity 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_malloc_internal 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_periodic_sampler 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_random_distributions 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_random_internal_distribution_test_util 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_random_internal_pool_urbg 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_random_internal_randen 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_random_internal_randen_hwaes 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_random_internal_randen_hwaes_impl 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_random_internal_randen_slow 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_random_internal_seed_material 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_random_seed_gen_exception 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_random_seed_sequences 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_raw_hash_set 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_raw_logging_internal 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_scoped_set_env 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_spinlock_wait 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_stacktrace 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_status 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_str_format_internal 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_strings 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_strings_internal 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_symbolize 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_synchronization 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_throw_delegate 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_time 20200225 libabsl20200225 (>= 0~20200225.2-2) -libabsl_time_zone 20200225 libabsl20200225 (>= 0~20200225.2-2) diff --git a/debian/libabsl20200225.install b/debian/libabsl20200923.install index 4cd547f5..4cd547f5 100644 --- a/debian/libabsl20200225.install +++ b/debian/libabsl20200923.install diff --git a/debian/libabsl20200923.lintian-overrides b/debian/libabsl20200923.lintian-overrides new file mode 100644 index 00000000..f9f3b89b --- /dev/null +++ b/debian/libabsl20200923.lintian-overrides @@ -0,0 +1,24 @@ +# Copyright 2020 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may not +# use this file except in compliance with the License. You may obtain a copy of +# the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations under +# the License. + +libabsl20200923: no-symbols-control-file usr/lib/*/libabsl_* +libabsl20200923: package-name-doesnt-match-sonames libabsl-* +libabsl20200923: shared-lib-without-dependency-information usr/lib/*/libabsl_city.so.20200923.0.0 +libabsl20200923: shared-lib-without-dependency-information usr/lib/*/libabsl_flags.so.20200923.0.0 +libabsl20200923: shared-lib-without-dependency-information usr/lib/*/libabsl_leak_check.so.20200923.0.0 +libabsl20200923: shared-lib-without-dependency-information usr/lib/*/libabsl_leak_check_disable.so.20200923.0.0 +libabsl20200923: shared-lib-without-dependency-information usr/lib/*/libabsl_random_internal_randen_hwaes_impl.so.20200923.0.0 +libabsl20200923: shared-lib-without-dependency-information usr/lib/*/libabsl_random_internal_randen_hwaes_impl.so.20200923.0.0 +libabsl20200923: shared-lib-without-dependency-information usr/lib/*/libabsl_random_internal_randen_slow.so.20200923.0.0 +libabsl20200923: spelling-error-in-binary usr/lib/*/libabsl_flags_usage_internal.so.20200923.0.0 helpfull helpful diff --git a/debian/libabsl20200923.shlibs b/debian/libabsl20200923.shlibs new file mode 100644 index 00000000..fe2ddbc3 --- /dev/null +++ b/debian/libabsl20200923.shlibs @@ -0,0 +1,69 @@ +# Copyright 2020 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); you may not +# use this file except in compliance with the License. You may obtain a copy of +# the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +# License for the specific language governing permissions and limitations under +# the License. +# +libabsl_bad_any_cast_impl 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_bad_optional_access 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_bad_variant_access 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_base 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_city 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_civil_time 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_cord 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_debugging_internal 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_demangle_internal 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_dynamic_annotations 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_examine_stack 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_exponential_biased 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_failure_signal_handler 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_flags 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_flags_config 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_flags_internal 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_flags_marshalling 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_flags_parse 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_flags_program_name 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_flags_registry 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_flags_usage 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_flags_usage_internal 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_graphcycles_internal 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_hash 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_hashtablez_sampler 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_int128 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_leak_check 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_leak_check_disable 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_log_severity 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_malloc_internal 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_periodic_sampler 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_random_distributions 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_random_internal_distribution_test_util 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_random_internal_pool_urbg 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_random_internal_randen 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_random_internal_randen_hwaes 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_random_internal_randen_hwaes_impl 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_random_internal_randen_slow 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_random_internal_seed_material 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_random_seed_gen_exception 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_random_seed_sequences 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_raw_hash_set 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_raw_logging_internal 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_scoped_set_env 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_spinlock_wait 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_stacktrace 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_status 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_str_format_internal 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_strings 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_strings_internal 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_symbolize 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_synchronization 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_throw_delegate 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_time 20200923 libabsl20200923 (>= 0~20200923-1) +libabsl_time_zone 20200923 libabsl20200923 (>= 0~20200923-1) diff --git a/debian/patches/bug970333.diff b/debian/patches/bug970333.diff deleted file mode 100644 index efca5a5a..00000000 --- a/debian/patches/bug970333.diff +++ /dev/null @@ -1,20 +0,0 @@ -From: Zach Toogood <zach@yousician.com> -Subject: Fix CMake Threads dependency issue -Origin: upstream, https://github.com/abseil/abseil-cpp/commit/68494aae959dfbbf781cdf03a988d2f5fc7e4802 -Bug: https://github.com/abseil/abseil-cpp/issues/668 -Bug-Debian: https://bugs.debian.org/970333 - -Improve CMake support by finding the Threads module with find_dependency -rather than trying to include it directly. This silences a CMake warning. - ---- a/CMake/abslConfig.cmake.in -+++ b/CMake/abslConfig.cmake.in -@@ -1,6 +1,7 @@ - # absl CMake configuration file. - --include(FindThreads) -+include(CMakeFindDependencyMacro) -+find_dependency(Threads) - - @PACKAGE_INIT@ - diff --git a/debian/patches/configure.diff b/debian/patches/configure.diff index bb88ae7d..dc1ed9e7 100644 --- a/debian/patches/configure.diff +++ b/debian/patches/configure.diff @@ -20,13 +20,13 @@ Configure Abseil for Debian. --- a/CMake/AbseilHelpers.cmake +++ b/CMake/AbseilHelpers.cmake -@@ -215,6 +215,9 @@ +@@ -217,6 +217,9 @@ OUTPUT_NAME "absl_${_NAME}" ) endif() + -+ set_property(TARGET ${_NAME} PROPERTY SOVERSION 20200225) -+ set_property(TARGET ${_NAME} PROPERTY VERSION "20200225.0.2") ++ set_property(TARGET ${_NAME} PROPERTY SOVERSION 20200923) ++ set_property(TARGET ${_NAME} PROPERTY VERSION "20200923.0.0") else() # Generating header-only library add_library(${_NAME} INTERFACE) @@ -68,37 +68,38 @@ Configure Abseil for Debian. // ABSL_OPTION_USE_INLINE_NAMESPACE -@@ -206,6 +206,6 @@ +@@ -206,7 +206,7 @@ // allowed. #define ABSL_OPTION_USE_INLINE_NAMESPACE 1 --#define ABSL_OPTION_INLINE_NAMESPACE_NAME lts_2020_02_25 -+#define ABSL_OPTION_INLINE_NAMESPACE_NAME debian0 +-#define ABSL_OPTION_INLINE_NAMESPACE_NAME lts_2020_09_23 ++#define ABSL_OPTION_INLINE_NAMESPACE_NAME debian1 - #endif // ABSL_BASE_OPTIONS_H_ + // ABSL_OPTION_HARDENED + // --- a/absl/container/internal/have_sse.h +++ b/absl/container/internal/have_sse.h @@ -17,22 +17,14 @@ #define ABSL_CONTAINER_INTERNAL_HAVE_SSE_H_ - #ifndef SWISSTABLE_HAVE_SSE2 + #ifndef ABSL_INTERNAL_RAW_HASH_SET_HAVE_SSE2 -#if defined(__SSE2__) || \ - (defined(_MSC_VER) && \ - (defined(_M_X64) || (defined(_M_IX86) && _M_IX86_FP >= 2))) +#if defined(__x86_64__) || (defined(_MSC_VER) && defined(_M_X64)) - #define SWISSTABLE_HAVE_SSE2 1 + #define ABSL_INTERNAL_RAW_HASH_SET_HAVE_SSE2 1 #else - #define SWISSTABLE_HAVE_SSE2 0 + #define ABSL_INTERNAL_RAW_HASH_SET_HAVE_SSE2 0 #endif #endif --#ifndef SWISSTABLE_HAVE_SSSE3 +-#ifndef ABSL_INTERNAL_RAW_HASH_SET_HAVE_SSSE3 -#ifdef __SSSE3__ --#define SWISSTABLE_HAVE_SSSE3 1 +-#define ABSL_INTERNAL_RAW_HASH_SET_HAVE_SSSE3 1 -#else - #define SWISSTABLE_HAVE_SSSE3 0 + #define ABSL_INTERNAL_RAW_HASH_SET_HAVE_SSSE3 0 -#endif -#endif - #if SWISSTABLE_HAVE_SSSE3 && !SWISSTABLE_HAVE_SSE2 - #error "Bad configuration!" + #if ABSL_INTERNAL_RAW_HASH_SET_HAVE_SSSE3 && \ + !ABSL_INTERNAL_RAW_HASH_SET_HAVE_SSE2 diff --git a/debian/patches/license.diff b/debian/patches/license.diff deleted file mode 100644 index 08f315e4..00000000 --- a/debian/patches/license.diff +++ /dev/null @@ -1,59 +0,0 @@ -From: Benjamin Barenblat <bbaren@google.com> -Subject: Correct Apache license headers -Forwarded: yes -Applied-Upstream: https://github.com/abseil/abseil-cpp/commit/bd317cae3bc2630d1b12c5f1d77036e937d1d725 - -This repository has always been licensed under the Apache license, but some -files lacked headers to locally indicate that fact. Add the appropriate headers. - -The author works at Google. Upstream applied this patch as Piper revision -310223650 and exported it to GitHub; the Applied-Upstream URL above points to -the exported commit. - ---- a/absl/debugging/internal/stacktrace_arm-inl.inc -+++ b/absl/debugging/internal/stacktrace_arm-inl.inc -@@ -1,9 +1,18 @@ --// Copyright 2011 and onwards Google Inc. --// All rights reserved. -+// Copyright 2017 The Abseil Authors. -+// -+// Licensed under the Apache License, Version 2.0 (the "License"); -+// you may not use this file except in compliance with the License. -+// You may obtain a copy of the License at -+// -+// https://www.apache.org/licenses/LICENSE-2.0 -+// -+// Unless required by applicable law or agreed to in writing, software -+// distributed under the License is distributed on an "AS IS" BASIS, -+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+// See the License for the specific language governing permissions and -+// limitations under the License. - // --// Author: Doug Kwan - // This is inspired by Craig Silverstein's PowerPC stacktrace code. --// - - #ifndef ABSL_DEBUGGING_INTERNAL_STACKTRACE_ARM_INL_H_ - #define ABSL_DEBUGGING_INTERNAL_STACKTRACE_ARM_INL_H_ ---- a/absl/debugging/internal/stacktrace_generic-inl.inc -+++ b/absl/debugging/internal/stacktrace_generic-inl.inc -@@ -1,7 +1,16 @@ --// Copyright 2000 - 2007 Google Inc. --// All rights reserved. -+// Copyright 2017 The Abseil Authors. - // --// Author: Sanjay Ghemawat -+// Licensed under the Apache License, Version 2.0 (the "License"); -+// you may not use this file except in compliance with the License. -+// You may obtain a copy of the License at -+// -+// https://www.apache.org/licenses/LICENSE-2.0 -+// -+// Unless required by applicable law or agreed to in writing, software -+// distributed under the License is distributed on an "AS IS" BASIS, -+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -+// See the License for the specific language governing permissions and -+// limitations under the License. - // - // Portable implementation - just use glibc - // diff --git a/debian/patches/series b/debian/patches/series index f544d1d9..dbd8a0ad 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1 @@ -license.diff configure.diff -bug970333.diff |