From 763ecd85fddf7c1dedafe27f8c3dcff0005b2ad5 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Wed, 25 Dec 2013 11:41:18 +0000 Subject: [PATCH 1/5] Update to 3.12.6 svn path=/dists/sid/linux-tools/; revision=20916 --- debian/changelog | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index cc7fac18e..8c251581b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,10 @@ -linux-tools (3.12-1~exp2) UNRELEASED; urgency=low +linux-tools (3.12.6-1) UNRELEASED; urgency=low + * 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) From e350788233c3940aa2d355964f41b1e43d34e390 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Wed, 25 Dec 2013 12:39:13 +0000 Subject: [PATCH 2/5] Prepare to release linux-tools (3.12.6-1). svn path=/dists/sid/linux-tools/; revision=20917 --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8c251581b..c43c2b574 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -linux-tools (3.12.6-1) UNRELEASED; urgency=low +linux-tools (3.12.6-1) unstable; urgency=medium * New upstream stable update - perf tools: Remove cast of non-variadic function to variadic @@ -8,6 +8,7 @@ linux-tools (3.12.6-1) UNRELEASED; urgency=low * linux-tools: Replace build-dependency on binutils-dev with libiberty-dev (or old binutils-dev, for ease of backporting) (Closes: #730883) + * Upload to unstable (Closes: #733076) -- Ben Hutchings Sat, 30 Nov 2013 23:48:32 +0000 From 257b73a0b69feae5ac419b43e0c438fe68905963 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 7 Jan 2014 14:39:50 +0000 Subject: [PATCH 3/5] Remove changelog line for 3.12.6-1 that is not present in the uploaded package svn path=/dists/sid/linux-tools/; revision=20962 --- debian/changelog | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c43c2b574..9b10afb4e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,7 +8,6 @@ linux-tools (3.12.6-1) unstable; urgency=medium * linux-tools: Replace build-dependency on binutils-dev with libiberty-dev (or old binutils-dev, for ease of backporting) (Closes: #730883) - * Upload to unstable (Closes: #733076) -- Ben Hutchings Sat, 30 Nov 2013 23:48:32 +0000 From 2fa2de4959dd5bc20f921e8e5959623e8ff1c530 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 2 Feb 2014 10:52:19 +0000 Subject: [PATCH 4/5] linux-tools: Replace build-dependency on libunwind7-dev with libunwind8-dev svn path=/dists/sid/linux-tools/; revision=21015 --- debian/build/tools/perf/Makefile | 6 ------ debian/changelog | 7 +++++++ debian/templates/control.source.in | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/debian/build/tools/perf/Makefile b/debian/build/tools/perf/Makefile index 50abf0961..45d8d2266 100644 --- a/debian/build/tools/perf/Makefile +++ b/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: diff --git a/debian/changelog b/debian/changelog index 9b10afb4e..eb07d8af7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +linux-tools (3.12.6-2) UNRELEASED; urgency=low + + * linux-tools: Replace build-dependency on libunwind7-dev with + libunwind8-dev + + -- Ben Hutchings Sun, 02 Feb 2014 11:51:18 +0100 + linux-tools (3.12.6-1) unstable; urgency=medium * New upstream stable update diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in index f995fdedb..c6ead8cdb 100644 --- a/debian/templates/control.source.in +++ b/debian/templates/control.source.in @@ -6,7 +6,7 @@ Uploaders: Bastian Blank , Ben Hutchings 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/ From 8ec14f8b6da4d63dcec7be218b2bee7bfc36fdee Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 2 Feb 2014 10:52:47 +0000 Subject: [PATCH 5/5] Prepare to release linux-tools (3.12.6-2). svn path=/dists/sid/linux-tools/; revision=21016 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index eb07d8af7..c4f1336a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -linux-tools (3.12.6-2) UNRELEASED; urgency=low +linux-tools (3.12.6-2) unstable; urgency=medium * linux-tools: Replace build-dependency on libunwind7-dev with libunwind8-dev