tags 652252 + pending thanks Dear maintainer,
I've prepared an NMU for ust (versioned as 0.15-3.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key ID: 0x8649AA06 : :' : Debian GNU/Linux user, admin, & developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of Free Software Foundation Europe `- NP: John Zorn: Avelut (Frisell)
diff -Nru ust-0.15/debian/changelog ust-0.15/debian/changelog
--- ust-0.15/debian/changelog 2011-09-04 15:58:07.000000000 +0200
+++ ust-0.15/debian/changelog 2012-01-02 16:17:42.000000000 +0100
@@ -1,3 +1,15 @@
+ust (0.15-3.1) unstable; urgency=low
+
+ [ Gregor Jasny ]
+ * Non-maintainer upload.
+ * Use caa_unlikely, depend on liburcu >= 0.6.6 (Closes: #652252)
+
+ [ gregor herrmann ]
+ * libust-dev: move liburcu-dev back to Recommends.
+ * debian/rules: remove /usr/share/info/dir.gz (ftp-master autoreject reason).
+
+ -- gregor herrmann <gre...@debian.org> Mon, 02 Jan 2012 16:17:15 +0100
+
ust (0.15-3) unstable; urgency=low
* [61bf984] Remove liburcu1 from libust0 Depends (Closes: #637636)
diff -Nru ust-0.15/debian/control ust-0.15/debian/control
--- ust-0.15/debian/control 2011-09-04 15:58:07.000000000 +0200
+++ ust-0.15/debian/control 2012-01-02 16:25:33.000000000 +0100
@@ -1,7 +1,7 @@
Source: ust
Priority: extra
Maintainer: Jon Bernard <jbern...@debian.org>
-Build-Depends: debhelper (>= 7.0.50~), autotools-dev, liburcu-dev (>= 0.6.2), texinfo
+Build-Depends: debhelper (>= 7.0.50~), autotools-dev, liburcu-dev (>= 0.6.6), texinfo
Standards-Version: 3.9.2
Section: libs
Vcs-Git: git://git.debian.org/git/collab-maint/ust.git
@@ -24,7 +24,7 @@
Section: libdevel
Architecture: i386 amd64 powerpc ppc64
Depends: ${misc:Depends}, libust0 (= ${binary:Version})
-Recommends: liburcu-dev
+Recommends: liburcu-dev (>= 0.6.6)
Description: LTTng Userspace Tracer (development)
The userspace tracer is designed to provide detailed information about
userspace activity. Like the kernel tracer, performance is the main goal.
diff -Nru ust-0.15/debian/patches/0003-use_caa_unlikely.patch ust-0.15/debian/patches/0003-use_caa_unlikely.patch
--- ust-0.15/debian/patches/0003-use_caa_unlikely.patch 1970-01-01 01:00:00.000000000 +0100
+++ ust-0.15/debian/patches/0003-use_caa_unlikely.patch 2012-01-02 16:04:06.000000000 +0100
@@ -0,0 +1,45 @@
+From: Mathieu Desnoyers <mathieu.desnoy...@efficios.com>
+Date: Thu, 15 Dec 2011 22:10:50 +0000 (-0500)
+Subject: Use caa_unlikely, depend on liburcu >= 0.6.6
+X-Git-Tag: v0.16~1
+X-Git-Url: http://git.lttng.org/?p=ust.git;a=commitdiff_plain;h=5296e06cffd5ed5dcf3bb9fe7e3a18744ac18823
+
+Use caa_unlikely, depend on liburcu >= 0.6.6
+
+Signed-off-by: Mathieu Desnoyers <mathieu.desnoy...@efficios.com>
+---
+
+diff --git a/README b/README
+index a2d115b..8776ce4 100644
+--- a/README
++++ b/README
+@@ -16,7 +16,7 @@ PREREQUISITES:
+ - liburcu
+ Userspace RCU library, by Mathieu Desnoyers and Paul E. McKenney
+
+- -> This release depends on liburcu v0.6
++ -> This release depends on liburcu v0.6.6
+
+ * Debian/Ubuntu package: liburcu-dev
+ * Website: http://lttng.org/urcu
+diff --git a/include/ust/tracepoint.h b/include/ust/tracepoint.h
+index 5e7f9d8..ade5677 100644
+--- a/include/ust/tracepoint.h
++++ b/include/ust/tracepoint.h
+@@ -27,6 +27,7 @@
+
+ #include <urcu-bp.h>
+ #include <urcu/list.h>
++#include <urcu/compiler.h>
+
+ struct tracepoint_probe {
+ void *func;
+@@ -96,7 +97,7 @@ struct tracepoint {
+
+ #define __CHECK_TRACE(name, proto, args) \
+ do { \
+- if (unlikely(__tracepoint_##name.state)) \
++ if (caa_unlikely(__tracepoint_##name.state)) \
+ __DO_TRACE(&__tracepoint_##name, \
+ TP_PROTO(proto), TP_ARGS(args)); \
+ } while (0)
diff -Nru ust-0.15/debian/patches/series ust-0.15/debian/patches/series
--- ust-0.15/debian/patches/series 2011-09-04 15:58:07.000000000 +0200
+++ ust-0.15/debian/patches/series 2012-01-02 16:04:06.000000000 +0100
@@ -1,2 +1,3 @@
0001-Add-category-and-directory-entries-to-the-info-docum.patch
0002-Link-register-test-against-libpthread-for-binutils-g.patch
+0003-use_caa_unlikely.patch
diff -Nru ust-0.15/debian/rules ust-0.15/debian/rules
--- ust-0.15/debian/rules 2011-09-04 15:58:07.000000000 +0200
+++ ust-0.15/debian/rules 2012-01-02 16:21:20.000000000 +0100
@@ -5,3 +5,7 @@
override_dh_auto_build:
dh_auto_build
makeinfo --html --no-split doc/info/ust.texi -o debian/ust.html
+
+override_dh_auto_install:
+ dh_auto_install
+ $(RM) -v debian/tmp/usr/share/info/dir
signature.asc
Description: Digital signature
