diff -Nru linux-tools-4.4.6/debian/changelog linux-tools-4.4-4.4.6/debian/changelog --- linux-tools-4.4.6/debian/changelog 2016-03-20 19:08:47.000000000 +0000 +++ linux-tools-4.4-4.4.6/debian/changelog 2016-05-05 10:48:47.000000000 +0000 @@ -1,3 +1,12 @@ +linux-tools-4.4 (4.4.6-1+rpi1) jessie-staging; urgency=medium + + * Rename source package to allow coexistance with older version. + * Remove libusbip packages, they don't have the kernel version in their + version. + + + -- Peter Michael Green Tue, 03 May 2016 12:27:01 +0000 + linux-tools (4.4.6-1) unstable; urgency=medium * New upstream stable update: diff -Nru linux-tools-4.4.6/debian/control linux-tools-4.4-4.4.6/debian/control --- linux-tools-4.4.6/debian/control 2016-03-20 16:23:54.000000000 +0000 +++ linux-tools-4.4-4.4.6/debian/control 2016-05-05 10:52:23.000000000 +0000 @@ -1,4 +1,4 @@ -Source: linux-tools +Source: linux-tools-4.4 Section: kernel Priority: optional Maintainer: Debian Kernel Team @@ -61,37 +61,6 @@ 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'. - Package: hyperv-daemons Architecture: amd64 i386 x32 Section: admin diff -Nru linux-tools-4.4.6/debian/control.md5sum linux-tools-4.4-4.4.6/debian/control.md5sum --- linux-tools-4.4.6/debian/control.md5sum 2016-03-20 16:23:54.000000000 +0000 +++ linux-tools-4.4-4.4.6/debian/control.md5sum 2016-05-05 10:52:23.000000000 +0000 @@ -1,4 +1,4 @@ 6b218f0f29d10f14e9363b932596357a debian/bin/gencontrol.py -9050e8520e8add8b9c3fd644c87a422f debian/changelog -d26f682576a8e9074190de6d00116f7c debian/templates/control.main.in -9c139b7cbc64c1c481c9b0d393a00fad debian/templates/control.source.in +3e30034c6155ca6782c4dfbe1fc23a2b debian/changelog +116f102396cc1b04c46c151db2e0b8b2 debian/templates/control.main.in +9792b5c34641dc5e61a1299c692685bb debian/templates/control.source.in diff -Nru linux-tools-4.4.6/debian/rules.gen linux-tools-4.4-4.4.6/debian/rules.gen --- linux-tools-4.4.6/debian/rules.gen 2016-03-20 16:23:54.000000000 +0000 +++ linux-tools-4.4-4.4.6/debian/rules.gen 2016-05-05 10:52:23.000000000 +0000 @@ -1,9 +1,9 @@ .NOTPARALLEL: binary-arch:: - $(MAKE) -f debian/rules.real binary-arch UPSTREAMVERSION='4.4' VERSION='4.4' VERSION_DEBIAN='4.4.6-1' + $(MAKE) -f debian/rules.real binary-arch UPSTREAMVERSION='4.4' VERSION='4.4' VERSION_DEBIAN='4.4.6-1+rpi1' binary-indep:: - $(MAKE) -f debian/rules.real binary-indep UPSTREAMVERSION='4.4' VERSION='4.4' VERSION_DEBIAN='4.4.6-1' + $(MAKE) -f debian/rules.real binary-indep UPSTREAMVERSION='4.4' VERSION='4.4' VERSION_DEBIAN='4.4.6-1+rpi1' build-arch:: - $(MAKE) -f debian/rules.real build-arch UPSTREAMVERSION='4.4' VERSION='4.4' VERSION_DEBIAN='4.4.6-1' + $(MAKE) -f debian/rules.real build-arch UPSTREAMVERSION='4.4' VERSION='4.4' VERSION_DEBIAN='4.4.6-1+rpi1' build-indep:: - $(MAKE) -f debian/rules.real build-indep UPSTREAMVERSION='4.4' VERSION='4.4' VERSION_DEBIAN='4.4.6-1' + $(MAKE) -f debian/rules.real build-indep UPSTREAMVERSION='4.4' VERSION='4.4' VERSION_DEBIAN='4.4.6-1+rpi1' diff -Nru linux-tools-4.4.6/debian/rules.real linux-tools-4.4-4.4.6/debian/rules.real --- linux-tools-4.4.6/debian/rules.real 2016-03-20 19:08:47.000000000 +0000 +++ linux-tools-4.4-4.4.6/debian/rules.real 2016-05-05 10:50:45.000000000 +0000 @@ -3,7 +3,7 @@ include debian/rules.defs -binary-arch: install-kbuild install-usbip install-liblockdep install-cpupower +binary-arch: install-kbuild install-liblockdep install-cpupower ifneq ($(filter alpha amd64 arm64 armel armhf hppa i386 mips mips64 mips64el mipsel powerpc powerpcspe ppc64 ppc64el s390 s390x sh4 sparc sparc64,$(DEB_BUILD_ARCH)),) binary-arch: install-perf endif diff -Nru linux-tools-4.4.6/debian/templates/control.main.in linux-tools-4.4-4.4.6/debian/templates/control.main.in --- linux-tools-4.4.6/debian/templates/control.main.in 2016-03-20 16:04:38.000000000 +0000 +++ linux-tools-4.4-4.4.6/debian/templates/control.main.in 2016-05-05 10:49:29.000000000 +0000 @@ -50,38 +50,6 @@ 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'. - Package: hyperv-daemons Architecture: i386 amd64 x32 Depends: lsb-base (>= 3.2-14), ${shlibs:Depends}, ${misc:Depends} diff -Nru linux-tools-4.4.6/debian/templates/control.source.in linux-tools-4.4-4.4.6/debian/templates/control.source.in --- linux-tools-4.4.6/debian/templates/control.source.in 2016-03-20 16:05:49.000000000 +0000 +++ linux-tools-4.4-4.4.6/debian/templates/control.source.in 2016-05-03 12:28:00.000000000 +0000 @@ -1,4 +1,4 @@ -Source: linux-tools +Source: linux-tools-4.4 Section: kernel Priority: optional Maintainer: Debian Kernel Team