diff options
| author | Michael Biebl <biebl@debian.org> | 2010-07-17 13:18:54 +0000 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2010-07-17 13:18:54 +0000 |
| commit | 6b168de348ec5800b982c5f58e08b015c82a667e (patch) | |
| tree | 030f56ffe3b94a96e8427e98eb6130fd67124049 | |
| parent | 135a3a8e541375e075b5f4ce8a47ffd48616c7e9 (diff) | |
| download | dbus-6b168de348ec5800b982c5f58e08b015c82a667e.tar.gz | |
Refresh patches to apply cleanly.
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-utopia/packages/experimental/dbus@3660 ceb527fc-18e6-0310-9fe2-813c157c29e7
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/patches/00_dbus-quiesce-startup-errors.patch | 8 | ||||
| -rw-r--r-- | debian/patches/01_no-fatal-warnings.patch | 8 |
3 files changed, 10 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog index fd0b81b3..65869c37 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,9 @@ dbus (1.3.2~git20100715.821f99c-1) UNRELEASED; urgency=low * New upstream Git snapshot (up to 821f99c). + * Refresh patches to apply cleanly. - -- Michael Biebl <biebl@debian.org> Sat, 17 Jul 2010 15:11:47 +0200 + -- Michael Biebl <biebl@debian.org> Sat, 17 Jul 2010 15:18:24 +0200 dbus (1.2.24-2) unstable; urgency=low diff --git a/debian/patches/00_dbus-quiesce-startup-errors.patch b/debian/patches/00_dbus-quiesce-startup-errors.patch index 1db21005..4144c8a3 100644 --- a/debian/patches/00_dbus-quiesce-startup-errors.patch +++ b/debian/patches/00_dbus-quiesce-startup-errors.patch @@ -1,8 +1,8 @@ -Index: dbus-1.2.14/bus/config-parser.c +Index: b/bus/config-parser.c =================================================================== ---- dbus-1.2.14.orig/bus/config-parser.c 2009-05-05 22:51:37.000000000 +0200 -+++ dbus-1.2.14/bus/config-parser.c 2009-05-07 00:16:25.000000000 +0200 -@@ -2193,8 +2193,18 @@ +--- a/bus/config-parser.c 2010-07-14 00:43:38.000000000 +0200 ++++ b/bus/config-parser.c 2010-07-17 15:16:44.226404084 +0200 +@@ -2236,8 +2236,18 @@ { if (!include_file (parser, &full_path, TRUE, error)) { diff --git a/debian/patches/01_no-fatal-warnings.patch b/debian/patches/01_no-fatal-warnings.patch index 0ec3a111..53b3444c 100644 --- a/debian/patches/01_no-fatal-warnings.patch +++ b/debian/patches/01_no-fatal-warnings.patch @@ -1,8 +1,8 @@ -Index: dbus-1.2.14/dbus/dbus-internals.c +Index: b/dbus/dbus-internals.c =================================================================== ---- dbus-1.2.14.orig/dbus/dbus-internals.c 2009-04-17 21:45:29.000000000 +0200 -+++ dbus-1.2.14/dbus/dbus-internals.c 2009-05-07 00:16:33.000000000 +0200 -@@ -193,7 +193,7 @@ +--- a/dbus/dbus-internals.c 2010-07-14 00:43:38.000000000 +0200 ++++ b/dbus/dbus-internals.c 2010-07-17 15:16:54.478407971 +0200 +@@ -199,7 +199,7 @@ static dbus_bool_t warn_initted = FALSE; static dbus_bool_t fatal_warnings = FALSE; |