diff -Nru linux-tools-3.18.5/debian/changelog linux-tools-3.18-3.18.5/debian/changelog --- linux-tools-3.18.5/debian/changelog 2015-02-01 01:53:09.000000000 +0000 +++ linux-tools-3.18-3.18.5/debian/changelog 2015-02-16 03:17:58.000000000 +0000 @@ -1,3 +1,18 @@ +linux-tools-3.18 (3.18.5-1~exp1+rpi1+jessie1) jessie-staging; urgency=medium + + * Rebuild for jessie + + -- Peter Michael Green Mon, 16 Feb 2015 03:17:38 +0000 + +linux-tools-3.18 (3.18.5-1~exp1+rpi1) wheezy-staging; urgency=low + + * Rename source package to allow coexistance with other versions. + * Remove usbip binary packages since their names don't contain the kernel + version. + * Disable libunwind as it's inconsistent between wheezy and jessie. + + -- Peter Michael Green Fri, 13 Feb 2015 23:15:16 +0000 + linux-tools (3.18.5-1~exp1) experimental; urgency=medium * New upstream release diff -Nru linux-tools-3.18.5/debian/control linux-tools-3.18-3.18.5/debian/control --- linux-tools-3.18.5/debian/control 2015-02-01 01:53:58.000000000 +0000 +++ linux-tools-3.18-3.18.5/debian/control 2015-02-16 03:58:53.000000000 +0000 @@ -1,10 +1,10 @@ -Source: linux-tools +Source: linux-tools-3.18 Section: kernel Priority: optional 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, libc-bin, libdw-dev, libelf-dev, libiberty-dev | binutils-dev (<< 2.23.91.20131123-1), libnewt-dev, libnuma-dev [amd64 arm64 hppa i386 mips mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el sparc x32], libperl-dev, libunwind8-dev [amd64 armel armhf arm64 i386], python-dev, xmlto, autoconf, automake, libtool, libglib2.0-dev, libudev-dev, libwrap0-dev +Build-Depends: debhelper (>> 7), python, asciidoc, bison, flex, libaudit-dev, libc-bin, libdw-dev, libelf-dev, libiberty-dev | binutils-dev (<< 2.23.91.20131123-1), libnewt-dev, libnuma-dev [amd64 arm64 hppa i386 mips mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el sparc x32], libperl-dev, python-dev, xmlto, 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/ @@ -29,34 +29,3 @@ The linux-base package contains a 'perf' command which will invoke the appropriate version for the running kernel. -Package: libusbip-dev -Architecture: linux-any -Section: libdevel -Depends: ${misc:Depends} -Description: USB device sharing system over IP network (development files) - USB/IP is a system for sharing USB devices over the network. - . - This package provides headers for the libusbip library and the library - itself for static linking. - -Package: usbip -Architecture: linux-any -Section: admin -Depends: usbutils, ${shlibs:Depends}, ${misc:Depends} -Description: USB device sharing system over IP network - USB/IP is a system for sharing USB devices over the network. - . - To share USB devices between computers with their full functionality, - USB/IP encapsulates "USB requests" into IP packets and transmits them - between computers. - . - Original USB device drivers and applications can be used for remote USB - devices without any modification of them. A computer can use remote USB - devices as if they were directly attached. - . - Currently USB/IP provides no access control or encryption. It should only - be used in trusted environments. - . - This package provides the server component 'usbipd' and the client tool - 'usbip'. - diff -Nru linux-tools-3.18.5/debian/control.md5sum linux-tools-3.18-3.18.5/debian/control.md5sum --- linux-tools-3.18.5/debian/control.md5sum 2015-02-01 01:53:58.000000000 +0000 +++ linux-tools-3.18-3.18.5/debian/control.md5sum 2015-02-16 03:58:53.000000000 +0000 @@ -1,4 +1,4 @@ ac3acacf0cde6d2cc424f28241bb0857 debian/bin/gencontrol.py -d18da46087857e9d8c43c0c2873c3fe9 debian/changelog -711fd0ce9d080e6cf27efddb74863670 debian/templates/control.main.in -c31e09ee92964412134aac03296f8907 debian/templates/control.source.in +a4c31ed8009ab6b1aed4c886b2729599 debian/changelog +457af5f6c68bf155dbe8243de9c6abcb debian/templates/control.main.in +324578109e39f9851710846a6fcd96b8 debian/templates/control.source.in diff -Nru linux-tools-3.18.5/debian/rules.gen linux-tools-3.18-3.18.5/debian/rules.gen --- linux-tools-3.18.5/debian/rules.gen 2015-02-01 01:53:58.000000000 +0000 +++ linux-tools-3.18-3.18.5/debian/rules.gen 2015-02-16 03:58:53.000000000 +0000 @@ -1,5 +1,5 @@ .NOTPARALLEL: binary-arch:: - $(MAKE) -f debian/rules.real binary-arch UPSTREAMVERSION='3.18' VERSION='3.18' VERSION_DEBIAN='3.18.5-1~exp1' + $(MAKE) -f debian/rules.real binary-arch UPSTREAMVERSION='3.18' VERSION='3.18' VERSION_DEBIAN='3.18.5-1~exp1+rpi1+jessie1' build:: - $(MAKE) -f debian/rules.real build UPSTREAMVERSION='3.18' VERSION='3.18' VERSION_DEBIAN='3.18.5-1~exp1' + $(MAKE) -f debian/rules.real build UPSTREAMVERSION='3.18' VERSION='3.18' VERSION_DEBIAN='3.18.5-1~exp1+rpi1+jessie1' diff -Nru linux-tools-3.18.5/debian/rules.real linux-tools-3.18-3.18.5/debian/rules.real --- linux-tools-3.18.5/debian/rules.real 2015-02-01 00:53:48.000000000 +0000 +++ linux-tools-3.18-3.18.5/debian/rules.real 2015-02-13 23:17:37.000000000 +0000 @@ -8,7 +8,7 @@ # includes any binNMU part. VERSION_DEBIAN_FULL := $(shell dpkg-parsechangelog | sed -ne 's,^Version: *\(.*\)$$,\1,p') -binary-arch: install-kbuild install-usbip +binary-arch: install-kbuild ifneq ($(filter alpha amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64 x32,$(DEB_BUILD_ARCH)),) binary-arch: install-tools endif diff -Nru linux-tools-3.18.5/debian/templates/control.main.in linux-tools-3.18-3.18.5/debian/templates/control.main.in --- linux-tools-3.18.5/debian/templates/control.main.in 2015-01-31 23:36:41.000000000 +0000 +++ linux-tools-3.18-3.18.5/debian/templates/control.main.in 2015-02-13 23:15:48.000000000 +0000 @@ -18,34 +18,3 @@ The linux-base package contains a 'perf' command which will invoke the appropriate version for the running kernel. -Package: libusbip-dev -Architecture: linux-any -Depends: ${misc:Depends} -Section: libdevel -Description: USB device sharing system over IP network (development files) - USB/IP is a system for sharing USB devices over the network. - . - This package provides headers for the libusbip library and - the library itself for static linking. - -Package: usbip -Architecture: linux-any -Depends: usbutils, ${shlibs:Depends}, ${misc:Depends} -Section: admin -Description: USB device sharing system over IP network - USB/IP is a system for sharing USB devices over the network. - . - To share USB devices between computers with their full - functionality, USB/IP encapsulates "USB requests" into IP - packets and transmits them between computers. - . - Original USB device drivers and applications can be used - for remote USB devices without any modification of them. A - computer can use remote USB devices as if they were - directly attached. - . - Currently USB/IP provides no access control or encryption. - It should only be used in trusted environments. - . - This package provides the server component 'usbipd' and the - client tool 'usbip'. diff -Nru linux-tools-3.18.5/debian/templates/control.source.in linux-tools-3.18-3.18.5/debian/templates/control.source.in --- linux-tools-3.18.5/debian/templates/control.source.in 2015-01-31 23:42:26.000000000 +0000 +++ linux-tools-3.18-3.18.5/debian/templates/control.source.in 2015-02-13 23:32:23.000000000 +0000 @@ -1,4 +1,4 @@ -Source: linux-tools +Source: linux-tools-3.18 Section: kernel Priority: optional Maintainer: Debian Kernel Team @@ -6,7 +6,7 @@ Standards-Version: 3.9.4 Build-Depends: debhelper (>> 7), python, - asciidoc, bison, flex, libaudit-dev, libc-bin, libdw-dev, libelf-dev, libiberty-dev | binutils-dev (<< 2.23.91.20131123-1), libnewt-dev, libnuma-dev [amd64 arm64 hppa i386 mips mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el sparc x32], libperl-dev, libunwind8-dev [amd64 armel armhf arm64 i386], python-dev, xmlto, + asciidoc, bison, flex, libaudit-dev, libc-bin, libdw-dev, libelf-dev, libiberty-dev | binutils-dev (<< 2.23.91.20131123-1), libnewt-dev, libnuma-dev [amd64 arm64 hppa i386 mips mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el sparc x32], libperl-dev, python-dev, xmlto, 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/