debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

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.

svn path=/dists/trunk/linux-tools/; revision=19106
This commit is contained in:
Ben Hutchings 2012-06-09 18:54:23 +00:00
parent 75c7c014a8
commit 7e4d726be6
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -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@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

12
debian/patches/tools-perf-version.patch vendored
View File

@ -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)

2
debian/templates/control.source.in vendored
View File

@ -6,6 +6,6 @@ Uploaders: Bastian Blank <waldi@debian.org>, Ben Hutchings <ben@decadent.org.uk>
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/