diff -Nru linux-tools-3.10/debian/changelog linux-tools-3.10-3.10/debian/changelog --- linux-tools-3.10/debian/changelog 2013-08-30 11:44:57.000000000 +0000 +++ linux-tools-3.10-3.10/debian/changelog 2013-12-23 00:13:31.000000000 +0000 @@ -1,3 +1,11 @@ +linux-tools-3.10 (3.10-4+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. + + -- Peter Michael Green Sun, 22 Dec 2013 23:28:32 +0000 + linux-tools (3.10-4) unstable; urgency=low * Sourceful upload for the perl 5.18 transition diff -Nru linux-tools-3.10/debian/control linux-tools-3.10-3.10/debian/control --- linux-tools-3.10/debian/control 2013-08-30 11:46:45.000000000 +0000 +++ linux-tools-3.10-3.10/debian/control 2013-12-23 00:25:05.000000000 +0000 @@ -1,4 +1,4 @@ -Source: linux-tools +Source: linux-tools-3.10 Section: kernel Priority: optional Maintainer: Debian Kernel Team @@ -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.10/debian/control.md5sum linux-tools-3.10-3.10/debian/control.md5sum --- linux-tools-3.10/debian/control.md5sum 2013-08-30 11:46:45.000000000 +0000 +++ linux-tools-3.10-3.10/debian/control.md5sum 2013-12-23 00:25:05.000000000 +0000 @@ -1,4 +1,4 @@ ac3acacf0cde6d2cc424f28241bb0857 debian/bin/gencontrol.py -73334a6aa3a618ba80f6d2d0fa4f8957 debian/changelog -c21cd0e8c14bef92ff15b3b07848544a debian/templates/control.main.in -aa99cb335d8ac86e1f0466669849e6af debian/templates/control.source.in +3a529f64814bf0f6c1c4abd8df2aa138 debian/changelog +b1067c71ed8352671e2df3cb01abdfc0 debian/templates/control.main.in +3e83fa45a6634aadc4702f42eaaace06 debian/templates/control.source.in diff -Nru linux-tools-3.10/debian/libusbip-dev.substvars linux-tools-3.10-3.10/debian/libusbip-dev.substvars --- linux-tools-3.10/debian/libusbip-dev.substvars 1970-01-01 00:00:00.000000000 +0000 +++ linux-tools-3.10-3.10/debian/libusbip-dev.substvars 2013-12-22 23:53:55.000000000 +0000 @@ -0,0 +1 @@ +misc:Depends= diff -Nru linux-tools-3.10/debian/rules.gen linux-tools-3.10-3.10/debian/rules.gen --- linux-tools-3.10/debian/rules.gen 2013-08-30 11:46:45.000000000 +0000 +++ linux-tools-3.10-3.10/debian/rules.gen 2013-12-23 00:25:05.000000000 +0000 @@ -1,5 +1,5 @@ .NOTPARALLEL: binary-arch:: - $(MAKE) -f debian/rules.real binary-arch UPSTREAMVERSION='3.10' VERSION='3.10' VERSION_DEBIAN='3.10-4' + $(MAKE) -f debian/rules.real binary-arch UPSTREAMVERSION='3.10' VERSION='3.10' VERSION_DEBIAN='3.10-4+rpi1' build:: - $(MAKE) -f debian/rules.real build UPSTREAMVERSION='3.10' VERSION='3.10' VERSION_DEBIAN='3.10-4' + $(MAKE) -f debian/rules.real build UPSTREAMVERSION='3.10' VERSION='3.10' VERSION_DEBIAN='3.10-4+rpi1' diff -Nru linux-tools-3.10/debian/rules.real linux-tools-3.10-3.10/debian/rules.real --- linux-tools-3.10/debian/rules.real 2013-08-30 11:44:31.000000000 +0000 +++ linux-tools-3.10-3.10/debian/rules.real 2013-12-23 00:13:11.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 armel armhf hppa i386 powerpc ppc64 s390 s390x sh4 sparc sparc64,$(DEB_BUILD_ARCH)),) binary-arch: install-tools endif diff -Nru linux-tools-3.10/debian/templates/control.main.in linux-tools-3.10-3.10/debian/templates/control.main.in --- linux-tools-3.10/debian/templates/control.main.in 2013-07-16 04:50:09.000000000 +0000 +++ linux-tools-3.10-3.10/debian/templates/control.main.in 2013-12-23 00:01:47.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.10/debian/templates/control.source.in linux-tools-3.10-3.10/debian/templates/control.source.in --- linux-tools-3.10/debian/templates/control.source.in 2013-07-16 04:50:09.000000000 +0000 +++ linux-tools-3.10-3.10/debian/templates/control.source.in 2013-12-23 00:01:31.000000000 +0000 @@ -1,4 +1,4 @@ -Source: linux-tools +Source: linux-tools-3.10 Section: kernel Priority: optional Maintainer: Debian Kernel Team diff -Nru linux-tools-3.10/debian/usbip.substvars linux-tools-3.10-3.10/debian/usbip.substvars --- linux-tools-3.10/debian/usbip.substvars 1970-01-01 00:00:00.000000000 +0000 +++ linux-tools-3.10-3.10/debian/usbip.substvars 2013-12-22 23:53:55.000000000 +0000 @@ -0,0 +1,2 @@ +shlibs:Depends=libc6 (>= 2.13-28), libsysfs2, libwrap0 (>= 7.6-4~) +misc:Depends=