Control: tags 807043 + patch Dear maintainer,
I've prepared an NMU for pciutils (versioned as 1:3.3.1-1.1). The diff is attached to this message. Regards. diff -Nru pciutils-3.3.1/debian/changelog pciutils-3.3.1/debian/changelog --- pciutils-3.3.1/debian/changelog 2015-08-11 14:03:54.000000000 +0200 +++ pciutils-3.3.1/debian/changelog 2016-01-13 20:18:32.000000000 +0100 @@ -1,3 +1,11 @@ +pciutils (1:3.3.1-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Enable libkmod support on linux architectures (Closes: #807043) + * Enable udev hwdb support on linux architectures + + -- Laurent Bigonville <bi...@debian.org> Wed, 13 Jan 2016 20:18:06 +0100 + pciutils (1:3.3.1-1) unstable; urgency=medium * New upstream version 3.3.1 diff -Nru pciutils-3.3.1/debian/control pciutils-3.3.1/debian/control --- pciutils-3.3.1/debian/control 2015-08-10 14:35:24.000000000 +0200 +++ pciutils-3.3.1/debian/control 2016-01-13 20:16:03.000000000 +0100 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Anibal Monsalve Salazar <ani...@debian.org> Uploaders: Matt Taggart <tagg...@debian.org> -Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 9), zlib1g-dev +Build-Depends: dpkg-dev (>= 1.16.1~), debhelper (>= 9), zlib1g-dev, libkmod-dev [linux-any], libudev-dev (>= 196) [linux-any], pkg-config Standards-Version: 3.9.6 Homepage: http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml @@ -21,7 +21,7 @@ Section: libdevel Priority: optional Architecture: any -Depends: ${misc:Depends}, zlib1g-dev, libpci3 (= ${binary:Version}) +Depends: ${misc:Depends}, zlib1g-dev, libpci3 (= ${binary:Version}), libudev-dev (>= 196) [linux-any] Conflicts: pciutils-dev Provides: pciutils-dev Replaces: pciutils-dev diff -Nru pciutils-3.3.1/debian/patches/01-Makefile.patch pciutils-3.3.1/debian/patches/01-Makefile.patch --- pciutils-3.3.1/debian/patches/01-Makefile.patch 2015-08-10 13:50:00.000000000 +0200 +++ pciutils-3.3.1/debian/patches/01-Makefile.patch 2016-01-13 20:13:29.000000000 +0100 @@ -1,7 +1,5 @@ -Index: pciutils-3.3.1/Makefile -=================================================================== ---- pciutils-3.3.1.orig/Makefile -+++ pciutils-3.3.1/Makefile +--- a/Makefile ++++ b/Makefile @@ -1,7 +1,7 @@ # Makefile for The PCI Utilities # (c) 1998--2015 Martin Mares <m...@ucw.cz> @@ -53,7 +51,7 @@ $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LDLIBS) -o $@ +lspci-udeb: lspci.o -+ $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LDLIBS) -lz -lresolv -o $@ ++ $(CC) $(LDFLAGS) $(TARGET_ARCH) $^ $(LDLIBS) -lz -lresolv -lkmod -ludev -o $@ + %.8 %.7: %.man M=`echo $(DATE) | sed 's/-01-/-January-/;s/-02-/-February-/;s/-03-/-March-/;s/-04-/-April-/;s/-05-/-May-/;s/-06-/-June-/;s/-07-/-July-/;s/-08-/-August-/;s/-09-/-September-/;s/-10-/-October-/;s/-11-/-November-/;s/-12-/-December-/;s/\(.*\)-\(.*\)-\(.*\)/\3 \2 \1/'` ; sed <$< >$@ "s/@TODAY@/$$M/;s/@VERSION@/pciutils-$(VERSION)/;s#@IDSDIR@#$(IDSDIR)#" @@ -90,10 +88,8 @@ rm -f $(DESTDIR)$(MANDIR)/man7/pcilib.7 ifeq ($(SHARED),yes) rm -f $(DESTDIR)$(LIBDIR)/$(PCILIB) $(DESTDIR)$(LIBDIR)/$(LIBNAME).so$(ABI_VERSION) -Index: pciutils-3.3.1/lib/Makefile -=================================================================== ---- pciutils-3.3.1.orig/lib/Makefile -+++ pciutils-3.3.1/lib/Makefile +--- a/lib/Makefile ++++ b/lib/Makefile @@ -47,13 +47,16 @@ OBJS += darwin endif diff -Nru pciutils-3.3.1/debian/patches/07-697383-libpci.pc.in.patch pciutils-3.3.1/debian/patches/07-697383-libpci.pc.in.patch --- pciutils-3.3.1/debian/patches/07-697383-libpci.pc.in.patch 2015-08-10 14:14:29.000000000 +0200 +++ pciutils-3.3.1/debian/patches/07-697383-libpci.pc.in.patch 2016-01-13 20:11:06.000000000 +0100 @@ -28,5 +28,5 @@ Version: @VERSION@ Libs: -L${libdir} -lpci -Libs.private: @LDLIBS@ -+Libs.private: @LDLIBS@ -lresolv -lz ++Libs.private: @LDLIBS@ -lresolv -lz -ludev Cflags: -I${includedir} diff -Nru pciutils-3.3.1/debian/rules pciutils-3.3.1/debian/rules --- pciutils-3.3.1/debian/rules 2015-08-11 13:26:07.000000000 +0200 +++ pciutils-3.3.1/debian/rules 2016-01-13 19:32:44.000000000 +0100 @@ -14,6 +14,10 @@ CROSS=CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)- endif +ifeq ($(DEB_HOST_ARCH_OS),linux) +LINUX_FEATURES=LIBKMOD=yes HWDB=yes +endif + PATHS := LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) PREFIX=/usr SBINDIR=/usr/bin IDSDIR=/usr/share/misc update-ids: @@ -28,7 +32,7 @@ build-indep: build build: dh_testdir - OPT="$(CFLAGS)" $(MAKE) $(CROSS) $(PATHS) SHARED=yes + OPT="$(CFLAGS)" $(MAKE) $(CROSS) $(PATHS) SHARED=yes $(LINUX_FEATURES) clean: dh_testdir
