tags 634451 + pending tags 640202 + pending thanks Dear maintainer,
I've prepared an NMU for hwinfo (versioned as 16.0-2.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- .''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key ID: 0x8649AA06 : :' : Debian GNU/Linux user, admin, & developer - http://www.debian.org/ `. `' Member of VIBE!AT & SPI, fellow of Free Software Foundation Europe `- NP: Dhafer Youssef: Flowing Water
diff -u hwinfo-16.0/debian/control hwinfo-16.0/debian/control --- hwinfo-16.0/debian/control +++ hwinfo-16.0/debian/control @@ -2,7 +2,7 @@ Section: admin Priority: optional Maintainer: William Vera <bi...@billy.com.mx> -Build-Depends: debhelper (>= 7.2.11), quilt, perl, flex, libdbus-1-dev, libhal-dev, linux-kernel-headers, doxygen +Build-Depends: debhelper (>= 7.2.11), quilt, perl, flex, libdbus-1-dev, libhal-dev, linux-kernel-headers, doxygen, pkg-config Standards-Version: 3.8.3 Package: hwinfo diff -u hwinfo-16.0/debian/changelog hwinfo-16.0/debian/changelog --- hwinfo-16.0/debian/changelog +++ hwinfo-16.0/debian/changelog @@ -1,3 +1,17 @@ +hwinfo (16.0-2.1) unstable; urgency=low + + * Non-maintainer upload. + + [ Simon McVittie ] + * Use pkg-config for D-Bus' cpp flags instead of hard-coding them + (Closes: #634451, LP: #749278) + + [ Ilya Barygin ] + * as-needed.patch: fix FTBFS with --as-needed linker option. + (Closes: #640202) + + -- gregor herrmann <gre...@debian.org> Thu, 01 Dec 2011 17:10:26 +0100 + hwinfo (16.0-2) unstable; urgency=low * Added the patch to port to sh4 (Closes: #546151). diff -u hwinfo-16.0/debian/patches/series hwinfo-16.0/debian/patches/series --- hwinfo-16.0/debian/patches/series +++ hwinfo-16.0/debian/patches/series @@ -8,0 +9,2 @@ +dbus_pkg_config.patch +as-needed.patch only in patch2: unchanged: --- hwinfo-16.0.orig/debian/patches/dbus_pkg_config.patch +++ hwinfo-16.0/debian/patches/dbus_pkg_config.patch @@ -0,0 +1,21 @@ +From: Simon McVittie <s...@debian.org> +Subject: pick up cpp flags for dbus-1 from pkg-config instead of hard-coding + Hard-coding the include path for dbus-1 is not recommended, and was broken + by the multiarch transition. The interface provided by upstream can be + summarized as "use pkg-config". +Bug-Debian: http://bugs.debian.org/634451 +Bug-Ubuntu: https://launchpad.net/bugs/749278 + +diff --git a/src/hd/Makefile b/src/hd/Makefile +index 3aa4819..be5b346 100644 +--- a/src/hd/Makefile ++++ b/src/hd/Makefile +@@ -4,7 +4,7 @@ CLEANFILES = version.h + + include $(TOPDIR)/Makefile.common + +-CFLAGS += -I /usr/include/dbus-1.0 -I /usr/lib64/dbus-1.0/include -I /usr/lib/dbus-1.0/include ++CFLAGS += $(shell pkg-config --cflags dbus-1) + + version.h: $(TOPDIR)/VERSION + @echo "#define HD_VERSION_STRING \"`cat $(TOPDIR)/VERSION`\"" >$@ only in patch2: unchanged: --- hwinfo-16.0.orig/debian/patches/as-needed.patch +++ hwinfo-16.0/debian/patches/as-needed.patch @@ -0,0 +1,20 @@ +Description: Place libraries after archive file to have dependencies resolved + when --as-needed linker option is being used. +Author: Ilya Barygin <bary...@gmail.com> +Bug-Debian: http://bugs.debian.org/640202 + +--- hwinfo-16.0.orig/src/Makefile ++++ hwinfo-16.0/src/Makefile +@@ -23,9 +23,10 @@ + + ifdef SHARED_FLAGS + $(LIBHD_SO): $(LIBHD) +- $(CC) -shared $(SO_LIBS) -Wl,--whole-archive $(LIBHD) -Wl,--no-whole-archive \ ++ $(CC) -shared -Wl,--whole-archive $(LIBHD) -Wl,--no-whole-archive \ + -Wl,-soname=$(LIBHD_SONAME) \ +- -o $(LIBHD_SO) ++ -o $(LIBHD_SO) \ ++ $(SO_LIBS) + ln -snf $(LIBHD_NAME) $(LIBHD_SONAME) + ln -snf $(LIBHD_SONAME) $(LIBHD_BASE).so + else
signature.asc
Description: Digital signature
