From: Daniel Baumann Date: Thu, 20 Mar 2025 14:15:29 +0000 (+0100) Subject: ck (0.7.2-5) sid; urgency=medium X-Git-Tag: archive/raspbian/0.7.2-5+rpi1^2~2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9cbe46e533f161c774cfa48a5b6f909d79d76350;p=ck.git ck (0.7.2-5) sid; urgency=medium * Removing multi-arch field for libck-dev (Closes: #1100922). [dgit import unpatched ck 0.7.2-5] --- 9cbe46e533f161c774cfa48a5b6f909d79d76350 diff --cc debian/changelog index 0000000,0000000..46bd748 new file mode 100644 --- /dev/null +++ b/debian/changelog @@@ -1,0 -1,0 +1,265 @@@ ++ck (0.7.2-5) sid; urgency=medium ++ ++ * Removing multi-arch field for libck-dev (Closes: #1100922). ++ ++ -- Daniel Baumann Thu, 20 Mar 2025 15:15:29 +0100 ++ ++ck (0.7.2-4) sid; urgency=medium ++ ++ * Using codename instead of suitename in changelog. ++ ++ -- Daniel Baumann Thu, 20 Mar 2025 07:53:41 +0100 ++ ++ck (0.7.2-3) sid; urgency=medium ++ ++ * Updating to standards version 4.7.1. ++ * Updating to standards version 4.7.2. ++ ++ -- Daniel Baumann Wed, 19 Mar 2025 19:18:55 +0100 ++ ++ck (0.7.2-2) sid; urgency=medium ++ ++ * Updating source url in copyright. ++ * Re-adding missing changelog for 0.7.1-12.1~exp1. ++ * Updating vcs fields. ++ * Updating my email address. ++ * Trimming debian changelog. ++ * Updating year in debian copyright for 2025. ++ ++ -- Daniel Baumann Sun, 09 Feb 2025 07:58:38 +0100 ++ ++ck (0.7.2-1) sid; urgency=medium ++ ++ * Merging upstream version 0.7.2. ++ * Updating to standards-version 4.7.0. ++ * Removing cc-builtins.patch, included upstream. ++ * Removing disable-sse.patch, included upstream. ++ * Refreshing ftbfs-armhf.patch. ++ * Renumbering remaining patch. ++ ++ -- Daniel Baumann Mon, 08 Apr 2024 09:50:31 +0200 ++ ++ck (0.7.1-13) sid; urgency=medium ++ ++ * Bumping build-depends on debhelper for t64 transition. ++ * Wrap and sorting debian files. ++ * Updating copyright for 2024. ++ ++ -- Daniel Baumann Mon, 04 Mar 2024 07:05:29 +0100 ++ ++ck (0.7.1-12.1) unstable; urgency=medium ++ ++ * Non-maintainer upload. ++ * Rename libraries for 64-bit time_t transition. Closes: #1062061 ++ ++ -- Steve Langasek Wed, 28 Feb 2024 15:42:20 +0000 ++ ++ck (0.7.1-12.1~exp1) experimental; urgency=medium ++ ++ * Non-maintainer upload. ++ * Rename libraries for 64-bit time_t transition. ++ ++ -- Steve Langasek Wed, 31 Jan 2024 08:55:15 +0000 ++ ++ck (0.7.1-12) sid; urgency=medium ++ ++ * Skipping tests when building non-parallel to fix hanging test suite, ++ thanks to Santiago Vila (Closes: #1055218). ++ ++ -- Daniel Baumann Sun, 10 Dec 2023 10:44:25 +0100 ++ ++ck (0.7.1-11) sid; urgency=medium ++ ++ * Removing generated files to fix FTBFS when build twice in a row ++ (Closes: #1043762). ++ ++ -- Daniel Baumann Mon, 14 Aug 2023 10:04:37 +0200 ++ ++ck (0.7.1-10) sid; urgency=medium ++ ++ * Updating packaging copyright as it has completely replaced/redone. ++ ++ -- Daniel Baumann Mon, 30 Jan 2023 17:17:29 +0100 ++ ++ck (0.7.1-9) sid; urgency=medium ++ ++ * Updating http links to https in copyright. ++ * Updating to standards version 4.6.2. ++ ++ -- Daniel Baumann Wed, 25 Jan 2023 09:15:20 +0100 ++ ++ck (0.7.1-8) sid; urgency=medium ++ ++ * Updating to standards version 4.6.1. ++ * Adding patch from Steve Langasek to fix ++ FTBFS on armhf (Closes: #1009622). ++ ++ -- Daniel Baumann Thu, 07 Jul 2022 10:14:36 +0200 ++ ++ck (0.7.1-7) sid; urgency=medium ++ ++ * Overwriting armhf platform target to fix FTBFS with newer GCC (Closes: ++ #1009622). ++ ++ -- Daniel Baumann Wed, 13 Apr 2022 08:50:08 +0200 ++ ++ck (0.7.1-6) sid; urgency=medium ++ ++ * Running test-suite only on fast-enough architectures (amd64, arm64, ++ i386). ++ ++ -- Daniel Baumann Sun, 31 Oct 2021 02:46:17 +0200 ++ ++ck (0.7.1-5) sid; urgency=medium ++ ++ * Skipping failing test-suite on mipsel and mips64el. ++ ++ -- Daniel Baumann Sat, 30 Oct 2021 07:06:55 +0200 ++ ++ck (0.7.1-4) sid; urgency=medium ++ ++ * Updating to standards version 4.6.0. ++ * Fixing baseline violations on armel and i386, thanks to Adrian Bunk ++ (Closes: #993010). ++ ++ -- Daniel Baumann Fri, 27 Aug 2021 04:33:50 +0200 ++ ++ck (0.7.1-3) sid; urgency=medium ++ ++ * Uploading to sid. ++ ++ -- Daniel Baumann Sun, 15 Aug 2021 17:21:16 +0200 ++ ++ck (0.7.1-2) experimental; urgency=medium ++ ++ * Switching architecture to linux-any to exclude hurd and kfreebsd (both ++ FTBFS). ++ ++ -- Daniel Baumann Sat, 24 Jul 2021 06:12:58 +0200 ++ ++ck (0.7.1-1) experimental; urgency=medium ++ ++ * Merging upstream version 0.7.1 (Closes: #991419). ++ * Updating to debhelper version 13. ++ * Updating to standards version 4.5.1. ++ * Building ck on any architecture (Closes: #743752, #750998). ++ * Removing gbp.conf. ++ * Adding rules-requires-root field. ++ * Removing trailing slash in homepage field. ++ * Repeating section field for all binary packages for consistency ++ reasons. ++ * Adding multi-arch field for libck-dev. ++ * Updating package descriptions. ++ * Updating and reformating copyright file. ++ * Shortening debhelper install files. ++ * Updating watch file. ++ * Streamlining rules file. ++ * Removing old dpkg-source files. ++ * Removing allow-disable-sse.patch, included upstream. ++ * Removing glibc-2.30.patch, included upstream. ++ * Wrap and sorting debian directory. ++ ++ -- Daniel Baumann Fri, 23 Jul 2021 13:59:39 +0200 ++ ++ck (0.6.0-2) sid; urgency=medium ++ ++ * New maintainer (Closes: #991427), thanks to Robert for his past work. ++ * Updating vcs fields. ++ ++ -- Daniel Baumann Fri, 23 Jul 2021 13:25:19 +0200 ++ ++ck (0.6.0-1.4) unstable; urgency=medium ++ ++ * Non-maintainer upload. ++ * Explicitly set the platform option when building for armhf ++ rather than rely on the configure script's autodetection. ++ ++ -- JCF Ploemen (jcfp) Sat, 04 Apr 2020 05:20:03 +0000 ++ ++ck (0.6.0-1.3) unstable; urgency=medium ++ ++ * Non-maintainer upload. ++ * Backport upstream commit b520d58 to fix build failure against ++ glibc 2.30; patch provided by Logan Rosen. (Closes: #951384) ++ ++ -- JCF Ploemen (jcfp) Fri, 27 Mar 2020 10:14:22 +0000 ++ ++ck (0.6.0-1.2) unstable; urgency=medium ++ ++ * Non-maintainer upload. ++ * Backport upstream patch to disable SSE on x86. (Closes: #906697) ++ ++ -- Dominik George Thu, 21 Nov 2019 09:38:52 +0100 ++ ++ck (0.6.0-1.1) unstable; urgency=medium ++ ++ * Non-maintainer upload. ++ * Apply patch from Niels Thykier to fix FTBFS with ++ debhelper >= 11.1. (Closes: #888591) ++ ++ -- Adrian Bunk Sat, 24 Feb 2018 21:32:28 +0200 ++ ++ck (0.6.0-1) unstable; urgency=medium ++ ++ * New upstream version 0.6.0 ++ ++ -- Robert Edmonds Fri, 10 Mar 2017 18:38:50 -0500 ++ ++ck (0.5.2-2) unstable; urgency=medium ++ ++ * debian/control: Only build on architectures supported by upstream ++ * debian/rules: Limit tests to 2 cores (Closes: #764827) ++ * debian/gbp.conf: New (enable pristine-tar, pristine-tar-commit) ++ ++ -- Robert Edmonds Thu, 29 Dec 2016 16:59:42 -0500 ++ ++ck (0.5.2-1) unstable; urgency=medium ++ ++ * New upstream version 0.5.2 (Closes: #813145) ++ * debian/control: Update Maintainer (Closes: #848656) ++ * debian/control: Use HTTPS Vcs-* URLs ++ * debian/control: Standards-Version 3.9.8 (no changes) ++ * debian/control: Build-Depend on debhelper 10 ++ * debian/compat: Compat level 10 ++ * debian/copyright: BSD -> BSD-2-clause (Fixes Lintian ++ "invalid-short-name-in-dep5-copyright") ++ * debian/copyright: Remove Source header (dead link) ++ * debian/copyright: Correct path to include/gcc/x86_64/ck_pr_rtm.h (Fixes ++ Lintian "wildcard-matches-nothing-in-dep5-copyright ck_pr_rtm", ++ "unused-file-paragraph-in-dep5-copyright") ++ * debian/watch: Add watch file for GitHub releases ++ * debian/source/: Use 3.0 (quilt) source format, plus options and patch ++ header ++ ++ -- Robert Edmonds Wed, 21 Dec 2016 18:59:51 -0500 ++ ++ck (0.4.4-2) unstable; urgency=low ++ ++ * Update maintainer to Debian QA up (orphaning the package) ++ ++ -- Daniel Pocock Mon, 19 Dec 2016 10:07:18 +0100 ++ ++ck (0.4.4-1) unstable; urgency=medium ++ ++ * New upstream release. ++ ++ -- Daniel Pocock Wed, 10 Sep 2014 22:16:03 +0200 ++ ++ck (0.4.3-1) unstable; urgency=medium ++ ++ * New upstream release. ++ ++ -- Daniel Pocock Sat, 02 Aug 2014 16:28:29 +0200 ++ ++ck (0.4.2-1) unstable; urgency=medium ++ ++ * New upstream release. ++ * Fixes some build issues for non-Intel platforms. ++ ++ -- Daniel Pocock Fri, 02 May 2014 09:17:48 +0200 ++ ++ck (0.3.5-1) unstable; urgency=low ++ ++ * Initial packaging (Closes: #740392) ++ ++ -- Daniel Pocock Fri, 28 Feb 2014 23:48:09 +0100 diff --cc debian/control index 0000000,0000000..f8f4ee0 new file mode 100644 --- /dev/null +++ b/debian/control @@@ -1,0 -1,0 +1,50 @@@ ++Source: ck ++Section: libs ++Priority: optional ++Maintainer: Daniel Baumann ++Build-Depends: ++ debhelper (>= 13.14~), ++ debhelper-compat (= 13), ++ dpkg-dev (>= 1.22.5), ++Rules-Requires-Root: no ++Standards-Version: 4.7.2 ++Homepage: http://concurrencykit.org ++Vcs-Browser: https://forgejo.debian.net/dns-oarc/ck ++Vcs-Git: https://forgejo.debian.net/dns-oarc/ck ++ ++Package: libck-dev ++Section: libdevel ++Architecture: linux-any ++Depends: ++ libck0t64 (= ${binary:Version}), ++ ${misc:Depends}, ++ ${shlibs:Depends}, ++Description: Concurrency Kit (development) ++ The Concurrency Kit library implements concurrency primitives, safe memory ++ reclamation mechanisms and non-blocking data structures for the research, ++ design and implementation of high performance concurrent systems. ++ . ++ This package contains the development files. ++ ++Package: libck0t64 ++Provides: ++ ${t64:Provides}, ++Replaces: ++ libck0, ++Breaks: ++ libck0 (<< ${source:Version}), ++Section: libs ++Architecture: linux-any ++Pre-Depends: ++ ${misc:Pre-Depends}, ++Depends: ++ ${misc:Depends}, ++ ${shlibs:Depends}, ++Description: Concurrency Kit (library) ++ The Concurrency Kit library implements concurrency primitives, safe memory ++ reclamation mechanisms and non-blocking data structures for the research, ++ design and implementation of high performance concurrent systems. ++ . ++ It features atomic operations, hardware transactional memory, memory barriers, ++ hash tables, list, ring, stack, fifo, bitmap, safe memory reclamation, ++ scalable locks, execution barriers, asymmetric synchronization and more. diff --cc debian/copyright index 0000000,0000000..c5a97e8 new file mode 100644 --- /dev/null +++ b/debian/copyright @@@ -1,0 -1,0 +1,60 @@@ ++Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ ++Upstream-Name: ck ++Upstream-Contact: Samy Al Bahra ++Source: https://github.com/concurrencykit/ck/tags ++ ++Files: * ++Copyright: 2010-2021 Samy Al Bahra ++ 2011-2013 AppNexus, Inc. ++License: BSD-2-clause ++ ++Files: include/gcc/x86_64/ck_pr_rtm.h ++Copyright: 2012-2013 Intel Corporation ++License: BSD-2-clause ++ ++Files: src/ck_hp.c ++Copyright: 2008 IBM Corporation ++License: Apache-2 ++ ++Files: debian/* ++Copyright: 2021-2025 Daniel Baumann ++License: BSD-2-clause ++ ++License: Apache-2.0 ++ 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. ++ . ++ The complete text of the Apache-2.0 License ++ can be found in /usr/share/common-licenses/Apache-2.0 file. ++ ++License: BSD-2-clause ++ Redistribution and use in source and binary forms, with or without ++ modification, are permitted provided that the following conditions ++ are met: ++ . ++ 1. Redistributions of source code must retain the above copyright ++ notice, this list of conditions and the following disclaimer. ++ 2. Redistributions in binary form must reproduce the above copyright ++ notice, this list of conditions and the following disclaimer in the ++ documentation and/or other materials provided with the distribution. ++ . ++ THIS SOFTWARE IS PROVIDED BY AUTHORS AND CONTRIBUTORS ``AS IS'' AND ++ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE ++ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++ ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE ++ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS ++ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) ++ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT ++ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY ++ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF ++ SUCH DAMAGE. diff --cc debian/libck-dev.install index 0000000,0000000..e5f703b new file mode 100644 --- /dev/null +++ b/debian/libck-dev.install @@@ -1,0 -1,0 +1,5 @@@ ++usr/include ++usr/lib/*/*.a ++usr/lib/*/*.so ++usr/lib/*/pkgconfig ++usr/share/man diff --cc debian/libck0t64.install index 0000000,0000000..3de3b10 new file mode 100644 --- /dev/null +++ b/debian/libck0t64.install @@@ -1,0 -1,0 +1,1 @@@ ++usr/lib/*/*.so.* diff --cc debian/libck0t64.lintian-overrides index 0000000,0000000..c78d2c6 new file mode 100644 --- /dev/null +++ b/debian/libck0t64.lintian-overrides @@@ -1,0 -1,0 +1,1 @@@ ++libck0t64: package-name-doesnt-match-sonames libck0 diff --cc debian/patches/debian/0001-ftbfs-armhf.patch index 0000000,0000000..e4a9ff8 new file mode 100644 --- /dev/null +++ b/debian/patches/debian/0001-ftbfs-armhf.patch @@@ -1,0 -1,0 +1,25 @@@ ++Author: Steve Langasek ++Description: do not hard-code CPU target based on uname (Closes: #1009622). ++ The compiler in Debian correctly targets the right ISA for the ++ architecture. Hard-coding this can result in misbuilds depending on the ++ build machine. Also, armv7-a is the wrong target for armhf now, it should ++ be armv7-a+fp. ++ ++diff -Naurp ck.orig/configure ck/configure ++--- ck.orig/configure +++++ ck/configure ++@@ -515,14 +515,6 @@ case $PLATFORM in ++ ENVIRONMENT=64 ++ ;; ++ arm|armv6|armv6l|armv7|armv7l) ++- case "$PLATFORM" in ++- "armv6"|"armv6l") ++- CFLAGS="$CFLAGS -march=armv6k"; ++- ;; ++- "armv7"|"armv7l") ++- CFLAGS="$CFLAGS -march=armv7-a"; ++- ;; ++- esac ++ RTM_ENABLE="CK_MD_RTM_DISABLE" ++ LSE_ENABLE="CK_MD_LSE_DISABLE" ++ MM="${MM:-"CK_MD_RMO"}" diff --cc debian/patches/series index 0000000,0000000..5cb9569 new file mode 100644 --- /dev/null +++ b/debian/patches/series @@@ -1,0 -1,0 +1,1 @@@ ++debian/0001-ftbfs-armhf.patch diff --cc debian/rules index 0000000,0000000..e91561b new file mode 100755 --- /dev/null +++ b/debian/rules @@@ -1,0 -1,0 +1,49 @@@ ++#!/usr/bin/make -f ++ ++include /usr/share/dpkg/architecture.mk ++ ++ifneq (,$(filter $(DEB_HOST_ARCH), armel x32)) ++ PLATFORM = --platform=unknown ++endif ++ ++ifeq ($(DEB_HOST_ARCH),armhf) ++ DEB_CFLAGS_MAINT_APPEND = -march=armv7-a+fp ++ export DEB_CFLAGS_MAINT_APPEND ++endif ++ ++ifeq ($(DEB_HOST_ARCH), i386) ++ PLATFORM = --disable-sse ++endif ++ ++ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) ++ NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) ++else ++ NUMJOBS = 1 ++endif ++ ++%: ++ dh ${@} ++ ++execute_after_dh_auto_clean: ++ # remove generated files ++ rm -f doc/*.gz src/*.a src/*.so ++ for FILE in $$(find . -type f -name "*.in"); \ ++ do \ ++ rm -f "$$(dirname "$${FILE}")"/"$$(basename "$${FILE}" .in)"; \ ++ done ++ ++override_dh_auto_configure: ++ dh_auto_configure -- \ ++ --prefix=/usr \ ++ --libdir=/usr/lib/$(DEB_HOST_MULTIARCH) \ ++ --includedir=/usr/include \ ++ --mandir=/usr/share/man \ ++ --cores=2 \ ++ $(PLATFORM) ++ ++override_dh_auto_test: ++ifneq (,$(filter $(DEB_HOST_ARCH), amd64 arm64 i386)) ++ifneq ($(NUMJOBS), 1) ++ $(MAKE) -j1 check ++endif ++endif diff --cc debian/source/format index 0000000,0000000..163aaf8 new file mode 100644 --- /dev/null +++ b/debian/source/format @@@ -1,0 -1,0 +1,1 @@@ ++3.0 (quilt) diff --cc debian/watch index 0000000,0000000..529ad14 new file mode 100644 --- /dev/null +++ b/debian/watch @@@ -1,0 -1,0 +1,3 @@@ ++version=4 ++opts=filenamemangle=s/.+\/v?(\d\S+)\.tar\.gz/ck-$1\.tar\.gz/ \ ++https://github.com/concurrencykit/ck/tags .*/v?(\d\S+)\.tar\.gz