r35041 - in /desktop/experimental/gnome-settings-daemon/debian: changelog patches/10_smaller_syndaemon_timeout.patch patches/power-check-null-devices.patch patches/power-ignore-bad-dbus-requests.patch patches/revert_git_datetime_dropping.patch
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Sat May 19 06:39:55 UTC 2012
Author: biebl
Date: Sat May 19 06:39:55 2012
New Revision: 35041
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35041
Log:
Refresh patches.
Modified:
desktop/experimental/gnome-settings-daemon/debian/changelog
desktop/experimental/gnome-settings-daemon/debian/patches/10_smaller_syndaemon_timeout.patch
desktop/experimental/gnome-settings-daemon/debian/patches/power-check-null-devices.patch
desktop/experimental/gnome-settings-daemon/debian/patches/power-ignore-bad-dbus-requests.patch
desktop/experimental/gnome-settings-daemon/debian/patches/revert_git_datetime_dropping.patch
Modified: desktop/experimental/gnome-settings-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/changelog?rev=35041&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/changelog [utf-8] Sat May 19 06:39:55 2012
@@ -1,5 +1,6 @@
gnome-settings-daemon (3.4.2-1) UNRELEASED; urgency=low
+ [ Sjoerd Simons ]
* New upstream release
* debian/patches/01-xrandr-correct-the-type-of-the-rotation-parameter.patch:
+ Removed, fixed upstream
@@ -20,6 +21,9 @@
it (bgo: #674829)
+ debian/patches/revert_git_datetime_dropping.patch
- Added: Don't switch to systemd for datetime functionality just yet
+
+ [ Michael Biebl ]
+ * Refresh patches.
-- Sjoerd Simons <sjoerd at debian.org> Fri, 18 May 2012 22:10:13 +0200
Modified: desktop/experimental/gnome-settings-daemon/debian/patches/10_smaller_syndaemon_timeout.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/patches/10_smaller_syndaemon_timeout.patch?rev=35041&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/patches/10_smaller_syndaemon_timeout.patch [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/patches/10_smaller_syndaemon_timeout.patch [utf-8] Sat May 19 06:39:55 2012
@@ -1,8 +1,8 @@
-Index: gnome-settings-daemon-3.4.0/plugins/mouse/gsd-mouse-manager.c
+Index: gnome-settings-daemon-3.4.2/plugins/mouse/gsd-mouse-manager.c
===================================================================
---- gnome-settings-daemon-3.4.0.orig/plugins/mouse/gsd-mouse-manager.c 2012-03-29 21:36:09.471126670 +0200
-+++ gnome-settings-daemon-3.4.0/plugins/mouse/gsd-mouse-manager.c 2012-03-29 21:36:45.007128390 +0200
-@@ -540,7 +540,8 @@
+--- gnome-settings-daemon-3.4.2.orig/plugins/mouse/gsd-mouse-manager.c 2012-05-15 12:11:58.000000000 +0200
++++ gnome-settings-daemon-3.4.2/plugins/mouse/gsd-mouse-manager.c 2012-05-19 08:39:03.315704485 +0200
+@@ -552,7 +552,8 @@
args[2] = "2.0";
args[3] = "-K";
args[4] = "-R";
@@ -10,5 +10,5 @@
+ args[5] = "-t";
+ args[6] = NULL;
- if (!g_find_program_in_path (args[0]))
+ if (!have_program_in_path (args[0]))
return 0;
Modified: desktop/experimental/gnome-settings-daemon/debian/patches/power-check-null-devices.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/patches/power-check-null-devices.patch?rev=35041&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/patches/power-check-null-devices.patch [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/patches/power-check-null-devices.patch [utf-8] Sat May 19 06:39:55 2012
@@ -1,8 +1,8 @@
-Index: gnome-settings-daemon-3.4.1/plugins/power/gsd-power-manager.c
+Index: gnome-settings-daemon-3.4.2/plugins/power/gsd-power-manager.c
===================================================================
---- gnome-settings-daemon-3.4.1.orig/plugins/power/gsd-power-manager.c 2012-04-25 13:57:13.176001372 -0400
-+++ gnome-settings-daemon-3.4.1/plugins/power/gsd-power-manager.c 2012-04-25 16:24:40.153594415 -0400
-@@ -1161,7 +1161,7 @@
+--- gnome-settings-daemon-3.4.2.orig/plugins/power/gsd-power-manager.c 2012-05-15 12:14:49.000000000 +0200
++++ gnome-settings-daemon-3.4.2/plugins/power/gsd-power-manager.c 2012-05-19 08:39:11.423704404 +0200
+@@ -1160,7 +1160,7 @@
/* add to database */
array = up_client_get_devices (manager->priv->up_client);
Modified: desktop/experimental/gnome-settings-daemon/debian/patches/power-ignore-bad-dbus-requests.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/patches/power-ignore-bad-dbus-requests.patch?rev=35041&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/patches/power-ignore-bad-dbus-requests.patch [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/patches/power-ignore-bad-dbus-requests.patch [utf-8] Sat May 19 06:39:55 2012
@@ -1,8 +1,8 @@
-Index: gnome-settings-daemon-3.4.1/plugins/power/gsd-power-manager.c
+Index: gnome-settings-daemon-3.4.2/plugins/power/gsd-power-manager.c
===================================================================
---- gnome-settings-daemon-3.4.1.orig/plugins/power/gsd-power-manager.c 2012-04-25 16:53:47.385612908 -0400
-+++ gnome-settings-daemon-3.4.1/plugins/power/gsd-power-manager.c 2012-04-25 17:04:19.765619601 -0400
-@@ -4149,6 +4149,12 @@
+--- gnome-settings-daemon-3.4.2.orig/plugins/power/gsd-power-manager.c 2012-05-19 08:39:11.423704404 +0200
++++ gnome-settings-daemon-3.4.2/plugins/power/gsd-power-manager.c 2012-05-19 08:39:15.719704363 +0200
+@@ -4123,6 +4123,12 @@
{
GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
@@ -15,7 +15,7 @@
g_debug ("Calling method '%s.%s' for Power",
interface_name, method_name);
-@@ -4183,6 +4189,12 @@
+@@ -4157,6 +4163,12 @@
GsdPowerManager *manager = GSD_POWER_MANAGER (user_data);
GVariant *retval = NULL;
Modified: desktop/experimental/gnome-settings-daemon/debian/patches/revert_git_datetime_dropping.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/patches/revert_git_datetime_dropping.patch?rev=35041&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/patches/revert_git_datetime_dropping.patch [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/patches/revert_git_datetime_dropping.patch [utf-8] Sat May 19 06:39:55 2012
@@ -1,7 +1,7 @@
-Index: gnome-settings-daemon-3.3.91/configure.ac
+Index: gnome-settings-daemon-3.4.2/configure.ac
===================================================================
---- gnome-settings-daemon-3.3.91.orig/configure.ac 2012-03-05 21:04:12.925981066 +0100
-+++ gnome-settings-daemon-3.3.91/configure.ac 2012-03-05 21:04:16.265981228 +0100
+--- gnome-settings-daemon-3.4.2.orig/configure.ac 2012-05-15 12:14:49.000000000 +0200
++++ gnome-settings-daemon-3.4.2/configure.ac 2012-05-19 08:39:18.355704338 +0200
@@ -116,6 +116,24 @@
AC_SUBST(LIBNOTIFY_LIBS)
@@ -27,7 +27,7 @@
dnl - GUdev integration (default enabled)
dnl ---------------------------------------------------------------------------
GUDEV_PKG=""
-@@ -339,6 +357,42 @@
+@@ -313,6 +331,42 @@
# ---------------------------------------------------------------------------
@@ -70,7 +70,7 @@
# CUPS
# ---------------------------------------------------------------------------
-@@ -470,6 +524,7 @@
+@@ -444,6 +498,7 @@
plugins/color/Makefile
plugins/common/Makefile
plugins/cursor/Makefile
@@ -78,7 +78,7 @@
plugins/dummy/Makefile
plugins/power/Makefile
plugins/housekeeping/Makefile
-@@ -527,6 +582,8 @@
+@@ -501,6 +556,8 @@
cflags: ${CFLAGS}
Maintainer mode: ${USE_MAINTAINER_MODE}
@@ -87,10 +87,10 @@
Session tracking: ${SESSION_TRACKING}
LCMS DICT support: ${have_new_lcms}
-Index: gnome-settings-daemon-3.3.91/plugins/datetime/gsd-datetime-mechanism.c
+Index: gnome-settings-daemon-3.4.2/plugins/datetime/gsd-datetime-mechanism.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gnome-settings-daemon-3.3.91/plugins/datetime/gsd-datetime-mechanism.c 2012-03-05 21:04:13.049981072 +0100
++++ gnome-settings-daemon-3.4.2/plugins/datetime/gsd-datetime-mechanism.c 2012-05-19 08:39:18.359704337 +0200
@@ -0,0 +1,755 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@@ -847,10 +847,10 @@
+
+ return TRUE;
+}
-Index: gnome-settings-daemon-3.3.91/plugins/datetime/gsd-datetime-mechanism-debian.c
+Index: gnome-settings-daemon-3.4.2/plugins/datetime/gsd-datetime-mechanism-debian.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gnome-settings-daemon-3.3.91/plugins/datetime/gsd-datetime-mechanism-debian.c 2012-03-05 21:04:13.049981072 +0100
++++ gnome-settings-daemon-3.4.2/plugins/datetime/gsd-datetime-mechanism-debian.c 2012-05-19 08:39:18.359704337 +0200
@@ -0,0 +1,200 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@@ -1052,10 +1052,10 @@
+ }
+}
+
-Index: gnome-settings-daemon-3.3.91/plugins/datetime/gsd-datetime-mechanism-debian.h
+Index: gnome-settings-daemon-3.4.2/plugins/datetime/gsd-datetime-mechanism-debian.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gnome-settings-daemon-3.3.91/plugins/datetime/gsd-datetime-mechanism-debian.h 2012-03-05 21:04:13.049981072 +0100
++++ gnome-settings-daemon-3.4.2/plugins/datetime/gsd-datetime-mechanism-debian.h 2012-05-19 08:39:18.359704337 +0200
@@ -0,0 +1,27 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@@ -1084,10 +1084,10 @@
+gboolean _get_using_ntp_debian (DBusGMethodInvocation *context);
+gboolean _set_using_ntp_debian (DBusGMethodInvocation *context,
+ gboolean using_ntp);
-Index: gnome-settings-daemon-3.3.91/plugins/datetime/gsd-datetime-mechanism.h
+Index: gnome-settings-daemon-3.4.2/plugins/datetime/gsd-datetime-mechanism.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gnome-settings-daemon-3.3.91/plugins/datetime/gsd-datetime-mechanism.h 2012-03-05 21:04:13.053981072 +0100
++++ gnome-settings-daemon-3.4.2/plugins/datetime/gsd-datetime-mechanism.h 2012-05-19 08:39:18.359704337 +0200
@@ -0,0 +1,112 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@@ -1201,10 +1201,10 @@
+G_END_DECLS
+
+#endif /* GSD_DATETIME_MECHANISM_H */
-Index: gnome-settings-daemon-3.3.91/plugins/datetime/gsd-datetime-mechanism-main.c
+Index: gnome-settings-daemon-3.4.2/plugins/datetime/gsd-datetime-mechanism-main.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gnome-settings-daemon-3.3.91/plugins/datetime/gsd-datetime-mechanism-main.c 2012-03-05 21:04:13.053981072 +0100
++++ gnome-settings-daemon-3.4.2/plugins/datetime/gsd-datetime-mechanism-main.c 2012-05-19 08:39:18.359704337 +0200
@@ -0,0 +1,171 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
+ *
@@ -1377,10 +1377,10 @@
+out:
+ return ret;
+}
-Index: gnome-settings-daemon-3.3.91/plugins/datetime/gsd-datetime-mechanism.xml
+Index: gnome-settings-daemon-3.4.2/plugins/datetime/gsd-datetime-mechanism.xml
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gnome-settings-daemon-3.3.91/plugins/datetime/gsd-datetime-mechanism.xml 2012-03-05 21:04:13.053981072 +0100
++++ gnome-settings-daemon-3.4.2/plugins/datetime/gsd-datetime-mechanism.xml 2012-05-19 08:39:18.359704337 +0200
@@ -0,0 +1,129 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node name="/">
@@ -1511,10 +1511,10 @@
+ </method>
+ </interface>
+</node>
-Index: gnome-settings-daemon-3.3.91/plugins/datetime/Makefile.am
+Index: gnome-settings-daemon-3.4.2/plugins/datetime/Makefile.am
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gnome-settings-daemon-3.3.91/plugins/datetime/Makefile.am 2012-03-05 21:04:13.053981072 +0100
++++ gnome-settings-daemon-3.4.2/plugins/datetime/Makefile.am 2012-05-19 08:39:18.363704337 +0200
@@ -0,0 +1,68 @@
+plugin_name = datetime
+
@@ -1584,10 +1584,10 @@
+ org.gnome.SettingsDaemon.DateTimeMechanism.service \
+ org.gnome.settingsdaemon.datetimemechanism.policy \
+ $(BUILT_SOURCES)
-Index: gnome-settings-daemon-3.3.91/plugins/datetime/org.gnome.SettingsDaemon.DateTimeMechanism.conf
+Index: gnome-settings-daemon-3.4.2/plugins/datetime/org.gnome.SettingsDaemon.DateTimeMechanism.conf
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gnome-settings-daemon-3.3.91/plugins/datetime/org.gnome.SettingsDaemon.DateTimeMechanism.conf 2012-03-05 21:04:13.053981072 +0100
++++ gnome-settings-daemon-3.4.2/plugins/datetime/org.gnome.SettingsDaemon.DateTimeMechanism.conf 2012-05-19 08:39:18.363704337 +0200
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?> <!-- -*- XML -*- -->
+
@@ -1608,10 +1608,10 @@
+ </policy>
+
+</busconfig>
-Index: gnome-settings-daemon-3.3.91/plugins/datetime/org.gnome.settingsdaemon.datetimemechanism.policy.in
+Index: gnome-settings-daemon-3.4.2/plugins/datetime/org.gnome.settingsdaemon.datetimemechanism.policy.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gnome-settings-daemon-3.3.91/plugins/datetime/org.gnome.settingsdaemon.datetimemechanism.policy.in 2012-03-05 21:04:13.057981072 +0100
++++ gnome-settings-daemon-3.4.2/plugins/datetime/org.gnome.settingsdaemon.datetimemechanism.policy.in 2012-05-19 08:39:18.363704337 +0200
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE policyconfig PUBLIC
@@ -1634,19 +1634,19 @@
+ </action>
+
+</policyconfig>
-Index: gnome-settings-daemon-3.3.91/plugins/datetime/org.gnome.SettingsDaemon.DateTimeMechanism.service.in
+Index: gnome-settings-daemon-3.4.2/plugins/datetime/org.gnome.SettingsDaemon.DateTimeMechanism.service.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gnome-settings-daemon-3.3.91/plugins/datetime/org.gnome.SettingsDaemon.DateTimeMechanism.service.in 2012-03-05 21:04:13.057981072 +0100
++++ gnome-settings-daemon-3.4.2/plugins/datetime/org.gnome.SettingsDaemon.DateTimeMechanism.service.in 2012-05-19 08:39:18.363704337 +0200
@@ -0,0 +1,4 @@
+[D-BUS Service]
+Name=org.gnome.SettingsDaemon.DateTimeMechanism
+Exec=@LIBEXECDIR@/gsd-datetime-mechanism
+User=root
-Index: gnome-settings-daemon-3.3.91/plugins/datetime/system-timezone.c
+Index: gnome-settings-daemon-3.4.2/plugins/datetime/system-timezone.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gnome-settings-daemon-3.3.91/plugins/datetime/system-timezone.c 2012-03-05 21:04:13.057981072 +0100
++++ gnome-settings-daemon-3.4.2/plugins/datetime/system-timezone.c 2012-05-19 08:39:18.363704337 +0200
@@ -0,0 +1,924 @@
+/* System timezone handling
+ *
@@ -2572,10 +2572,10 @@
+
+ return ret;
+}
-Index: gnome-settings-daemon-3.3.91/plugins/datetime/system-timezone.h
+Index: gnome-settings-daemon-3.4.2/plugins/datetime/system-timezone.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gnome-settings-daemon-3.3.91/plugins/datetime/system-timezone.h 2012-03-05 21:04:13.061981072 +0100
++++ gnome-settings-daemon-3.4.2/plugins/datetime/system-timezone.h 2012-05-19 08:39:18.363704337 +0200
@@ -0,0 +1,80 @@
+/* System timezone handling
+ *
@@ -2657,10 +2657,10 @@
+
+G_END_DECLS
+#endif /* __SYSTEM_TIMEZONE_H__ */
-Index: gnome-settings-daemon-3.3.91/plugins/datetime/test-system-timezone.c
+Index: gnome-settings-daemon-3.4.2/plugins/datetime/test-system-timezone.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gnome-settings-daemon-3.3.91/plugins/datetime/test-system-timezone.c 2012-03-05 21:04:13.061981072 +0100
++++ gnome-settings-daemon-3.4.2/plugins/datetime/test-system-timezone.c 2012-05-19 08:39:18.367704338 +0200
@@ -0,0 +1,93 @@
+/* Test for system timezone handling
+ *
@@ -2755,10 +2755,10 @@
+
+ return retval;
+}
-Index: gnome-settings-daemon-3.3.91/plugins/Makefile.am
+Index: gnome-settings-daemon-3.4.2/plugins/Makefile.am
===================================================================
---- gnome-settings-daemon-3.3.91.orig/plugins/Makefile.am 2012-02-01 20:33:14.000000000 +0100
-+++ gnome-settings-daemon-3.3.91/plugins/Makefile.am 2012-03-05 21:04:16.345981231 +0100
+--- gnome-settings-daemon-3.4.2.orig/plugins/Makefile.am 2012-05-15 12:14:49.000000000 +0200
++++ gnome-settings-daemon-3.4.2/plugins/Makefile.am 2012-05-19 08:39:18.367704338 +0200
@@ -8,6 +8,7 @@
clipboard \
color \
More information about the pkg-gnome-commits
mailing list