[kernel] r19110 - in dists/sid/linux-tools: . debian debian/patches

[Ben Hutchings]

Author: benh
Date: Sat Jun  9 19:23:17 2012
New Revision: 19110

Log:
Fix version insertion in perf man pages

Modified:
   dists/sid/linux-tools/   (props changed)
   dists/sid/linux-tools/debian/changelog
   dists/sid/linux-tools/debian/patches/tools-perf-version.patch

Modified: dists/sid/linux-tools/debian/changelog
==============================================================================
--- dists/sid/linux-tools/debian/changelog	Sat Jun  9 19:20:56 2012	(r19109)
+++ dists/sid/linux-tools/debian/changelog	Sat Jun  9 19:23:17 2012	(r19110)
@@ -1,3 +1,9 @@
+linux-tools (3.2.7-3) UNRELEASED; urgency=low
+
+  * Fix version insertion in perf man pages
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Sat, 09 Jun 2012 19:56:44 +0100
+
 linux-tools (3.2.7-2) unstable; urgency=high
 
   * Apply upstream changes to fix various buffer overflow bugs:

Modified: dists/sid/linux-tools/debian/patches/tools-perf-version.patch
==============================================================================
--- dists/sid/linux-tools/debian/patches/tools-perf-version.patch	Sat Jun  9 19:20:56 2012	(r19109)
+++ dists/sid/linux-tools/debian/patches/tools-perf-version.patch	Sat Jun  9 19:23:17 2012	(r19110)
@@ -29,7 +29,7 @@
 +
 +install-man-perf.1: perf.1
 +	$(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)
-+	sed -e 's/"perf"/"perf_$(VERSION)"/' -e 's/fBperf-/fBperf_$(VERSION-)/g' $^ > $(DESTDIR)$(man1dir)/perf_$(VERSION).1
++	sed -e 's/"PERF"/"PERF_$(VERSION)"/' -e 's/fBperf-/fBperf_$(VERSION)-/g' $^ > $(DESTDIR)$(man1dir)/perf_$(VERSION).1
 +
 +install-man-perf%.1: perf%.1
  	$(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)
@@ -38,7 +38,7 @@
 -	$(INSTALL) -m 644 $(DOC_MAN1) $(DESTDIR)$(man1dir)
 -#	$(INSTALL) -m 644 $(DOC_MAN5) $(DESTDIR)$(man5dir)
 -#	$(INSTALL) -m 644 $(DOC_MAN7) $(DESTDIR)$(man7dir)
-+	sed -e 's/"perf-/"perf_$(VERSION)-/' -e 's/fBperf-/fBperf_$(VERSION-)/g' $^ > $(DESTDIR)$(man1dir)/perf_$(VERSION)$*.1
++	sed -e 's/"PERF\\-/"PERF_$(VERSION)\\-/' -e 's/fBperf-/fBperf_$(VERSION)-/g' $^ > $(DESTDIR)$(man1dir)/perf_$(VERSION)$*.1
  
  install-info: info
  	$(INSTALL) -d -m 755 $(DESTDIR)$(infodir)