diffstat for linux-tools-3.12.6 linux-tools-3.12.6 changelog | 15 ++++++++++++++- control | 2 +- control.md5sum | 4 ++-- rules.gen | 4 ++-- templates/control.source.in | 2 +- 5 files changed, 20 insertions(+), 7 deletions(-) diff -Nru linux-tools-3.12.6/debian/changelog linux-tools-3.12.6/debian/changelog --- linux-tools-3.12.6/debian/changelog 2013-12-25 11:42:10.000000000 +0000 +++ linux-tools-3.12.6/debian/changelog 2014-01-11 15:49:11.000000000 +0000 @@ -1,3 +1,10 @@ +linux-tools (3.12.6-1tanglu1) staging; urgency=low + + * Merge with Debian unstable, remaining change: + - Build-depend on libunwind8-dev + + -- Matthias Klumpp Sat, 11 Jan 2014 16:48:38 +0100 + linux-tools (3.12.6-1) unstable; urgency=medium * New upstream stable update @@ -18,6 +25,12 @@ -- Ben Hutchings Mon, 18 Nov 2013 05:14:34 +0000 +linux-tools (3.11-3tanglu1) staging; urgency=low + + * Build-depend on libunwind8-dev + + -- Matthias Klumpp Mon, 11 Nov 2013 13:44:54 +0100 + linux-tools (3.11-3) unstable; urgency=low * linux-tools: Replace build-dependency on libunwind8-dev with @@ -352,7 +365,7 @@ linux-kbuild-2.6 (2.6.29-1) unstable; urgency=low - * New upstream version. + * New upstream version. * Autogenerate list of supported options in modpost. (closes: #518961) - Build-depend against python. * Use debhelper compat level 7. diff -Nru linux-tools-3.12.6/debian/control linux-tools-3.12.6/debian/control --- linux-tools-3.12.6/debian/control 2013-12-25 11:43:41.000000000 +0000 +++ linux-tools-3.12.6/debian/control 2014-01-11 15:50:35.000000000 +0000 @@ -4,7 +4,7 @@ Maintainer: Debian Kernel Team Uploaders: Bastian Blank , Ben Hutchings , Jonathan Nieder 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, autoconf, automake, libtool, libglib2.0-dev, libsysfs-dev, libwrap0-dev +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, libunwind8-dev [amd64 i386], 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/ diff -Nru linux-tools-3.12.6/debian/control.md5sum linux-tools-3.12.6/debian/control.md5sum --- linux-tools-3.12.6/debian/control.md5sum 2013-12-25 11:43:41.000000000 +0000 +++ linux-tools-3.12.6/debian/control.md5sum 2014-01-11 15:50:35.000000000 +0000 @@ -1,4 +1,4 @@ ac3acacf0cde6d2cc424f28241bb0857 debian/bin/gencontrol.py -780cf168b2f02a90c15cd54ad6d71e02 debian/changelog +17204a9f368261c74c5165fcef953488 debian/changelog c21cd0e8c14bef92ff15b3b07848544a debian/templates/control.main.in -6d80e8870f4d031823142b0e25d186d9 debian/templates/control.source.in +b4588c2002000a9c31b8c85ef2bd02a9 debian/templates/control.source.in diff -Nru linux-tools-3.12.6/debian/rules.gen linux-tools-3.12.6/debian/rules.gen --- linux-tools-3.12.6/debian/rules.gen 2013-12-25 11:43:41.000000000 +0000 +++ linux-tools-3.12.6/debian/rules.gen 2014-01-11 15:50:35.000000000 +0000 @@ -1,5 +1,5 @@ .NOTPARALLEL: binary-arch:: - $(MAKE) -f debian/rules.real binary-arch UPSTREAMVERSION='3.12' VERSION='3.12' VERSION_DEBIAN='3.12.6-1' + $(MAKE) -f debian/rules.real binary-arch UPSTREAMVERSION='3.12' VERSION='3.12' VERSION_DEBIAN='3.12.6-1tanglu1' build:: - $(MAKE) -f debian/rules.real build UPSTREAMVERSION='3.12' VERSION='3.12' VERSION_DEBIAN='3.12.6-1' + $(MAKE) -f debian/rules.real build UPSTREAMVERSION='3.12' VERSION='3.12' VERSION_DEBIAN='3.12.6-1tanglu1' diff -Nru linux-tools-3.12.6/debian/templates/control.source.in linux-tools-3.12.6/debian/templates/control.source.in --- linux-tools-3.12.6/debian/templates/control.source.in 2013-12-25 11:37:48.000000000 +0000 +++ linux-tools-3.12.6/debian/templates/control.source.in 2014-01-11 15:50:21.000000000 +0000 @@ -6,7 +6,7 @@ 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 i386], 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/