diff -Nru otf-1.12.5+dfsg/debian/changelog otf-1.12.5+dfsg/debian/changelog
--- otf-1.12.5+dfsg/debian/changelog	2020-11-01 01:34:07.000000000 +0000
+++ otf-1.12.5+dfsg/debian/changelog	2021-03-08 21:04:54.000000000 +0000
@@ -1,3 +1,11 @@
+otf (1.12.5+dfsg-8) unstable; urgency=medium
+
+  * rules: Rename otfinfo tool to otfinfo-trace (Closes: Bug#984802).
+  * control: Do not Conlict with libotf-bin any more, we now ship otfdump as
+    otfprint.
+
+ -- Samuel Thibault <sthibault@debian.org>  Mon, 08 Mar 2021 22:04:54 +0100
+
 otf (1.12.5+dfsg-7) unstable; urgency=medium
 
   * control: Really make libopen-trace-format-dev not Multi-Arch: same.
diff -Nru otf-1.12.5+dfsg/debian/control otf-1.12.5+dfsg/debian/control
--- otf-1.12.5+dfsg/debian/control	2020-11-01 01:34:07.000000000 +0000
+++ otf-1.12.5+dfsg/debian/control	2021-03-08 21:03:30.000000000 +0000
@@ -14,7 +14,6 @@
 Architecture: any
 Multi-Arch: foreign
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Conflicts: lcdf-typetools, libotf-bin
 Suggests: texlive-latex-base
 Description: Open Trace Format support library - development files
  OTF is a standard trace format used by several high-performance tools,
diff -Nru otf-1.12.5+dfsg/debian/rules otf-1.12.5+dfsg/debian/rules
--- otf-1.12.5+dfsg/debian/rules	2019-12-07 11:51:01.000000000 +0000
+++ otf-1.12.5+dfsg/debian/rules	2021-03-08 21:04:54.000000000 +0000
@@ -22,6 +22,7 @@
 	dh_auto_install
 	ln -s libopen-trace-format.so debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libotf.so
 	ln -s libopen-trace-format.a debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libotf.a
+	mv debian/tmp/usr/bin/otfinfo debian/tmp/usr/bin/otfinfo-trace
 	(cd debian/tmp/usr/include ; ln -s open-trace-format/* .)
 
 override_dh_install:
@@ -32,7 +33,7 @@
 	$(HELP2MAN) -n "Append snapshots and statistics to an OTF trace" ./tools/otfaux/otfaux > debian/otfaux.1
 	$(HELP2MAN) -n "Compression program for single OTF files" ./tools/otfcompress/otfcompress > debian/otfcompress.1
 	$(HELP2MAN) -n "Show parameters of the OTF configuration" ./tools/otfconfig/otfconfig > debian/otfconfig.1
-	$(HELP2MAN) -n "Program to get basic information of an OTF trace" ./tools/otfinfo/otfinfo > debian/otfinfo.1
+	$(HELP2MAN) -n "Program to get basic information of an OTF trace" ./tools/otfinfo/otfinfo > debian/otfinfo-trace.1
 	$(HELP2MAN) -n "Change the number of streams for an OTF trace" ./tools/otfmerge/otfmerge > debian/otfmerge.1
 	$(HELP2MAN) -n "Generate a profile of an OTF trace" ./tools/otfprofile/otfprofile > debian/otfprofile.1
 	$(HELP2MAN) -n "Create a new OTF trace that only includes specified processes" ./tools/otfshrink/otfshrink > debian/otfshrink.1
diff -Nru otf-1.12.5+dfsg/debian/salsa-ci.yml otf-1.12.5+dfsg/debian/salsa-ci.yml
--- otf-1.12.5+dfsg/debian/salsa-ci.yml	1970-01-01 00:00:00.000000000 +0000
+++ otf-1.12.5+dfsg/debian/salsa-ci.yml	2020-12-30 14:08:58.000000000 +0000
@@ -0,0 +1,6 @@
+---
+include:
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
+
+# vim: ts=2 sw=2 et sts=2 ft=yaml