=== Annotated debdiff. --- usbip-0.1.7/debian/changelog 2011-11-30 15:19:03.000000000 -0500 +++ usbip-3.0.0-14.23/debian/changelog 2011-11-30 15:19:03.000000000 -0500 @@ -1,3 +1,10 @@ +usbip (3.0.0-14.23-1) oneiric; urgency=low + + * New upstream release (LP: #898003) + * Standards bumped to 3.9.2 + + -- Nathan Summers Wed, 30 Nov 2011 00:18:23 -0500 + usbip (0.1.7-3) unstable; urgency=low * Install new manpages === Changed upstream packaging information to have XSBC-Original- prefix === Updated description --- usbip-0.1.7/debian/control 2011-11-30 15:19:03.000000000 -0500 +++ usbip-3.0.0-14.23/debian/control 2011-11-30 15:19:03.000000000 -0500 @@ -1,12 +1,13 @@ Source: usbip Section: admin Priority: optional -Maintainer: Max Vozeler +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Max Vozeler Build-Depends: debhelper (>= 7), autoconf, automake, libtool, libglib2.0-dev, libsysfs-dev -Standards-Version: 3.8.0 +Standards-Version: 3.9.2 Homepage: http://usbip.sourceforge.net/ -Vcs-Browser: http://git.debian.org/?p=users/xam/usbip.git -Vcs-Git: git://git.debian.org/~xam/usbip.git +XS-Original-Vcs-Browser: http://git.debian.org/?p=users/xam/usbip.git +XS-Original-Vcs-Git: git://git.debian.org/~xam/usbip.git Package: usbip Architecture: any @@ -24,10 +25,11 @@ directly attached. . Currently USB/IP provides no access control or encryption. - It should only be used in trusted environments. + It should only be used in trusted environments, with proper + firewall rules in place. . - USB/IP requires kernel support which is included in Linux - kernels 2.6.28 or newer. + USB/IP requires kernel support which is provided in the + 'usbip-source' package. . This package provides the server component 'usbipd' and the client tool 'usbip'. @@ -54,6 +56,7 @@ Package: usbip-source Architecture: all Recommends: usbip +Section: kernel Depends: ${misc:Depends}, module-assistant, debhelper (>= 5), make, bzip2 Description: USB device sharing system over IP network (kernel module source) USB/IP is a system for sharing USB devices over the network. === debian/headers/* is no longer necessary --- usbip-0.1.7/debian/copyright 2011-11-30 15:19:03.000000000 -0500 +++ usbip-3.0.0-14.23/debian/copyright 2011-11-30 15:19:03.000000000 -0500 @@ -7,10 +7,6 @@ Copyright: - - debian/headers/*: - hcd.h and hub.h are from linux source (2.6.26) - Copyright (c) 2001-2002 by David Brownell - - USB/IP: Copyright (C) 2003-2008 Takahiro Hirofuchi Copyright (C) 1999, 2000 Thomas Sailer (sailer@ife.ee.ethz.ch) === No longer is there a toplevel README. --- usbip-0.1.7/debian/docs 2011-11-30 15:19:03.000000000 -0500 +++ usbip-3.0.0-14.23/debian/docs 2011-11-30 15:19:03.000000000 -0500 @@ -1,2 +1 @@ -README -src/README +userspace/README --- usbip-0.1.7/debian/libusbip-dev.install 2011-11-30 15:19:03.000000000 -0500 +++ usbip-3.0.0-14.23/debian/libusbip-dev.install 2011-11-30 15:19:03.000000000 -0500 @@ -1,4 +1,3 @@ usr/lib/libusbip.so -usr/lib/libusbip.la usr/lib/libusbip.a usr/include/usbip/* --- usbip-0.1.7/debian/modules/control 2011-11-30 15:19:03.000000000 -0500 +++ usbip-3.0.0-14.23/debian/modules/control 2011-11-30 15:19:03.000000000 -0500 @@ -1,9 +1,10 @@ Source: usbip Section: admin Priority: optional -Maintainer: Max Vozeler +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Max Vozeler Build-Depends: debhelper (>= 7) Standards-Version: 3.8.0 Homepage: http://usbip.sourceforge.net/ -Vcs-Browser: http://git.debian.org/?p=users/xam/usbip.git -Vcs-Git: git://git.debian.org/~xam/usbip.git +XSBC-Original-Vcs-Browser: http://git.debian.org/?p=users/xam/usbip.git +XSBC-Original-Vcs-Git: git://git.debian.org/~xam/usbip.git === Adapted to new module names and to use kbuild for make. --- usbip-0.1.7/debian/modules/rules 2011-11-30 15:19:03.000000000 -0500 +++ usbip-3.0.0-14.23/debian/modules/rules 2011-11-30 15:19:03.000000000 -0500 @@ -18,15 +18,15 @@ dh_clean # Build the module - cd src && $(MAKE) KSOURCE=$(KSRC) HCD_HEADER=$(CURDIR)/src/headers/hcd.h KBUILD_VERBOSE=0 + $(MAKE) -C /lib/modules/$(KVERS)/build M=$(PWD)/src CONFIG_USBIP_HOST=m CONFIG_USBIP_VHCI_HCD=m CONFIG_USBIP_CORE=m modules - # Install the modules ( usbip_common_mod.ko, vhci-hcd.ko and usbip.ko) + # Install the modules ( usbip-core.ko, vhci-hcd.ko and usbip-host.ko) install -d $(CURDIR)/debian/$(PACKAGE)-$(KVERS)/lib/modules/$(KVERS)/updates/usbip - install -m 0644 src/usbip_common_mod.ko debian/$(PACKAGE)-$(KVERS)/lib/modules/$(KVERS)/updates/usbip/ - install -m 0644 src/vhci-hcd.ko debian/$(PACKAGE)-$(KVERS)/lib/modules/$(KVERS)/updates/usbip/ - install -m 0644 src/usbip.ko debian/$(PACKAGE)-$(KVERS)/lib/modules/$(KVERS)/updates/usbip/ + install -m 0644 src/usbip-core.ko debian/$(PACKAGE)-$(KVERS)/lib/modules/$(KVERS)/updates/usbip/ + install -m 0644 src/vhci-hcd.ko debian/$(PACKAGE)-$(KVERS)/lib/modules/$(KVERS)/updates/usbip/ + install -m 0644 src/usbip-host.ko debian/$(PACKAGE)-$(KVERS)/lib/modules/$(KVERS)/updates/usbip/ - dh_installdocs src/README + dh_installdocs dh_installchangelogs dh_compress dh_fixperms @@ -40,7 +40,7 @@ clean: dh_testdir dh_testroot - cd src && make clean KSOURCE=$(KSRC) + make clean -C /lib/modules/$(KVERS)/build M=$(PWD)/src dh_clean .PHONY: kdist_configure binary-modules kdist_clean clean === Adapted to new source layout --- usbip-0.1.7/debian/rules 2011-11-30 15:19:03.000000000 -0500 +++ usbip-3.0.0-14.23/debian/rules 2011-11-30 15:19:03.000000000 -0500 @@ -14,36 +14,35 @@ build: build-stamp build-stamp: - dh build --before configure - cd src && ./autogen.sh - cd src && ./configure \ + cd userspace && ./autogen.sh + cd userspace && ./configure \ $(confflags) \ --prefix=/usr \ + --includedir=/usr/include \ --with-tcp-wrappers=no \ --with-usbids-dir=/usr/share/misc \ --enable-usbids-install=no - cd src && make - dh build --after configure + cd userspace && make touch build-stamp clean: - -cd src && make maintainer-clean - cd src && rm -f configure config.sub config.guess missing install-sh depcomp + -cd userspace && make maintainer-clean + cd userspace && rm -f configure config.sub config.guess missing install-sh depcomp Makefile.in aclocal.m4 config.h.in libsrc/Makefile.in ltmain.sh src/Makefile.in dh clean install: build install-stamp install-stamp: - dh install --before dh_install - cd src && make install DESTDIR=$(CURDIR)/debian/tmp + dh install --after dh_auto_test --before dh_install + cd userspace && make install DESTDIR=$(CURDIR)/debian/tmp # Create usbip-source dh_installdirs -p$(modsrcpkg) usr/src/modules/$(modname)/debian dh_installdirs -p$(modsrcpkg) usr/src/modules/$(modname)/src - cp -ra drivers/head/* drivers/README debian/headers \ + cp -ra *.[ch] Kconfig Makefile README \ $(CURDIR)/debian/$(modsrcpkg)/usr/src/modules/$(modname)/src/ - cp debian/modules/* debian/changelog debian/copyright debian/compat \ + cp debian/modules/* debian/changelog debian/copyright debian/compat debian/NEWS \ $(CURDIR)/debian/$(modsrcpkg)/usr/src/modules/$(modname)/debian/ dh_fixperms -p$(modsrcpkg) @@ -51,7 +50,7 @@ cd debian/$(modsrcpkg)/usr/src && tar -f- -c modules | bzip2 -9 > $(modname).tar.bz2 && rm -rf modules - dh install --remaining + dh install --remaining --after dh_auto_test touch install-stamp binary-arch: install --- usbip-0.1.7/debian/usbip.manpages 2011-11-30 15:19:03.000000000 -0500 +++ usbip-3.0.0-14.23/debian/usbip.manpages 2011-11-30 15:19:03.000000000 -0500 @@ -1,3 +1,3 @@ -src/cmd/usbip.8 -src/cmd/usbipd.8 -src/cmd/usbip_bind_driver.8 +userspace/doc/usbip.8 +userspace/doc/usbipd.8 +userspace/doc/usbip_bind_driver.8 === Hack to get the watch file to say whenever the source has been changed. === (Should only be triggered by changes to usbip itself). --- usbip-0.1.7/debian/watch 2011-11-30 15:19:03.000000000 -0500 +++ usbip-3.0.0-14.23/debian/watch 2011-11-30 15:19:03.000000000 -0500 @@ -1,2 +1,2 @@ version=3 -http://sf.net/usbip/usbip-(\d+\.\d+\.\d+)\.tar\.gz +opts=uversionmangle=s/.*/1-\\0/;s/1-cbc43de05281c6a2cebd0ab8ab9750c078b60a52/0-cbc43de05281c6a2cebd0ab8ab9750c078b60a52/,filenamemangle=s/.*h=(.*).sf=tgz/usbip-snapshot-\\1.tgz/ http://kernel.ubuntu.com/git?p=ubuntu/ubuntu-oneiric.git;a=tree;f=drivers/staging/usbip;hb=HEAD /git\?p=ubuntu/ubuntu-oneiric.git;a=snapshot;h=(.*);sf=tgz 0-cbc43de05281c6a2cebd0ab8ab9750c078b60a52