From c3ce7d22ee8002cfcf7760f9f5f8039a76b6ea07 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Sun, 10 May 2015 23:51:13 +0000
Subject: [PATCH] Update to 4.0.2

svn path=/dists/trunk/linux-tools/; revision=22591
---
 debian/changelog                        |  6 ++++++
 debian/patches/tools-perf-version.patch | 12 ++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c26a02d87df2..22991611ffce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+linux-tools (4.0.2-1) UNRELEASED; urgency=medium
+
+  * New upstream release
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Mon, 11 May 2015 00:46:20 +0100
+
 linux-tools (3.18.5-1~exp1) experimental; urgency=medium
 
   * New upstream release
diff --git a/debian/patches/tools-perf-version.patch b/debian/patches/tools-perf-version.patch
index 25d57e0c1e47..317208f3a5ee 100644
--- a/debian/patches/tools-perf-version.patch
+++ b/debian/patches/tools-perf-version.patch
@@ -9,7 +9,7 @@ version-dependent name.  And do the same for trace.]
 
 --- a/tools/perf/Makefile.perf
 +++ b/tools/perf/Makefile.perf
-@@ -833,8 +833,8 @@ install-gtk:
+@@ -923,8 +923,8 @@ install-gtk:
  install-bin: all install-gtk
  	$(call QUIET_INSTALL, binaries) \
  		$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'; \
@@ -17,10 +17,10 @@ version-dependent name.  And do the same for trace.]
 -		$(LN) '$(DESTDIR_SQ)$(bindir_SQ)/perf' '$(DESTDIR_SQ)$(bindir_SQ)/trace'
 +		$(INSTALL) $(OUTPUT)perf '$(DESTDIR_SQ)$(bindir_SQ)/perf_$(VERSION)'; \
 +		$(LN) '$(DESTDIR_SQ)$(bindir_SQ)/perf_$(VERSION)' '$(DESTDIR_SQ)$(bindir_SQ)/trace_$(VERSION)'
- 	$(call QUIET_INSTALL, libexec) \
- 		$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)'
- 	$(call QUIET_INSTALL, perf-archive) \
-@@ -857,7 +857,7 @@ ifndef NO_LIBPYTHON
+ ifndef NO_PERF_READ_VDSO32
+ 	$(call QUIET_INSTALL, perf-read-vdso32) \
+ 		$(INSTALL) $(OUTPUT)perf-read-vdso32 '$(DESTDIR_SQ)$(bindir_SQ)';
+@@ -957,7 +957,7 @@ ifndef NO_LIBPYTHON
  endif
  	$(call QUIET_INSTALL, perf_completion-script) \
  		$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(sysconfdir_SQ)/bash_completion.d'; \
@@ -29,7 +29,7 @@ version-dependent name.  And do the same for trace.]
  	$(call QUIET_INSTALL, tests) \
  		$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'; \
  		$(INSTALL) tests/attr.py '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'; \
-@@ -871,7 +871,7 @@ install-python_ext:
+@@ -971,7 +971,7 @@ install-python_ext:
  
  # 'make install-doc' should call 'make -C Documentation install'
  $(INSTALL_DOC_TARGETS):