This is an automated email from the git hooks/post-receive script.
aurel32 pushed a commit to branch sid
in repository glibc.
commit 30b6283d335628e9dbb8e659c570b7d3f83a9b47
Author: Aurelien Jarno <aurel...@aurel32.net>
Date: Thu May 12 08:58:40 2016 +0200
debian/patches/kfreebsd/local-tst-malloc-backtrace.diff: drop, obsoleted by
hurd-i386/cvs-libpthread.so.diff.
---
debian/changelog | 2 ++
debian/patches/kfreebsd/local-tst-malloc-backtrace.diff | 13 -------------
debian/patches/series.kfreebsd-amd64 | 1 -
debian/patches/series.kfreebsd-i386 | 1 -
4 files changed, 2 insertions(+), 15 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d7b2d5a..5c76faa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ glibc (2.22-9) UNRELEASED; urgency=medium
[ Aurelien Jarno ]
* debian/testsuite-xfail-debian.mk: drop check on i586 flavours.
+ * debian/patches/kfreebsd/local-tst-malloc-backtrace.diff: drop, obsoleted
+ by hurd-i386/cvs-libpthread.so.diff.
-- Samuel Thibault <sthiba...@debian.org> Thu, 12 May 2016 01:05:26 +0200
diff --git a/debian/patches/kfreebsd/local-tst-malloc-backtrace.diff
b/debian/patches/kfreebsd/local-tst-malloc-backtrace.diff
deleted file mode 100644
index 4444d48..0000000
--- a/debian/patches/kfreebsd/local-tst-malloc-backtrace.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/malloc/Makefile
-+++ b/malloc/Makefile
-@@ -45,8 +45,8 @@ extra-libs-others = $(extra-libs)
- libmemusage-routines = memusage
- libmemusage-inhibit-o = $(filter-out .os,$(object-suffixes))
-
--$(objpfx)tst-malloc-backtrace: $(common-objpfx)nptl/libpthread.so \
-- $(common-objpfx)nptl/libpthread_nonshared.a
-+$(objpfx)tst-malloc-backtrace: $(common-objpfx)fbtl/libpthread.so \
-+ $(common-objpfx)fbtl/libpthread_nonshared.a
-
- # These should be removed by `make clean'.
- extra-objs = mcheck-init.o libmcheck.a
diff --git a/debian/patches/series.kfreebsd-amd64
b/debian/patches/series.kfreebsd-amd64
index 8dd4b9b..54c50d0 100644
--- a/debian/patches/series.kfreebsd-amd64
+++ b/debian/patches/series.kfreebsd-amd64
@@ -3,4 +3,3 @@ kfreebsd/local-sys_queue_h.diff
kfreebsd/local-undef-glibc.diff
kfreebsd/local-initgroups-order.diff
kfreebsd/local-tst-auxv.diff
-kfreebsd/local-tst-malloc-backtrace.diff
diff --git a/debian/patches/series.kfreebsd-i386
b/debian/patches/series.kfreebsd-i386
index 8dd4b9b..54c50d0 100644
--- a/debian/patches/series.kfreebsd-i386
+++ b/debian/patches/series.kfreebsd-i386
@@ -3,4 +3,3 @@ kfreebsd/local-sys_queue_h.diff
kfreebsd/local-undef-glibc.diff
kfreebsd/local-initgroups-order.diff
kfreebsd/local-tst-auxv.diff
-kfreebsd/local-tst-malloc-backtrace.diff
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-glibc/glibc.git
