[linux] 12/18: usbip: Stop building broken libusbip-dev package

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch master
in repository linux.

commit cc91d0cfa297d13322d5148fde52f2e2c7371f16
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sun Oct 1 00:58:22 2017 +0100

    usbip: Stop building broken libusbip-dev package
    
    It has a lintian error (non-empty-dependency_libs-in-la-file) and it
    also seems to be missing a header (the newly added
    usbip_host_common.h) since Linux 4.7.  No-one seems to have noticed,
    and it has nothing build-depending on it, so get rid of it.
---
 debian/changelog                        |  1 +
 debian/libusbip-dev.install             |  3 ---
 debian/rules.d/tools/usb/usbip/Makefile |  1 +
 debian/rules.real                       |  2 +-
 debian/templates/control.tools.in       | 11 -----------
 5 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 580bcc8..1d42f08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,7 @@ linux (4.13.4-1~exp1) UNRELEASED; urgency=medium
       profile is used
   * debian/control: Move many build dependencies to Build-Depends-Arch field
   * debian/control: Remove obsolete workarounds and alternate build deps
+  * usbip: Stop building broken libusbip-dev package
 
   [ Uwe Kleine-König ]
   * [arm64] really enable NET_DSA_MV88E6XXX for Espressobin
diff --git a/debian/libusbip-dev.install b/debian/libusbip-dev.install
deleted file mode 100644
index 7b2d9eb..0000000
--- a/debian/libusbip-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/libusbip.la
-usr/lib/libusbip.a
-usr/include/usbip/*
diff --git a/debian/rules.d/tools/usb/usbip/Makefile b/debian/rules.d/tools/usb/usbip/Makefile
index f17ce56..896a814 100644
--- a/debian/rules.d/tools/usb/usbip/Makefile
+++ b/debian/rules.d/tools/usb/usbip/Makefile
@@ -17,6 +17,7 @@ all:
 		--with-tcp-wrappers \
 		--with-usbids-dir=/usr/share/misc \
 		--disable-shared \
+		--disable-static \
 		--host=$(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 	$(MAKE)
 
diff --git a/debian/rules.real b/debian/rules.real
index 0018793..6cdea7c 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -616,7 +616,7 @@ install-perf: $(STAMPS_DIR)/build-tools
 	dh_md5sums
 	dh_builddeb
 
-install-usbip: DH_OPTIONS = -plibusbip-dev -pusbip
+install-usbip: DH_OPTIONS = -pusbip
 install-usbip: DIR = $(CURDIR)/debian/usbip-tmp
 install-usbip: $(STAMPS_DIR)/build-tools
 	dh_testdir
diff --git a/debian/templates/control.tools.in b/debian/templates/control.tools.in
index e4433be..c534607 100644
--- a/debian/templates/control.tools.in
+++ b/debian/templates/control.tools.in
@@ -54,17 +54,6 @@ Description: Performance analysis tools for Linux @version@
  The linux-base package contains a 'perf' command which will invoke the
  appropriate version for the running kernel.
 
-Package: libusbip-dev
-Build-Profiles: <!stage1 !pkg.linux.notools>
-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
 Build-Profiles: <!stage1 !pkg.linux.notools>
 Architecture: linux-any

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git