dbus (1.6.10-1+dyson1) unstable; urgency=lowdyson/1.6.10-1+dyson1

  * Package for Dyson
    - Removed 0002-define-__EXTENSIONS__-for-ip6.patch (applied upstream)
    - Removed 0003-HAVE_DECL_LOG_PERROR-is-defined-but-0.patch (likewise)

4 files changed, 8 insertions, 44 deletions

diff --git a/debian/changelog b/debian/changelog
index cbb12e85..5f2ce1f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+dbus (1.6.10-1+dyson1) unstable; urgency=low
+
+  * Package for Dyson
+    - Removed 0002-define-__EXTENSIONS__-for-ip6.patch (applied upstream)
+    - Removed 0003-HAVE_DECL_LOG_PERROR-is-defined-but-0.patch (likewise)
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Sat, 22 Jun 2013 15:21:15 +0400
+
 dbus (1.6.10-1) unstable; urgency=low
 
   * New upstream stable release 1.6.10
diff --git a/debian/patches/0002-define-__EXTENSIONS__-for-ip6.patch b/debian/patches/0002-define-__EXTENSIONS__-for-ip6.patch
deleted file mode 100644
index 72adc89e..00000000
--- a/debian/patches/0002-define-__EXTENSIONS__-for-ip6.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Igor Pashev <pashev.igor@gmail.com>
-Date: Fri, 7 Sep 2012 03:14:00 +0000
-Subject: define __EXTENSIONS__ for ip6
-
----
- configure.ac |    2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index fc75c0b..787e74d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1380,6 +1380,8 @@ case $host_os in
-         CFLAGS="$CFLAGS -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT"
-         # ... and this opt-in to get file descriptor passing support
-         CFLAGS="$CFLAGS -D_XOPEN_SOURCE=500"
-+        # ... and for ip6 (XPG6, but need c99):
-+        CFLAGS="$CFLAGS -D__EXTENSIONS__"
-         ;;
- esac
- 
diff --git a/debian/patches/0003-HAVE_DECL_LOG_PERROR-is-defined-but-0.patch b/debian/patches/0003-HAVE_DECL_LOG_PERROR-is-defined-but-0.patch
deleted file mode 100644
index d00fc811..00000000
--- a/debian/patches/0003-HAVE_DECL_LOG_PERROR-is-defined-but-0.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Igor Pashev <pashev.igor@gmail.com>
-Date: Fri, 7 Sep 2012 03:16:17 +0000
-Subject: HAVE_DECL_LOG_PERROR *is* defined, but = 0
-
----
- dbus/dbus-sysdeps-util-unix.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dbus/dbus-sysdeps-util-unix.c b/dbus/dbus-sysdeps-util-unix.c
-index ef86d73..d3169db 100644
---- a/dbus/dbus-sysdeps-util-unix.c
-+++ b/dbus/dbus-sysdeps-util-unix.c
-@@ -424,7 +424,7 @@ _dbus_request_file_descriptor_limit (unsigned int limit)
- void
- _dbus_init_system_log (void)
- {
--#ifdef HAVE_DECL_LOG_PERROR
-+#if HAVE_DECL_LOG_PERROR
-   openlog ("dbus", LOG_PID | LOG_PERROR, LOG_DAEMON);
- #else
-   openlog ("dbus", LOG_PID, LOG_DAEMON);
diff --git a/debian/patches/series b/debian/patches/series
index 82aa6b83..6a9bc22e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 0001-Don-t-abort-on-fatal-warnings-by-default.patch
-0002-define-__EXTENSIONS__-for-ip6.patch
-0003-HAVE_DECL_LOG_PERROR-is-defined-but-0.patch