[Pkg-utopia-commits] r3701 - in /packages/unstable/dbus/debian: changelog rules

[smcv at users.alioth.debian.org]

Author: smcv
Date: Tue Jul 27 18:22:21 2010
New Revision: 3701

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3701
Log:
Work around clone-of-#590594 in cdbs

Modified:
    packages/unstable/dbus/debian/changelog
    packages/unstable/dbus/debian/rules

Modified: packages/unstable/dbus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/changelog?rev=3701&op=diff
==============================================================================
--- packages/unstable/dbus/debian/changelog (original)
+++ packages/unstable/dbus/debian/changelog Tue Jul 27 18:22:21 2010
@@ -1,6 +1,7 @@
 dbus (1.2.24-3) UNRELEASED; urgency=low
 
   * Add patch from upstream to fix segfaults when reloaded on kFreeBSD
+  * Work around FTBFS if dh-buildinfo is installed (Closes: #590594)
 
  -- Simon McVittie <smcv at debian.org>  Tue, 27 Jul 2010 19:10:16 +0100
 

Modified: packages/unstable/dbus/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus/debian/rules?rev=3701&op=diff
==============================================================================
--- packages/unstable/dbus/debian/rules (original)
+++ packages/unstable/dbus/debian/rules Tue Jul 27 18:22:21 2010
@@ -44,5 +44,13 @@
 	rm -f dbus.devhelp
 
 # we don't want docs for the debug symbols, just symlink to the library docs
+DEB_INSTALL_DOCS_dbus-1-dbg := --link-doc=$(libdbusN)
 DEB_INSTALL_CHANGELOGS_dbus-1-dbg := --no-act
-DEB_INSTALL_DOCS_dbus-1-dbg := --no-act
+
+# workaround for cdbs running dh-buildinfo (if installed) too early;
+# see #590594
+debian/stamp-buildinfo: insist-on-symlinks
+insist-on-symlinks:
+	@echo "regarding #590594, observe that this is before dh_installdocs"
+	install -d debian/dbus-1-dbg/usr/share/doc
+	ln -s $(libdbusN) debian/dbus-1-dbg/usr/share/doc/dbus-1-dbg