From 41b28afb6c46d119dfc1295007bbd3db93cb27fc Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 29 Jul 2014 17:49:10 +0000 Subject: [PATCH] Update to 3.16-rc7 - genorig: Include new directory for usbip UAPI header - debian/control: Update Build-Depends for usbip switching from libsysfs to libudev svn path=/dists/trunk/linux-tools/; revision=21641 --- debian/bin/genorig.py | 1 + debian/changelog | 11 +++++++++++ debian/templates/control.source.in | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/debian/bin/genorig.py b/debian/bin/genorig.py index cf008a6ec371..668e82760a36 100755 --- a/debian/bin/genorig.py +++ b/debian/bin/genorig.py @@ -144,6 +144,7 @@ class Main(object): 'arch/*/Makefile', 'arch/x86/lib/memcpy_64.S', 'arch/x86/lib/memset_64.S', + 'drivers/staging/usbip/uapi/', 'drivers/staging/usbip/userspace/', 'include/', 'lib/rbtree.c', diff --git a/debian/changelog b/debian/changelog index 48c1f884ed54..78c4bc0af53c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +linux-tools (3.16~rc7-1) UNRELEASED; urgency=medium + + * New upstream release candidate + + [ Ben Hutchings ] + * genorig: Include new directory for usbip UAPI header + * debian/control: Update Build-Depends for usbip switching from + libsysfs to libudev + + -- Ben Hutchings Tue, 29 Jul 2014 18:08:55 +0100 + linux-tools (3.14-1) unstable; urgency=medium * New upstream release diff --git a/debian/templates/control.source.in b/debian/templates/control.source.in index fdfa64c3c8e7..f11555c6b35a 100644 --- a/debian/templates/control.source.in +++ b/debian/templates/control.source.in @@ -7,6 +7,6 @@ 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, libunwind8-dev [amd64 i386], python-dev, xmlto, - autoconf, automake, libtool, libglib2.0-dev, libsysfs-dev, libwrap0-dev + autoconf, automake, libtool, libglib2.0-dev, libudev-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/