diff --git a/debian/changelog b/debian/changelog index 10d8cb2c5..c1ee3d7d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -130,6 +130,8 @@ linux (4.5.2-1) UNRELEASED; urgency=medium (Closes: #822084) * linux-perf: Add build-time check for unversioned files that are likely to result in file conflicts + * linux-perf: Move tips.txt to /usr/share/doc/linux-perf- + (Closes: #821741) [ Aurelien Jarno ] * [mips*] Emulate unaligned LDXC1 and SDXC1 instructions. diff --git a/debian/rules.d/tools/perf/Makefile b/debian/rules.d/tools/perf/Makefile index 5be6fa726..7eb5faf5d 100644 --- a/debian/rules.d/tools/perf/Makefile +++ b/debian/rules.d/tools/perf/Makefile @@ -33,7 +33,7 @@ MAKE_PERF := $(MAKE) O=$(CURDIR) prefix=/usr V=1 ARCH=$(KERNEL_ARCH_PERF) EXTRA_ MAKE_PERF += NO_GTK2=1 # Include version in all directory names -MAKE_PERF += perfexecdir=lib/perf_$(VERSION)-core plugindir=/usr/lib/traceevent_$(VERSION)/plugins STRACE_GROUPS_DIR=share/perf_$(VERSION)-core/strace/groups +MAKE_PERF += perfexecdir=lib/perf_$(VERSION)-core plugindir=/usr/lib/traceevent_$(VERSION)/plugins STRACE_GROUPS_DIR=share/perf_$(VERSION)-core/strace/groups tipdir=share/doc/linux-perf-$(VERSION) # perf can link against libbfd if available, but the result is # undistributable as they are licenced under GPL v2 and v3+