[Pkg-utopia-commits] r3467 - in /packages/experimental/dbus/debian: ./ patches/

smcv at users.alioth.debian.org smcv at users.alioth.debian.org
Wed Jan 27 22:22:41 UTC 2010 

Author: smcv
Date: Wed Jan 27 22:22:41 2010
New Revision: 3467

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3467
Log:
Merge from unstable (up to r3466)

Added:
    packages/experimental/dbus/debian/patches/20_kbsd_cmsgcred.patch
      - copied unchanged from r3466, packages/unstable/dbus/debian/patches/20_kbsd_cmsgcred.patch
    packages/experimental/dbus/debian/patches/30_rt-as-needed.patch
      - copied unchanged from r3466, packages/unstable/dbus/debian/patches/30_rt-as-needed.patch
Modified:
    packages/experimental/dbus/debian/changelog
    packages/experimental/dbus/debian/control
    packages/experimental/dbus/debian/libdbus-1-3.install
    packages/experimental/dbus/debian/libdbus-1-3.symbols
    packages/experimental/dbus/debian/libdbus-1-dev.install
    packages/experimental/dbus/debian/patches/02_dbus_monitor_no_sigint_handler.patch
    packages/experimental/dbus/debian/patches/series
    packages/experimental/dbus/debian/rules

Modified: packages/experimental/dbus/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/dbus/debian/changelog?rev=3467&op=diff
==============================================================================
--- packages/experimental/dbus/debian/changelog (original)
+++ packages/experimental/dbus/debian/changelog Wed Jan 27 22:22:41 2010
@@ -1,8 +1,48 @@
-dbus (1.2.14-4~exp1) UNRELEASED; urgency=low
-
-  * Add dbus-1-dbg package containing separated debug symbols
-
- -- Simon McVittie <smcv at debian.org>  Wed, 27 May 2009 10:30:25 +0100
+dbus (1.2.16-3~exp1) UNRELEASED-experimental; urgency=low
+
+  * Add separate debugging symbols (Closes: 550517)
+
+ -- Simon McVittie <smcv at debian.org>  Wed, 27 Jan 2010 21:58:06 +0000
+
+dbus (1.2.16-3) UNRELEASED; urgency=low
+
+  * debian/control
+    - Drop Build-Depends on docbook-utils, apparently no longer necessary.
+  * debian/rules
+    - Explicitly disable audit support so we don't accidentally pick up a
+      libaudit shlib dependency.
+    - Drop our workaround for the broken binutils and re-enable -pie on mips.
+      (Closes: #533460)
+    - Improve the way we create the symlink from /usr/lib/ → /lib by using
+      readlink.
+
+ -- Michael Biebl <biebl at debian.org>  Thu, 12 Nov 2009 09:04:48 +0100
+
+dbus (1.2.16-2) unstable; urgency=low
+
+  * Rebuild against debhelper (>= 7.2.23) that fixes a regression in
+    dh_install which did not correctly strip debian/tmp. (Closes: #537125)
+  * debian/patches/20_kbsd_cmsgcred.patch
+    - Fix incorrect usage of cmsgcred on kFreeBSD. Thanks to Aurelien Jarno
+      for the patch.
+  * debian/patches/30_rt-as-needed.patch
+    - Fix spurious build failures on alpha and ia64 when using -Wl,--as-needed
+      by changing the link order of libdbus-convenience.la and -lrt.
+
+ -- Michael Biebl <biebl at debian.org>  Thu, 16 Jul 2009 02:03:18 +0200
+
+dbus (1.2.16-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/libdbus-1-3.symbols
+    - Update for API additions.
+  * debian/rules
+    - Bump shlibs to 1.2.16.
+  * Install libdbus to /lib. Upstart requires libdbus before /usr is
+    mounted. Keep the development files libdbus-1*.{a,so} in /usr/lib.
+  * Bump Standards-Version to 3.8.2. No further changes.
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 15 Jul 2009 00:39:18 +0200
 
 dbus (1.2.14-3) unstable; urgency=low
 

Modified: packages/experimental/dbus/debian/control
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/dbus/debian/control?rev=3467&op=diff
==============================================================================
--- packages/experimental/dbus/debian/control (original)
+++ packages/experimental/dbus/debian/control Wed Jan 27 22:22:41 2010
@@ -12,13 +12,12 @@
                autotools-dev,
                libexpat-dev,
                doxygen,
-               docbook-utils,
                xmlto,
                xsltproc,
                libx11-dev,
                libselinux1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64],
                quilt
-Standards-Version: 3.8.1
+Standards-Version: 3.8.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/dbus
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus
 Homepage: http://dbus.freedesktop.org/

Modified: packages/experimental/dbus/debian/libdbus-1-3.install
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/dbus/debian/libdbus-1-3.install?rev=3467&op=diff
==============================================================================
--- packages/experimental/dbus/debian/libdbus-1-3.install (original)
+++ packages/experimental/dbus/debian/libdbus-1-3.install Wed Jan 27 22:22:41 2010
@@ -1,1 +1,1 @@
-debian/tmp/usr/lib/libdbus-1*.so.*
+debian/tmp/usr/lib/libdbus-1*.so.* lib/

Modified: packages/experimental/dbus/debian/libdbus-1-3.symbols
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/dbus/debian/libdbus-1-3.symbols?rev=3467&op=diff
==============================================================================
--- packages/experimental/dbus/debian/libdbus-1-3.symbols (original)
+++ packages/experimental/dbus/debian/libdbus-1-3.symbols Wed Jan 27 22:22:41 2010
@@ -120,6 +120,7 @@
  dbus_message_is_error at Base 1.0.2
  dbus_message_is_method_call at Base 1.0.2
  dbus_message_is_signal at Base 1.0.2
+ dbus_message_iter_abandon_container at Base 1.2.16
  dbus_message_iter_append_basic at Base 1.0.2
  dbus_message_iter_append_fixed_array at Base 1.0.2
  dbus_message_iter_close_container at Base 1.0.2

Modified: packages/experimental/dbus/debian/libdbus-1-dev.install
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/dbus/debian/libdbus-1-dev.install?rev=3467&op=diff
==============================================================================
--- packages/experimental/dbus/debian/libdbus-1-dev.install (original)
+++ packages/experimental/dbus/debian/libdbus-1-dev.install Wed Jan 27 22:22:41 2010
@@ -2,4 +2,3 @@
 debian/tmp/usr/lib/dbus*/include/dbus/dbus*.h
 debian/tmp/usr/lib/pkgconfig/dbus-1.pc
 debian/tmp/usr/lib/libdbus-1*.a
-debian/tmp/usr/lib/libdbus-1*.so

Modified: packages/experimental/dbus/debian/patches/02_dbus_monitor_no_sigint_handler.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/dbus/debian/patches/02_dbus_monitor_no_sigint_handler.patch?rev=3467&op=diff
==============================================================================
--- packages/experimental/dbus/debian/patches/02_dbus_monitor_no_sigint_handler.patch (original)
+++ packages/experimental/dbus/debian/patches/02_dbus_monitor_no_sigint_handler.patch Wed Jan 27 22:22:41 2010
@@ -1,7 +1,7 @@
-Index: dbus-1.2.14/tools/dbus-monitor.c
+Index: dbus-1.2.16/tools/dbus-monitor.c
 ===================================================================
---- dbus-1.2.14.orig/tools/dbus-monitor.c	2009-05-06 18:51:18.000000000 +0200
-+++ dbus-1.2.14/tools/dbus-monitor.c	2009-05-07 00:19:51.000000000 +0200
+--- dbus-1.2.16.orig/tools/dbus-monitor.c	2009-07-14 21:42:25.000000000 +0200
++++ dbus-1.2.16/tools/dbus-monitor.c	2009-07-16 02:08:59.000000000 +0200
 @@ -33,8 +33,6 @@
  
  #include <time.h>
@@ -26,7 +26,7 @@
  int
  main (int argc, char *argv[])
  {
-@@ -294,11 +284,7 @@
+@@ -338,11 +328,7 @@
      fprintf (stderr, "Couldn't add filter!\n");
      exit (1);
    }

Modified: packages/experimental/dbus/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/dbus/debian/patches/series?rev=3467&op=diff
==============================================================================
--- packages/experimental/dbus/debian/patches/series (original)
+++ packages/experimental/dbus/debian/patches/series Wed Jan 27 22:22:41 2010
@@ -2,3 +2,5 @@
 01_no-fatal-warnings.patch
 02_dbus_monitor_no_sigint_handler.patch
 10_dbus-1.0.1-generate-xml-docs.patch
+20_kbsd_cmsgcred.patch
+30_rt-as-needed.patch

Modified: packages/experimental/dbus/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/dbus/debian/rules?rev=3467&op=diff
==============================================================================
--- packages/experimental/dbus/debian/rules (original)
+++ packages/experimental/dbus/debian/rules Wed Jan 27 22:22:41 2010
@@ -10,7 +10,7 @@
 
 libdbusN := $(shell sed -rn 's/Package:[[:space:]]*(libdbus-[0-9-]+)[[:space:]]*$$/\1/p' debian/control | head -n 1)
 
-DEB_DH_MAKESHLIBS_ARGS_ALL = -V '$(libdbusN) (>= 1.2.14)'
+DEB_DH_MAKESHLIBS_ARGS_ALL = -V '$(libdbusN) (>= 1.2.16)'
 
 LDFLAGS += -Wl,--as-needed
 
@@ -21,16 +21,10 @@
 
 DEB_CONFIGURE_EXTRA_FLAGS += \
 	--enable-xml-docs \
-	--enable-doxygen-docs
+	--enable-doxygen-docs \
+	--disable-libaudit
 
 DEB_DH_INSTALLINIT_ARGS := -r -- start 12 2 3 4 5 . stop  88 1 .
-
-ifneq (,$(filter $(DEB_HOST_ARCH), mips mipsel))
-common-configure-impl::
-	# Workaround for a bug in binutils on mipsen (see #528145).
-	# Remove again when #532821 has been fixed.
-	sed -i -e 's/\-fPIE//' -e 's/\-pie\ \-Wl\,\-z\,relro//' bus/Makefile
-endif
 
 binary-post-install/dbus-x11::
 	mkdir -p debian/dbus-x11/etc/X11/Xsession.d
@@ -39,6 +33,9 @@
 build/dbus-1-doc::
 	doxygen Doxyfile
 	xsltproc -o dbus.devhelp debian/doxygen_to_devhelp.xsl doc/api/xml/index.xml
+
+install/libdbus-1-dev::
+	dh_link -p$(cdbs_curpkg) lib/$$(basename $$(readlink debian/tmp/usr/lib/libdbus-1.so)) usr/lib/libdbus-1.so
 
 clean::
 	rm -rf doc/api

More information about the Pkg-utopia-commits mailing list