Control: tags -1 + patch pending Dear maintainer,
I've prepared an NMU for mtbl (versioned as 0.2-1.1) and uploaded it to DELAYED/1. Please feel free to tell me if I should delay it longer. Regards. -- Sebastian Ramacher
diff -Nru mtbl-0.2/debian/changelog mtbl-0.2/debian/changelog --- mtbl-0.2/debian/changelog 2012-05-30 04:37:01.000000000 +0200 +++ mtbl-0.2/debian/changelog 2013-05-26 22:52:56.000000000 +0200 @@ -1,3 +1,11 @@ +mtbl (0.2-1.1) unstable; urgency=low + + * Non-maintainer upload. + * debian/patches/eglibc2.17.patch: Rename timespec_get to prevent name + clashes with timespec_get provided by eglibc 2.17 (Closes: #701405) + + -- Sebastian Ramacher <sramac...@debian.org> Sun, 26 May 2013 22:52:55 +0200 + mtbl (0.2-1) unstable; urgency=low * New upstream release. diff -Nru mtbl-0.2/debian/patches/eglibc2.17.patch mtbl-0.2/debian/patches/eglibc2.17.patch --- mtbl-0.2/debian/patches/eglibc2.17.patch 1970-01-01 01:00:00.000000000 +0100 +++ mtbl-0.2/debian/patches/eglibc2.17.patch 2013-05-26 22:52:53.000000000 +0200 @@ -0,0 +1,35 @@ +Description: Rename timespec_get + Prevent name clashes with timespec_get provided by eglibc 2.17. +Author: Sebastian Ramacher <sramac...@debian.org> +Bug-Debian: http://bugs.debian.org/701405 +Last-Update: 2013-05-26 + +--- a/src/mtbl_merge.c ++++ b/src/mtbl_merge.c +@@ -64,7 +64,7 @@ + } + + static void +-timespec_get(struct timespec *now) { ++mtbl_timespec_get(struct timespec *now) { + struct timeval tv; + (void) gettimeofday(&tv, NULL); + now->tv_sec = tv.tv_sec; +@@ -92,7 +92,7 @@ + struct timespec dur; + double t_dur; + +- timespec_get(&dur); ++ mtbl_timespec_get(&dur); + timespec_sub(&start_time, &dur); + t_dur = timespec_to_double(&dur); + +@@ -268,7 +268,7 @@ + } + + /* do merge */ +- timespec_get(&start_time); ++ mtbl_timespec_get(&start_time); + merge(); + + /* cleanup readers */ diff -Nru mtbl-0.2/debian/patches/series mtbl-0.2/debian/patches/series --- mtbl-0.2/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ mtbl-0.2/debian/patches/series 2013-05-26 22:49:52.000000000 +0200 @@ -0,0 +1 @@ +eglibc2.17.patch
signature.asc
Description: Digital signature
