tags 474087 + patch
thanks

I've prepared a slightly more complete patch, fixing some other issues
including a lintian error. I don't plan to NMU this since I can't meaningfully
test it (I don't have the relevant hardware!) but I can confirm that collectd
compiles against this version, even when the hack it currently uses to avoid
this bug has been removed.

Temporary git repository:
    http://git.debian.org/?p=users/smcv/nmu/openipmi.git

Regards,
    Simon
diffstat for openipmi_2.0.16-1 openipmi_2.0.16-1.1

 OpenIPMIpthread.pc.in            |    6 +++---
 OpenIPMIui.pc.in                 |    2 +-
 openipmi-2.0.16/debian/changelog |   13 +++++++++++++
 openipmi-2.0.16/debian/control   |    3 ++-
 openipmi-2.0.16/debian/rules     |   10 +++++++++-
 5 files changed, 28 insertions(+), 6 deletions(-)

diff -u openipmi-2.0.16/debian/changelog openipmi-2.0.16/debian/changelog
--- openipmi-2.0.16/debian/changelog
+++ openipmi-2.0.16/debian/changelog
@@ -1,3 +1,16 @@
+openipmi (2.0.16-1.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Fix pkg-config files: neither pthread.pc nor ncurses.pc exists in Debian
+    (Closes: #474087)
+  * Use chrpath to remove unnecessary rpath from libOpenIPMIposix.so.0.0.1
+  * Remove a generated Makefile during clean to avoid it getting into the
+    Debian diff after repeated builds (as seen in the Ubuntu diff)
+  * Actually compile the package in build-arch rather than waiting until
+    install-arch
+
+ -- Simon McVittie <s...@debian.org>  Tue, 17 Nov 2009 01:31:30 +0000
+
 openipmi (2.0.16-1) unstable; urgency=low
 
   * new upstream release from 2009-03-16
diff -u openipmi-2.0.16/debian/rules openipmi-2.0.16/debian/rules
--- openipmi-2.0.16/debian/rules
+++ openipmi-2.0.16/debian/rules
@@ -39,7 +39,7 @@
 build-arch-stamp:  config.status
 
 	# Add here commands to compile the arch part of the package.
-	#$(MAKE) 
+	$(MAKE) 
 	touch build-arch-stamp
 
 clean:
@@ -49,6 +49,9 @@
 
 	# Add here commands to clean up after the build process.
 	[ ! -f Makefile ] || $(MAKE) distclean
+	# generated file not removed by upstream Makefile
+	rm swig/python/openipmigui/Makefile
+
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
 	cp -f /usr/share/misc/config.sub config.sub
 endif
@@ -71,6 +74,11 @@
 	# debian/tmp.
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 
+	# remove useless rpath from libOpenIPMIposix (which is built with
+	# -R/usr/lib, whereas only -rpath=/usr/lib is disabled by
+	# --disable-rpath)
+	chrpath -d debian/tmp/usr/lib/libOpenIPMIposix.so.*.*
+
 	dh_movefiles
 
 	dh_install -s
diff -u openipmi-2.0.16/debian/control openipmi-2.0.16/debian/control
--- openipmi-2.0.16/debian/control
+++ openipmi-2.0.16/debian/control
@@ -2,7 +2,8 @@
 Section: admin
 Priority: optional
 Maintainer: Noèl Köthe <n...@debian.org>
-Build-Depends: debhelper (>> 5.0.0), libsnmp-dev, libpopt-dev, libncurses5-dev
+Build-Depends: debhelper (>> 5.0.0), libsnmp-dev, libpopt-dev, libncurses5-dev,
+               chrpath
 Standards-Version: 3.8.2
 Homepage: http://openipmi.sourceforge.net/
 
only in patch2:
unchanged:
--- openipmi-2.0.16.orig/OpenIPMIui.pc.in
+++ openipmi-2.0.16/OpenIPMIui.pc.in
@@ -6,6 +6,6 @@
 Name: OpenIPMIui
 Description: UI front-end for OpenIPMI
 Version: @VERSION@
-Requires: OpenIPMI ncurses
+Requires: OpenIPMI
 Libs: -L${libdir} -lOpenIPMIutils -lOpenIPMIui -lOpenIPMI -lncurses
 Cflags: -I${includedir}
only in patch2:
unchanged:
--- openipmi-2.0.16.orig/OpenIPMIpthread.pc.in
+++ openipmi-2.0.16/OpenIPMIpthread.pc.in
@@ -6,6 +6,6 @@
 Name: OpenIPMIpthread
 Description: Pthread OS handler for OpenIPMI
 Version: @VERSION@
-Requires: OpenIPMI pthread
-Libs: -L${libdir} -lOpenIPMIutils -lOpenIPMIpthread
-Cflags: -I${includedir}
+Requires: OpenIPMI
+Libs: -L${libdir} -lOpenIPMIutils -lOpenIPMIpthread -pthread
+Cflags: -I${includedir} -pthread

Attachment: signature.asc
Description: Digital signature

Reply via email to