[Pkg-utopia-commits] r3723 - in /packages/experimental/dbus: ./ debian/changelog debian/dbus-1-dbg.links debian/patches/11-589662-reload-kqueue.patch debian/patches/series debian/rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Mon Sep 13 23:12:13 2010
New Revision: 3723

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3723
Log:
Merged revisions 3699-3705 via svnmerge from 
svn+ssh://biebl@svn.debian.org/svn/pkg-utopia/packages/unstable/dbus

........
  r3699 | smcv | 2010-07-27 20:16:10 +0200 (Di, 27 Jul 2010) | 1 line
  
  Add patch from upstream to fix segfaults when reloaded on kFreeBSD
........
  r3700 | smcv | 2010-07-27 20:17:30 +0200 (Di, 27 Jul 2010) | 1 line
  
  oops, actually add the patch
........
  r3701 | smcv | 2010-07-27 20:22:21 +0200 (Di, 27 Jul 2010) | 1 line
  
  Work around clone-of-#590594 in cdbs
........
  r3702 | smcv | 2010-07-27 20:24:58 +0200 (Di, 27 Jul 2010) | 1 line
  
  Close #589662
........
  r3703 | smcv | 2010-07-27 21:00:34 +0200 (Di, 27 Jul 2010) | 1 line
  
  I hate cdbs
........
  r3704 | smcv | 2010-07-27 21:07:00 +0200 (Di, 27 Jul 2010) | 1 line
  
  Install the right ChangeLog
........
  r3705 | smcv | 2010-07-27 21:15:44 +0200 (Di, 27 Jul 2010) | 1 line
  
  Upload to unstable, urgency=medium
........

Added:
    packages/experimental/dbus/debian/patches/11-589662-reload-kqueue.patch
      - copied unchanged from r3705, packages/unstable/dbus/debian/patches/11-589662-reload-kqueue.patch
Removed:
    packages/experimental/dbus/debian/dbus-1-dbg.links
Modified:
    packages/experimental/dbus/   (props changed)
    packages/experimental/dbus/debian/changelog
    packages/experimental/dbus/debian/patches/series
    packages/experimental/dbus/debian/rules

Propchange: packages/experimental/dbus/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Sep 13 23:12:13 2010
@@ -1,1 +1,1 @@
-/packages/unstable/dbus:1-3655
+/packages/unstable/dbus:1-3722

Modified: packages/experimental/dbus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/dbus/debian/changelog?rev=3723&op=diff
==============================================================================
--- packages/experimental/dbus/debian/changelog (original)
+++ packages/experimental/dbus/debian/changelog Mon Sep 13 23:12:13 2010
@@ -6,6 +6,14 @@
     - Update for API additions (Unix FD passing).
 
  -- Michael Biebl <biebl at debian.org>  Sun, 18 Jul 2010 13:41:43 +0200
+
+dbus (1.2.24-3) unstable; urgency=medium
+
+  * Add patch from upstream to fix segfaults when reloaded on kFreeBSD
+    (Closes: #589662)
+  * Work around FTBFS if dh-buildinfo is installed (Closes: #590594)
+
+ -- Simon McVittie <smcv at debian.org>  Tue, 27 Jul 2010 19:56:43 +0100
 
 dbus (1.2.24-2) unstable; urgency=low
 

Modified: packages/experimental/dbus/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/dbus/debian/patches/series?rev=3723&op=diff
==============================================================================
--- packages/experimental/dbus/debian/patches/series (original)
+++ packages/experimental/dbus/debian/patches/series Mon Sep 13 23:12:13 2010
@@ -1,3 +1,4 @@
 00_dbus-quiesce-startup-errors.patch
 01_no-fatal-warnings.patch
 10_dbus-1.0.1-generate-xml-docs.patch
+11-589662-reload-kqueue.patch

Modified: packages/experimental/dbus/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/dbus/debian/rules?rev=3723&op=diff
==============================================================================
--- packages/experimental/dbus/debian/rules (original)
+++ packages/experimental/dbus/debian/rules Mon Sep 13 23:12:13 2010
@@ -44,5 +44,17 @@
 	rm -f dbus.devhelp
 
 # we don't want docs for the debug symbols, just symlink to the library docs
+DEB_INSTALL_DOCS_ALL =
+DEB_INSTALL_DOCS_DEFAULT = README AUTHORS
+DEB_INSTALL_DOCS_dbus-1-dbg := --link-doc=$(libdbusN)
+DEB_INSTALL_CHANGELOGS_ALL =
+DEB_INSTALL_CHANGELOGS_DEFAULT = ChangeLog
 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