Merge changes from sid up to 3.12.6-2

svn path=/dists/trunk/linux-tools/; revision=21018

debian/build/tools/perf/Makefile

@@ -4,20 +4,16 @@ include ../../Makefile.inc
 
 DEB_HOST_ARCH_CPU := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 
-NO_LIBUNWIND = 1
-
 ifeq ($(DEB_HOST_ARCH_CPU),alpha)
   KERNEL_ARCH_PERF = alpha
 else ifeq ($(DEB_HOST_ARCH_CPU),amd64)
   KERNEL_ARCH_PERF = x86_64
-  NO_LIBUNWIND =
 else ifeq ($(DEB_HOST_ARCH_CPU),arm)
   KERNEL_ARCH_PERF = arm
 else ifeq ($(DEB_HOST_ARCH_CPU),hppa)
   KERNEL_ARCH_PERF = parisc
 else ifeq ($(DEB_HOST_ARCH_CPU),i386)
   KERNEL_ARCH_PERF = i386
-  NO_LIBUNWIND =
 else ifeq ($(DEB_HOST_ARCH_CPU),powerpc)
   KERNEL_ARCH_PERF = powerpc
 else ifeq ($(DEB_HOST_ARCH_CPU),powerpc64)
@@ -35,8 +31,6 @@ else ifeq ($(DEB_HOST_ARCH_CPU),sparc64)
 endif
 
 # disable Gtk UI until it's more usable
-# disable libunwind on architectures lacking libunwind7-dev, just in case
-# libunwind8-dev is installed
 MAKE_PERF := $(MAKE) prefix=/usr perfexecdir=share/perf_$(VERSION)-core NO_GTK2=1 NO_PERL=1 V=2 HAVE_CPLUS_DEMANGLE=1 ARCH=$(KERNEL_ARCH_PERF) EXTRA_WARNINGS=-Wno-error NO_LIBUNWIND=$(NO_LIBUNWIND)
 
 all:

debian/changelog

@@ -1,6 +1,23 @@
 linux-tools (3.13-1~exp1) UNRELEASED; urgency=low
 
   * New upstream release
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Sun, 02 Feb 2014 12:02:29 +0100
+
+linux-tools (3.12.6-2) unstable; urgency=medium
+
+  * linux-tools: Replace build-dependency on libunwind7-dev with
+    libunwind8-dev
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Sun, 02 Feb 2014 11:51:18 +0100
+
+linux-tools (3.12.6-1) unstable; urgency=medium
+
+  * New upstream stable update
+    - perf tools: Remove cast of non-variadic function to variadic
+    - perf tools: Synthesize anon MMAP records again
+
+  [ Ben Hutchings ]
   * linux-tools: Replace build-dependency on binutils-dev with
     libiberty-dev (or old binutils-dev, for ease of backporting)
     (Closes: #730883)

debian/templates/control.source.in

@@ -6,7 +6,7 @@ Uploaders: Bastian Blank <waldi@debian.org>, Ben Hutchings <ben@decadent.org.uk>
 Standards-Version: 3.9.4
 Build-Depends:
  debhelper (>> 7), python,
- asciidoc, bison, flex, libaudit-dev, libdw-dev, libelf-dev, libiberty-dev | binutils-dev (<< 2.23.91.20131123-1), libnewt-dev, libnuma-dev [amd64 i386 powerpc ppc64], libperl-dev, libunwind7-dev [amd64 i386], python-dev, xmlto,
+ asciidoc, bison, flex, libaudit-dev, libdw-dev, libelf-dev, libiberty-dev | binutils-dev (<< 2.23.91.20131123-1), libnewt-dev, libnuma-dev [amd64 i386 powerpc ppc64], libperl-dev, libunwind8-dev [amd64 armel armhf i386 mips powerpc ppc64], python-dev, xmlto,
  autoconf, automake, libtool, libglib2.0-dev, libsysfs-dev, libwrap0-dev
 Vcs-Svn: svn://svn.debian.org/svn/kernel/dists/trunk/linux-tools/
 Vcs-Browser: http://anonscm.debian.org/viewvc/kernel/dists/trunk/linux-tools/