* Remove patches:

  - debian/patches/02_dbus_monitor_no_sigint_handler.patch (fixed upstream)
  - debian/patches/20_kbsd_cmsgcred.patch (merged upstream)
  - debian/patches/30_rt-as-needed.patch (merged upstream)

git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/unstable/dbus@3495 ceb527fc-18e6-0310-9fe2-813c157c29e7

5 files changed, 4 insertions, 201 deletions

diff --git a/debian/changelog b/debian/changelog
index 8241ba75..acf09231 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,10 @@ dbus (1.2.18-1) UNRELEASED; urgency=low
       (Closes: #533460)
     - Improve the way we create the symlink from /usr/lib/ → /lib by using
       readlink.
+  * Remove patches:
+    - debian/patches/02_dbus_monitor_no_sigint_handler.patch (fixed upstream)
+    - debian/patches/20_kbsd_cmsgcred.patch (merged upstream)
+    - debian/patches/30_rt-as-needed.patch (merged upstream)
 
  -- Michael Biebl <biebl@debian.org>  Thu, 12 Nov 2009 09:04:48 +0100
 
diff --git a/debian/patches/02_dbus_monitor_no_sigint_handler.patch b/debian/patches/02_dbus_monitor_no_sigint_handler.patch
deleted file mode 100644
index 4675a4b1..00000000
--- a/debian/patches/02_dbus_monitor_no_sigint_handler.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Index: dbus-1.2.16/tools/dbus-monitor.c
-===================================================================
---- 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>
- 
--#include <signal.h>
--
- #include "dbus-print-message.h"
- 
- #ifdef DBUS_WIN
-@@ -195,14 +193,6 @@
-   exit (ecode);
- }
- 
--static dbus_bool_t sigint_received = FALSE;
--
--static void
--sigint_handler (int signum)
--{
--  sigint_received = TRUE;
--}
--
- int
- main (int argc, char *argv[])
- {
-@@ -338,11 +328,7 @@
-     fprintf (stderr, "Couldn't add filter!\n");
-     exit (1);
-   }
--
--  /* we handle SIGINT so exit() is reached and flushes stdout */
--  signal (SIGINT, sigint_handler);
--  while (dbus_connection_read_write_dispatch(connection, -1)
--          && !sigint_received)
-+  while (dbus_connection_read_write_dispatch(connection, -1))
-     ;
-   exit (0);
-  lose:
diff --git a/debian/patches/20_kbsd_cmsgcred.patch b/debian/patches/20_kbsd_cmsgcred.patch
deleted file mode 100644
index dfae9dc1..00000000
--- a/debian/patches/20_kbsd_cmsgcred.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: dbus-1.2.16/dbus/dbus-sysdeps-unix.c
-===================================================================
---- dbus-1.2.16.orig/dbus/dbus-sysdeps-unix.c	2009-07-14 21:42:38.000000000 +0200
-+++ dbus-1.2.16/dbus/dbus-sysdeps-unix.c	2009-07-16 02:09:20.000000000 +0200
-@@ -1241,7 +1241,7 @@
- #elif defined(HAVE_CMSGCRED)
-     struct cmsgcred *cred;
- 
--    cred = (struct cmsgcred *) CMSG_DATA (&cmsg);
-+    cred = (struct cmsgcred *) CMSG_DATA (&cmsg.hdr);
-     pid_read = cred->cmcred_pid;
-     uid_read = cred->cmcred_euid;
- #elif defined(LOCAL_CREDS)
diff --git a/debian/patches/30_rt-as-needed.patch b/debian/patches/30_rt-as-needed.patch
deleted file mode 100644
index 8dbe6ac8..00000000
--- a/debian/patches/30_rt-as-needed.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-diff --git a/bus/Makefile.am b/bus/Makefile.am
-index 3b4f69d..ad49e6d 100644
---- a/bus/Makefile.am
-+++ b/bus/Makefile.am
-@@ -78,8 +78,8 @@ dbus_daemon_SOURCES=				\
- 
- dbus_daemon_LDADD=					\
- 	$(EFENCE)					\
--	$(DBUS_BUS_LIBS)				\
--	$(top_builddir)/dbus/libdbus-convenience.la
-+	$(top_builddir)/dbus/libdbus-convenience.la	\
-+	$(DBUS_BUS_LIBS)
- 
- dbus_daemon_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ @PIE_LDFLAGS@
- 
-@@ -103,8 +103,8 @@ dbus_daemon_launch_helper_SOURCES=		\
- 	$(LAUNCH_HELPER_SOURCES)
- 
- dbus_daemon_launch_helper_LDADD=		\
--	$(DBUS_LAUNCHER_LIBS)			\
--	$(top_builddir)/dbus/libdbus-convenience.la
-+	$(top_builddir)/dbus/libdbus-convenience.la \
-+	$(DBUS_LAUNCHER_LIBS)
- 
- dbus_daemon_launch_helper_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@
- 
-@@ -115,8 +115,8 @@ dbus_daemon_launch_helper_test_SOURCES=		\
- 	$(LAUNCH_HELPER_SOURCES)
- 
- dbus_daemon_launch_helper_test_LDADD=		\
--	$(DBUS_LAUNCHER_LIBS)			\
--	$(top_builddir)/dbus/libdbus-convenience.la
-+	$(top_builddir)/dbus/libdbus-convenience.la \
-+	$(DBUS_LAUNCHER_LIBS)
- 
- dbus_daemon_launch_helper_test_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@
- dbus_daemon_launch_helper_test_CPPFLAGS=	\
-@@ -129,8 +129,8 @@ bus_test_launch_helper_SOURCES=		\
- 	$(LAUNCH_HELPER_SOURCES)
- 
- bus_test_launch_helper_LDADD=		\
--	$(DBUS_LAUNCHER_LIBS)			\
--	$(top_builddir)/dbus/libdbus-convenience.la
-+	$(top_builddir)/dbus/libdbus-convenience.la \
-+	$(DBUS_LAUNCHER_LIBS)
- 
- bus_test_launch_helper_LDFLAGS=@R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@
- bus_test_launch_helper_CPPFLAGS=	\
-diff --git a/bus/Makefile.in b/bus/Makefile.in
-index fde3829..02520b6 100644
---- a/bus/Makefile.in
-+++ b/bus/Makefile.in
-@@ -111,8 +111,9 @@ am_bus_test_launch_helper_OBJECTS =  \
- 	bus_test_launch_helper-test-launch-helper.$(OBJEXT) \
- 	$(am__objects_5)
- bus_test_launch_helper_OBJECTS = $(am_bus_test_launch_helper_OBJECTS)
--bus_test_launch_helper_DEPENDENCIES = $(am__DEPENDENCIES_1) \
--	$(top_builddir)/dbus/libdbus-convenience.la
-+bus_test_launch_helper_DEPENDENCIES =  \
-+	$(top_builddir)/dbus/libdbus-convenience.la \
-+	$(am__DEPENDENCIES_1)
- bus_test_launch_helper_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(bus_test_launch_helper_LDFLAGS) $(LDFLAGS) -o $@
-@@ -142,8 +143,9 @@ am__dbus_daemon_SOURCES_DIST = activation.c activation.h \
- 	config-loader-libxml.c main.c
- am_dbus_daemon_OBJECTS = $(am__objects_3) main.$(OBJEXT)
- dbus_daemon_OBJECTS = $(am_dbus_daemon_OBJECTS)
--dbus_daemon_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
--	$(top_builddir)/dbus/libdbus-convenience.la
-+dbus_daemon_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-+	$(top_builddir)/dbus/libdbus-convenience.la \
-+	$(am__DEPENDENCIES_1)
- dbus_daemon_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
- 	$(dbus_daemon_LDFLAGS) $(LDFLAGS) -o $@
-@@ -160,8 +162,9 @@ am_dbus_daemon_launch_helper_OBJECTS =  \
- 	activation-helper-bin.$(OBJEXT) $(am__objects_6)
- dbus_daemon_launch_helper_OBJECTS =  \
- 	$(am_dbus_daemon_launch_helper_OBJECTS)
--dbus_daemon_launch_helper_DEPENDENCIES = $(am__DEPENDENCIES_1) \
--	$(top_builddir)/dbus/libdbus-convenience.la
-+dbus_daemon_launch_helper_DEPENDENCIES =  \
-+	$(top_builddir)/dbus/libdbus-convenience.la \
-+	$(am__DEPENDENCIES_1)
- dbus_daemon_launch_helper_LINK = $(LIBTOOL) --tag=CC \
- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
- 	$(AM_CFLAGS) $(CFLAGS) $(dbus_daemon_launch_helper_LDFLAGS) \
-@@ -185,8 +188,9 @@ am_dbus_daemon_launch_helper_test_OBJECTS = dbus_daemon_launch_helper_test-activ
- 	$(am__objects_8)
- dbus_daemon_launch_helper_test_OBJECTS =  \
- 	$(am_dbus_daemon_launch_helper_test_OBJECTS)
--dbus_daemon_launch_helper_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
--	$(top_builddir)/dbus/libdbus-convenience.la
-+dbus_daemon_launch_helper_test_DEPENDENCIES =  \
-+	$(top_builddir)/dbus/libdbus-convenience.la \
-+	$(am__DEPENDENCIES_1)
- dbus_daemon_launch_helper_test_LINK = $(LIBTOOL) --tag=CC \
- 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
- 	$(AM_CFLAGS) $(CFLAGS) \
-@@ -497,8 +501,8 @@ dbus_daemon_SOURCES = \
- 
- dbus_daemon_LDADD = \
- 	$(EFENCE)					\
--	$(DBUS_BUS_LIBS)				\
--	$(top_builddir)/dbus/libdbus-convenience.la
-+	$(top_builddir)/dbus/libdbus-convenience.la	\
-+	$(DBUS_BUS_LIBS)
- 
- dbus_daemon_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@ @PIE_LDFLAGS@
- LAUNCH_HELPER_SOURCES = \
-@@ -520,8 +524,8 @@ dbus_daemon_launch_helper_SOURCES = \
- 	$(LAUNCH_HELPER_SOURCES)
- 
- dbus_daemon_launch_helper_LDADD = \
--	$(DBUS_LAUNCHER_LIBS)			\
--	$(top_builddir)/dbus/libdbus-convenience.la
-+	$(top_builddir)/dbus/libdbus-convenience.la \
-+	$(DBUS_LAUNCHER_LIBS)
- 
- dbus_daemon_launch_helper_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@
- dbus_daemon_launch_helper_test_SOURCES = \
-@@ -529,8 +533,8 @@ dbus_daemon_launch_helper_test_SOURCES = \
- 	$(LAUNCH_HELPER_SOURCES)
- 
- dbus_daemon_launch_helper_test_LDADD = \
--	$(DBUS_LAUNCHER_LIBS)			\
--	$(top_builddir)/dbus/libdbus-convenience.la
-+	$(top_builddir)/dbus/libdbus-convenience.la \
-+	$(DBUS_LAUNCHER_LIBS)
- 
- dbus_daemon_launch_helper_test_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@
- dbus_daemon_launch_helper_test_CPPFLAGS = \
-@@ -541,8 +545,8 @@ bus_test_launch_helper_SOURCES = \
- 	$(LAUNCH_HELPER_SOURCES)
- 
- bus_test_launch_helper_LDADD = \
--	$(DBUS_LAUNCHER_LIBS)			\
--	$(top_builddir)/dbus/libdbus-convenience.la
-+	$(top_builddir)/dbus/libdbus-convenience.la \
-+	$(DBUS_LAUNCHER_LIBS)
- 
- bus_test_launch_helper_LDFLAGS = @R_DYNAMIC_LDFLAG@ @SECTION_LDFLAGS@
- bus_test_launch_helper_CPPFLAGS = \
diff --git a/debian/patches/series b/debian/patches/series
index 0149cb8e..2867e270 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,3 @@
 00_dbus-quiesce-startup-errors.patch
 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