Andreas Tille pushed to branch master at Debian Med / sambamba
Commits: efac3520 by Andreas Tille at 2023-08-21T19:48:11+02:00 Drop unused patches - - - - - 6 changed files: - debian/changelog - − debian/patches/02_disable-assert.patch - − debian/patches/MakefilePointerToStaticLib.patch - − debian/patches/fix_meson_syntax.patch - − debian/patches/no_biod_needed.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,8 +1,9 @@ -sambamba (1.0.1+dfsg-2) UNRELEASED; urgency=medium +sambamba (1.0.1+dfsg-3) UNRELEASED; urgency=medium * Drop unneeded copyright paragraph + * Drop unused patches - -- Andreas Tille <[email protected]> Mon, 21 Aug 2023 15:25:39 +0200 + -- Andreas Tille <[email protected]> Mon, 21 Aug 2023 19:47:58 +0200 sambamba (1.0.1+dfsg-1) unstable; urgency=medium ===================================== debian/patches/02_disable-assert.patch deleted ===================================== @@ -1,17 +0,0 @@ -Description: Disable assert started failing on 0583f4940a81166d856b5537a920d12113c86530 -Author: Gianfranco Costamagna <[email protected]> - -Bug-Debian: https://bugs.debian.org/893664 -Last-Update: 2018-03-21 - ---- a/sambamba/markdup.d -+++ b/sambamba/markdup.d -@@ -610,7 +610,7 @@ - } - } - --static assert(PairedEndsInfo.sizeof == 40); -+// static assert(PairedEndsInfo.sizeof == 40); - - bool singleEndInfoComparator(S1, S2)(auto ref S1 s1, auto ref S2 s2) { - if (s1.library_id < s2.library_id) return true; ===================================== debian/patches/MakefilePointerToStaticLib.patch deleted ===================================== @@ -1,34 +0,0 @@ -Author: Steffen Moeller -Last-Update: 2020-07-04 19:22:38 +0200 -Description: Find static libs in multiarch places - ---- a/Makefile -+++ b/Makefile -@@ -32,13 +32,13 @@ - - DLIBS = $(LIBRARY_PATH)/libphobos2-ldc.a $(LIBRARY_PATH)/libdruntime-ldc.a - DLIBS_DEBUG = $(LIBRARY_PATH)/libphobos2-ldc-debug.a $(LIBRARY_PATH)/libdruntime-ldc-debug.a --LIBS = lz4/lib/liblz4.a -L-L$(LIBRARY_PATH) -L-lpthread -L-lm -L-lz -+LIBS = /usr/lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)/liblz4.a -L-L$(LIBRARY_PATH) -L-lpthread -L-lm -L-lz - LIBS_STATIC = $(LIBRARY_PATH)/libc.a $(DLIBS) $(LIBRARY_PATH)/liblz4.a -L-lz - SRC = utils/ldc_version_info_.d utils/lz4.d utils/strip_bcf_header.d $(sort $(wildcard BioD/contrib/undead/*.d BioD/contrib/undead/*/*.d)) utils/version_.d $(sort $(wildcard thirdparty/*.d) $(wildcard BioD/bio/*/*.d BioD/bio/*/*/*.d BioD/bio/*/*/*/*.d BioD/bio/*/*/*/*/*.d) $(wildcard sambamba/*.d sambamba/*/*.d sambamba/*/*/*.d)) - OBJ = $(SRC:.d=.o) - OUT = bin/sambamba-$(shell cat VERSION) - --STATIC_LIB_PATH=-Llz4 -+STATIC_LIB_PATH=-L/usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/ - - .PHONY: all debug release static clean test - -@@ -56,11 +56,6 @@ - - pgo-static: DFLAGS += -fprofile-instr-use=profile.data - --lz4-static: lz4/lib/liblz4.a -- --lz4/lib/liblz4.a: lz4/lib/lz4.c lz4/lib/lz4hc.c lz4/lib/lz4frame.c lz4/lib/xxhash.c -- cd lz4/lib && $(CC) -O3 -c lz4.c lz4hc.c lz4frame.c xxhash.c && $(AR) rcs liblz4.a lz4.o lz4hc.o lz4frame.o xxhash.o -- - utils/ldc_version_info_.d: - python3 ./gen_ldc_version_info.py $(shell which ldmd2) > utils/ldc_version_info_.d - cat utils/ldc_version_info_.d ===================================== debian/patches/fix_meson_syntax.patch deleted ===================================== @@ -1,15 +0,0 @@ -Author: Andreas Tille <[email protected]> -Last-Update: Mon, 30 Nov 2020 17:37:23 +0100 -Description: Fix Meson syntax - ---- a/meson.build -+++ b/meson.build -@@ -112,7 +112,7 @@ - thirdparty_src, - version_info_d_fname], - dependencies: [biod_dep, -- lz4_dep, -+ lz4_dep], - d_args: extra_dflags, - d_import_dirs: [include_directories('.')], - install: true ===================================== debian/patches/no_biod_needed.patch deleted ===================================== @@ -1,20 +0,0 @@ ---- a/meson.build -+++ b/meson.build -@@ -81,7 +81,6 @@ manpages = [ - # - # Dependencies - # --biod_dep = dependency('biod', version: '>=0.1.0', static: true) - lz4_dep = dependency('liblz4') - - # -@@ -111,8 +110,7 @@ sambamba_exe = executable('sambamba', - cram_src, - thirdparty_src, - version_info_d_fname], -- dependencies: [biod_dep, -- lz4_dep], -+ dependencies: [lz4_dep], - d_args: extra_dflags, - d_import_dirs: [include_directories('.')], - install: true ===================================== debian/patches/series ===================================== @@ -1,5 +1 @@ -# 02_disable-assert.patch 2to3.patch -# MakefilePointerToStaticLib.patch -# fix_meson_syntax.patch -# no_biod_needed.patch View it on GitLab: https://salsa.debian.org/med-team/sambamba/-/commit/efac35204237ade9f1cc66707ada88771910119b -- View it on GitLab: https://salsa.debian.org/med-team/sambamba/-/commit/efac35204237ade9f1cc66707ada88771910119b You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
