[kernel] r19106 - in dists/trunk/linux-tools/debian: . patches templates

[Ben Hutchings]

Author: benh
Date: Sat Jun  9 18:54:23 2012
New Revision: 19106

Log:
Update to 3.4

Build-Depend on bison and flex, now required to build perf.
Update tools-perf-version.patch for changes in man page output paths.

Modified:
   dists/trunk/linux-tools/debian/changelog
   dists/trunk/linux-tools/debian/patches/tools-perf-version.patch
   dists/trunk/linux-tools/debian/templates/control.source.in

Modified: dists/trunk/linux-tools/debian/changelog
==============================================================================
--- dists/trunk/linux-tools/debian/changelog	Sat Jun  9 18:39:12 2012	(r19105)
+++ dists/trunk/linux-tools/debian/changelog	Sat Jun  9 18:54:23 2012	(r19106)
@@ -1,3 +1,10 @@
+linux-tools (3.4-1~experimental.1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * Build-Depend on bison and flex, now required to build perf
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Sat, 09 Jun 2012 19:13:54 +0100
+
 linux-tools (3.3-1~experimental.1) experimental; urgency=low
 
   * New upstream release candidate

Modified: dists/trunk/linux-tools/debian/patches/tools-perf-version.patch
==============================================================================
--- dists/trunk/linux-tools/debian/patches/tools-perf-version.patch	Sat Jun  9 18:39:12 2012	(r19105)
+++ dists/trunk/linux-tools/debian/patches/tools-perf-version.patch	Sat Jun  9 18:54:23 2012	(r19106)
@@ -1,6 +1,6 @@
 --- a/tools/perf/Makefile
 +++ b/tools/perf/Makefile
-@@ -859,7 +859,7 @@
+@@ -939,7 +939,7 @@
  
  install: all
  	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
@@ -9,7 +9,7 @@
  	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/Perf-Trace-Util/lib/Perf/Trace'
  	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/bin'
  	$(INSTALL) $(OUTPUT)perf-archive -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)'
-@@ -879,7 +879,7 @@
+@@ -959,7 +959,7 @@
  	$(MAKE) -C Documentation install
  
  install-man:
@@ -20,18 +20,18 @@
  	$(MAKE) -C Documentation install-html
 --- a/tools/perf/Documentation/Makefile
 +++ b/tools/perf/Documentation/Makefile
-@@ -156,13 +156,15 @@
+@@ -170,13 +170,15 @@
  
  install: install-man
  
 -install-man: man
-+install-man: $(addprefix install-man-,$(DOC_MAN1))
++install-man: $(addprefix install-man-,$(_DOC_MAN1))
 +
-+install-man-perf.1: perf.1
++install-man-perf.1: $(OUTPUT)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
 +
-+install-man-perf%.1: perf%.1
++install-man-perf%.1: $(OUTPUT)perf%.1
  	$(INSTALL) -d -m 755 $(DESTDIR)$(man1dir)
 -#	$(INSTALL) -d -m 755 $(DESTDIR)$(man5dir)
 -#	$(INSTALL) -d -m 755 $(DESTDIR)$(man7dir)

Modified: dists/trunk/linux-tools/debian/templates/control.source.in
==============================================================================
--- dists/trunk/linux-tools/debian/templates/control.source.in	Sat Jun  9 18:39:12 2012	(r19105)
+++ dists/trunk/linux-tools/debian/templates/control.source.in	Sat Jun  9 18:54:23 2012	(r19106)
@@ -6,6 +6,6 @@
 Standards-Version: 3.9.2
 Build-Depends:
  debhelper (>> 7), python,
- asciidoc, binutils-dev, libdw-dev, libelf-dev, libnewt-dev, libperl-dev, python-dev, xmlto
+ asciidoc, binutils-dev, bison, flex, libdw-dev, libelf-dev, libnewt-dev, libperl-dev, python-dev, xmlto
 Vcs-Svn: svn://svn.debian.org/svn/kernel/dists/trunk/linux-tools/
 Vcs-Browser: http://anonscm.debian.org/viewvc/kernel/dists/trunk/linux-tools/