r20161 - in /desktop/unstable/gnome-settings-daemon/debian: changelog patches/20_gstreamer.patch patches/70_relibtoolize.patch
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Fri May 29 09:48:54 UTC 2009
Author: joss
Date: Fri May 29 09:48:54 2009
New Revision: 20161
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20161
Log:
20_gstreamer.patch: install the plugin although pulse is disabled.
Modified:
desktop/unstable/gnome-settings-daemon/debian/changelog
desktop/unstable/gnome-settings-daemon/debian/patches/20_gstreamer.patch
desktop/unstable/gnome-settings-daemon/debian/patches/70_relibtoolize.patch
Modified: desktop/unstable/gnome-settings-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/changelog?rev=20161&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/changelog (original)
+++ desktop/unstable/gnome-settings-daemon/debian/changelog Fri May 29 09:48:54 2009
@@ -1,6 +1,7 @@
gnome-settings-daemon (2.26.1-1) unstable; urgency=low
* New upstream release.
+ + 20_gstreamer.patch: install the plugin although pulse is disabled.
+ Refresh 70_relibtoolize.patch.
* Move the autostart file to /usr/share/gnome/autostart.
* gnome-settings-daemon.postinst:
Modified: desktop/unstable/gnome-settings-daemon/debian/patches/20_gstreamer.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/patches/20_gstreamer.patch?rev=20161&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/patches/20_gstreamer.patch (original)
+++ desktop/unstable/gnome-settings-daemon/debian/patches/20_gstreamer.patch Fri May 29 09:48:54 2009
@@ -8,10 +8,10 @@
plugins/media-keys/gsd-media-keys-manager.c | 101 ++++++-
6 files changed, 645 insertions(+), 22 deletions(-)
-Index: gnome-settings-daemon-2.26.0/configure.ac
+Index: gnome-settings-daemon-2.26.1/configure.ac
===================================================================
---- gnome-settings-daemon-2.26.0.orig/configure.ac 2009-04-11 14:20:21.234052846 +0200
-+++ gnome-settings-daemon-2.26.0/configure.ac 2009-04-12 19:45:11.641975223 +0200
+--- gnome-settings-daemon-2.26.1.orig/configure.ac 2009-05-29 11:46:55.273106402 +0200
++++ gnome-settings-daemon-2.26.1/configure.ac 2009-05-29 11:46:57.029605209 +0200
@@ -255,11 +255,54 @@ if test x$WANT_PULSE = xyes ; then
AC_DEFINE(HAVE_PULSE, 1, [Define if PULSE sound server should be used])],
[have_pulse=false])
@@ -83,10 +83,10 @@
PulseAudio support: ${have_pulse}
Profiling support: ${enable_profiling}
"
-Index: gnome-settings-daemon-2.26.0/plugins/media-keys/Makefile.am
+Index: gnome-settings-daemon-2.26.1/plugins/media-keys/Makefile.am
===================================================================
---- gnome-settings-daemon-2.26.0.orig/plugins/media-keys/Makefile.am 2009-03-16 15:35:38.000000000 +0100
-+++ gnome-settings-daemon-2.26.0/plugins/media-keys/Makefile.am 2009-04-11 14:20:22.274551290 +0200
+--- gnome-settings-daemon-2.26.1.orig/plugins/media-keys/Makefile.am 2009-05-29 11:46:55.221109148 +0200
++++ gnome-settings-daemon-2.26.1/plugins/media-keys/Makefile.am 2009-05-29 11:47:08.515406259 +0200
@@ -1,11 +1,12 @@
NULL =
@@ -110,15 +110,24 @@
-DPIXMAPDIR=\""$(pkgdatadir)"\" \
-DGLADEDIR=\""$(pkgdatadir)"\" \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
-@@ -55,7 +55,6 @@ libmedia_keys_la_LDFLAGS = \
+@@ -54,16 +54,13 @@ libmedia_keys_la_LDFLAGS = \
+
libmedia_keys_la_LIBADD = \
- $(top_builddir)/gnome-settings-daemon/libgsd-plugins.la \
$(top_builddir)/plugins/common/libcommon.la \
- $(top_builddir)/plugins/media-keys/cut-n-paste/libgvc.la \
$(SETTINGS_PLUGIN_LIBS) \
$(XF86MISC_LIBS)
-@@ -77,7 +76,6 @@ test_media_window_SOURCES = \
+ plugin_in_files = \
+ media-keys.gnome-settings-plugin.in
+
+-if HAVE_PULSE
+ plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
+-endif
+
+ noinst_PROGRAMS = \
+ test-media-keys \
+@@ -78,7 +75,6 @@ test_media_window_SOURCES = \
test_media_window_CPPFLAGS = \
-I$(top_srcdir)/gnome-settings-daemon \
@@ -126,7 +135,7 @@
-DPIXMAPDIR=\""$(pkgdatadir)"\" \
-DGLADEDIR=\""$(pkgdatadir)"\" \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
-@@ -105,7 +103,6 @@ test_media_keys_SOURCES = \
+@@ -106,7 +102,6 @@ test_media_keys_SOURCES = \
test_media_keys_CPPFLAGS = \
-I$(top_srcdir)/gnome-settings-daemon \
-I$(top_srcdir)/plugins/common \
@@ -134,7 +143,7 @@
-DPIXMAPDIR=\""$(pkgdatadir)"\" \
-DGLADEDIR=\""$(pkgdatadir)"\" \
-DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \
-@@ -124,7 +121,17 @@ test_media_keys_LDADD = \
+@@ -125,7 +120,17 @@ test_media_keys_LDADD = \
$(GST_LIBS)
if HAVE_PULSE
@@ -152,7 +161,7 @@
endif
gladedir = $(pkgdatadir)
-@@ -137,7 +144,11 @@ pixmaps_DATA = \
+@@ -138,7 +143,11 @@ pixmaps_DATA = \
acme-eject.png \
$(NULL)
@@ -164,10 +173,10 @@
EXTRA_DIST = \
gsd-media-keys-manager.xml \
-Index: gnome-settings-daemon-2.26.0/plugins/media-keys/actions/Makefile.am
+Index: gnome-settings-daemon-2.26.1/plugins/media-keys/actions/Makefile.am
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gnome-settings-daemon-2.26.0/plugins/media-keys/actions/Makefile.am 2009-04-11 14:20:22.274551290 +0200
++++ gnome-settings-daemon-2.26.1/plugins/media-keys/actions/Makefile.am 2009-05-29 11:46:57.033605299 +0200
@@ -0,0 +1,44 @@
+NULL =
+
@@ -213,10 +222,10 @@
+ $(glade_DATA) \
+ $(pixmaps_DATA) \
+ $(NULL)
-Index: gnome-settings-daemon-2.26.0/plugins/media-keys/actions/acme-volume.c
+Index: gnome-settings-daemon-2.26.1/plugins/media-keys/actions/acme-volume.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gnome-settings-daemon-2.26.0/plugins/media-keys/actions/acme-volume.c 2009-04-11 14:20:22.274551290 +0200
++++ gnome-settings-daemon-2.26.1/plugins/media-keys/actions/acme-volume.c 2009-05-29 11:46:57.033605299 +0200
@@ -0,0 +1,402 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+
@@ -620,10 +629,10 @@
+ return ACME_VOLUME(acme_volume_object);
+}
+
-Index: gnome-settings-daemon-2.26.0/plugins/media-keys/actions/acme-volume.h
+Index: gnome-settings-daemon-2.26.1/plugins/media-keys/actions/acme-volume.h
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gnome-settings-daemon-2.26.0/plugins/media-keys/actions/acme-volume.h 2009-04-11 14:20:22.274551290 +0200
++++ gnome-settings-daemon-2.26.1/plugins/media-keys/actions/acme-volume.h 2009-05-29 11:46:57.033605299 +0200
@@ -0,0 +1,56 @@
+/* acme-volume.h
+
@@ -681,10 +690,10 @@
+gint acme_volume_get_threshold (AcmeVolume *self);
+
+
-Index: gnome-settings-daemon-2.26.0/plugins/media-keys/gsd-media-keys-manager.c
+Index: gnome-settings-daemon-2.26.1/plugins/media-keys/gsd-media-keys-manager.c
===================================================================
---- gnome-settings-daemon-2.26.0.orig/plugins/media-keys/gsd-media-keys-manager.c 2009-04-11 14:20:21.722555087 +0200
-+++ gnome-settings-daemon-2.26.0/plugins/media-keys/gsd-media-keys-manager.c 2009-04-12 19:46:01.037977228 +0200
+--- gnome-settings-daemon-2.26.1.orig/plugins/media-keys/gsd-media-keys-manager.c 2009-05-29 11:46:55.045109131 +0200
++++ gnome-settings-daemon-2.26.1/plugins/media-keys/gsd-media-keys-manager.c 2009-05-29 11:46:57.041608411 +0200
@@ -48,11 +48,12 @@
#include "eggaccelerators.h"
Modified: desktop/unstable/gnome-settings-daemon/debian/patches/70_relibtoolize.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/patches/70_relibtoolize.patch?rev=20161&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/patches/70_relibtoolize.patch (original)
+++ desktop/unstable/gnome-settings-daemon/debian/patches/70_relibtoolize.patch Fri May 29 09:48:54 2009
@@ -7,8 +7,8 @@
Index: gnome-settings-daemon-2.26.1/aclocal.m4
===================================================================
---- gnome-settings-daemon-2.26.1.orig/aclocal.m4 2009-04-14 19:46:41.000000000 +0200
-+++ gnome-settings-daemon-2.26.1/aclocal.m4 2009-05-29 11:21:38.389605435 +0200
+--- gnome-settings-daemon-2.26.1.orig/aclocal.m4 2009-05-29 11:46:50.321105247 +0200
++++ gnome-settings-daemon-2.26.1/aclocal.m4 2009-05-29 11:47:14.409609366 +0200
@@ -1,4 +1,4 @@
-# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.10.2 -*- Autoconf -*-
@@ -11874,8 +11874,8 @@
# -------------------------------------------
Index: gnome-settings-daemon-2.26.1/config.guess
===================================================================
---- gnome-settings-daemon-2.26.1.orig/config.guess 2009-03-27 21:49:15.000000000 +0100
-+++ gnome-settings-daemon-2.26.1/config.guess 2009-05-29 11:21:40.285603806 +0200
+--- gnome-settings-daemon-2.26.1.orig/config.guess 2009-05-29 11:46:50.293104131 +0200
++++ gnome-settings-daemon-2.26.1/config.guess 2009-05-29 11:47:44.177605862 +0200
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
# Free Software Foundation, Inc.
@@ -12011,8 +12011,8 @@
send the following data and any information you think might be
Index: gnome-settings-daemon-2.26.1/config.h.in
===================================================================
---- gnome-settings-daemon-2.26.1.orig/config.h.in 2009-04-14 19:48:16.000000000 +0200
-+++ gnome-settings-daemon-2.26.1/config.h.in 2009-05-29 11:21:44.173604655 +0200
+--- gnome-settings-daemon-2.26.1.orig/config.h.in 2009-05-29 11:46:50.281105818 +0200
++++ gnome-settings-daemon-2.26.1/config.h.in 2009-05-29 11:47:14.413606522 +0200
@@ -24,6 +24,9 @@
/* Define if the GNU gettext() function is already present or preinstalled. */
#undef HAVE_GETTEXT
@@ -12036,8 +12036,8 @@
Index: gnome-settings-daemon-2.26.1/configure
===================================================================
---- gnome-settings-daemon-2.26.1.orig/configure 2009-04-14 19:47:20.000000000 +0200
-+++ gnome-settings-daemon-2.26.1/configure 2009-05-29 11:21:45.189101805 +0200
+--- gnome-settings-daemon-2.26.1.orig/configure 2009-05-29 11:46:50.265103994 +0200
++++ gnome-settings-daemon-2.26.1/configure 2009-05-29 11:47:48.901601445 +0200
@@ -577,22 +577,22 @@ as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr
# Check that we are running under the correct shell.
SHELL=${CONFIG_SHELL-/bin/sh}
@@ -49957,8 +49957,8 @@
"
Index: gnome-settings-daemon-2.26.1/data/Makefile.in
===================================================================
---- gnome-settings-daemon-2.26.1.orig/data/Makefile.in 2009-04-14 19:46:53.000000000 +0200
-+++ gnome-settings-daemon-2.26.1/data/Makefile.in 2009-05-29 11:21:40.529602915 +0200
+--- gnome-settings-daemon-2.26.1.orig/data/Makefile.in 2009-05-29 11:46:50.253106169 +0200
++++ gnome-settings-daemon-2.26.1/data/Makefile.in 2009-05-29 11:47:44.381602113 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -50073,8 +50073,8 @@
done; \
Index: gnome-settings-daemon-2.26.1/gnome-settings-daemon/Makefile.in
===================================================================
---- gnome-settings-daemon-2.26.1.orig/gnome-settings-daemon/Makefile.in 2009-04-14 19:46:53.000000000 +0200
-+++ gnome-settings-daemon-2.26.1/gnome-settings-daemon/Makefile.in 2009-05-29 11:21:40.741603729 +0200
+--- gnome-settings-daemon-2.26.1.orig/gnome-settings-daemon/Makefile.in 2009-05-29 11:46:50.237106788 +0200
++++ gnome-settings-daemon-2.26.1/gnome-settings-daemon/Makefile.in 2009-05-29 11:47:44.589603346 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -50198,8 +50198,8 @@
tags: TAGS
Index: gnome-settings-daemon-2.26.1/ltmain.sh
===================================================================
---- gnome-settings-daemon-2.26.1.orig/ltmain.sh 2008-08-30 00:27:25.000000000 +0200
-+++ gnome-settings-daemon-2.26.1/ltmain.sh 2009-05-29 11:21:29.881608396 +0200
+--- gnome-settings-daemon-2.26.1.orig/ltmain.sh 2009-05-29 11:46:50.221108385 +0200
++++ gnome-settings-daemon-2.26.1/ltmain.sh 2009-05-29 11:47:34.389600263 +0200
@@ -1,52 +1,83 @@
-# ltmain.sh - Provide generalized library-building support services.
-# NOTE: Changing this file will not affect anything until you rerun configure.
@@ -64406,8 +64406,8 @@
+
Index: gnome-settings-daemon-2.26.1/Makefile.in
===================================================================
---- gnome-settings-daemon-2.26.1.orig/Makefile.in 2009-04-14 19:47:10.000000000 +0200
-+++ gnome-settings-daemon-2.26.1/Makefile.in 2009-05-29 11:21:43.809602388 +0200
+--- gnome-settings-daemon-2.26.1.orig/Makefile.in 2009-05-29 11:46:50.209107140 +0200
++++ gnome-settings-daemon-2.26.1/Makefile.in 2009-05-29 11:47:47.457602422 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -64529,8 +64529,8 @@
tags: TAGS
Index: gnome-settings-daemon-2.26.1/plugins/a11y-keyboard/Makefile.in
===================================================================
---- gnome-settings-daemon-2.26.1.orig/plugins/a11y-keyboard/Makefile.in 2009-04-14 19:46:55.000000000 +0200
-+++ gnome-settings-daemon-2.26.1/plugins/a11y-keyboard/Makefile.in 2009-05-29 11:21:41.137605741 +0200
+--- gnome-settings-daemon-2.26.1.orig/plugins/a11y-keyboard/Makefile.in 2009-05-29 11:46:50.197105406 +0200
++++ gnome-settings-daemon-2.26.1/plugins/a11y-keyboard/Makefile.in 2009-05-29 11:47:44.829602347 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -64654,8 +64654,8 @@
tags: TAGS
Index: gnome-settings-daemon-2.26.1/plugins/background/Makefile.in
===================================================================
---- gnome-settings-daemon-2.26.1.orig/plugins/background/Makefile.in 2009-04-14 19:46:56.000000000 +0200
-+++ gnome-settings-daemon-2.26.1/plugins/background/Makefile.in 2009-05-29 11:21:41.281605044 +0200
+--- gnome-settings-daemon-2.26.1.orig/plugins/background/Makefile.in 2009-05-29 11:46:50.181106027 +0200
++++ gnome-settings-daemon-2.26.1/plugins/background/Makefile.in 2009-05-29 11:47:44.981605264 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -64779,8 +64779,8 @@
tags: TAGS
Index: gnome-settings-daemon-2.26.1/plugins/clipboard/Makefile.in
===================================================================
---- gnome-settings-daemon-2.26.1.orig/plugins/clipboard/Makefile.in 2009-04-14 19:46:56.000000000 +0200
-+++ gnome-settings-daemon-2.26.1/plugins/clipboard/Makefile.in 2009-05-29 11:21:41.413602622 +0200
+--- gnome-settings-daemon-2.26.1.orig/plugins/clipboard/Makefile.in 2009-05-29 11:46:50.165105670 +0200
++++ gnome-settings-daemon-2.26.1/plugins/clipboard/Makefile.in 2009-05-29 11:47:45.117603411 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -64904,8 +64904,8 @@
tags: TAGS
Index: gnome-settings-daemon-2.26.1/plugins/common/Makefile.in
===================================================================
---- gnome-settings-daemon-2.26.1.orig/plugins/common/Makefile.in 2009-04-14 19:46:57.000000000 +0200
-+++ gnome-settings-daemon-2.26.1/plugins/common/Makefile.in 2009-05-29 11:21:41.529603753 +0200
+--- gnome-settings-daemon-2.26.1.orig/plugins/common/Makefile.in 2009-05-29 11:46:50.149107270 +0200
++++ gnome-settings-daemon-2.26.1/plugins/common/Makefile.in 2009-05-29 11:47:45.233603061 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -65029,8 +65029,8 @@
tags: TAGS
Index: gnome-settings-daemon-2.26.1/plugins/dummy/Makefile.in
===================================================================
---- gnome-settings-daemon-2.26.1.orig/plugins/dummy/Makefile.in 2009-04-14 19:46:57.000000000 +0200
-+++ gnome-settings-daemon-2.26.1/plugins/dummy/Makefile.in 2009-05-29 11:21:41.653602115 +0200
+--- gnome-settings-daemon-2.26.1.orig/plugins/dummy/Makefile.in 2009-05-29 11:46:50.133106425 +0200
++++ gnome-settings-daemon-2.26.1/plugins/dummy/Makefile.in 2009-05-29 11:47:45.353602324 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -65154,8 +65154,8 @@
tags: TAGS
Index: gnome-settings-daemon-2.26.1/plugins/font/Makefile.in
===================================================================
---- gnome-settings-daemon-2.26.1.orig/plugins/font/Makefile.in 2009-04-14 19:46:58.000000000 +0200
-+++ gnome-settings-daemon-2.26.1/plugins/font/Makefile.in 2009-05-29 11:21:41.785603108 +0200
+--- gnome-settings-daemon-2.26.1.orig/plugins/font/Makefile.in 2009-05-29 11:46:50.121107625 +0200
++++ gnome-settings-daemon-2.26.1/plugins/font/Makefile.in 2009-05-29 11:47:45.481602261 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -65279,8 +65279,8 @@
tags: TAGS
Index: gnome-settings-daemon-2.26.1/plugins/housekeeping/Makefile.in
===================================================================
---- gnome-settings-daemon-2.26.1.orig/plugins/housekeeping/Makefile.in 2009-04-14 19:46:59.000000000 +0200
-+++ gnome-settings-daemon-2.26.1/plugins/housekeeping/Makefile.in 2009-05-29 11:21:41.913603530 +0200
+--- gnome-settings-daemon-2.26.1.orig/plugins/housekeeping/Makefile.in 2009-05-29 11:46:50.105104825 +0200
++++ gnome-settings-daemon-2.26.1/plugins/housekeeping/Makefile.in 2009-05-29 11:47:45.613602274 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -65404,8 +65404,8 @@
tags: TAGS
Index: gnome-settings-daemon-2.26.1/plugins/keybindings/Makefile.in
===================================================================
---- gnome-settings-daemon-2.26.1.orig/plugins/keybindings/Makefile.in 2009-04-14 19:46:59.000000000 +0200
-+++ gnome-settings-daemon-2.26.1/plugins/keybindings/Makefile.in 2009-05-29 11:21:42.041603463 +0200
+--- gnome-settings-daemon-2.26.1.orig/plugins/keybindings/Makefile.in 2009-05-29 11:46:50.077607757 +0200
++++ gnome-settings-daemon-2.26.1/plugins/keybindings/Makefile.in 2009-05-29 11:47:45.741601703 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -65529,8 +65529,8 @@
tags: TAGS
Index: gnome-settings-daemon-2.26.1/plugins/keyboard/Makefile.in
===================================================================
---- gnome-settings-daemon-2.26.1.orig/plugins/keyboard/Makefile.in 2009-04-14 19:47:00.000000000 +0200
-+++ gnome-settings-daemon-2.26.1/plugins/keyboard/Makefile.in 2009-05-29 11:21:42.185605691 +0200
+--- gnome-settings-daemon-2.26.1.orig/plugins/keyboard/Makefile.in 2009-05-29 11:46:50.061604955 +0200
++++ gnome-settings-daemon-2.26.1/plugins/keyboard/Makefile.in 2009-05-29 11:47:45.885602482 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -65654,8 +65654,8 @@
tags: TAGS
Index: gnome-settings-daemon-2.26.1/plugins/Makefile.in
===================================================================
---- gnome-settings-daemon-2.26.1.orig/plugins/Makefile.in 2009-04-14 19:46:54.000000000 +0200
-+++ gnome-settings-daemon-2.26.1/plugins/Makefile.in 2009-05-29 11:21:40.857602414 +0200
+--- gnome-settings-daemon-2.26.1.orig/plugins/Makefile.in 2009-05-29 11:46:50.045605087 +0200
++++ gnome-settings-daemon-2.26.1/plugins/Makefile.in 2009-05-29 11:47:44.677601881 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -65780,7 +65780,7 @@
Index: gnome-settings-daemon-2.26.1/plugins/media-keys/actions/Makefile.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ gnome-settings-daemon-2.26.1/plugins/media-keys/actions/Makefile.in 2009-05-29 11:21:42.521602457 +0200
++++ gnome-settings-daemon-2.26.1/plugins/media-keys/actions/Makefile.in 2009-05-29 11:47:46.217604030 +0200
@@ -0,0 +1,598 @@
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# @configure_input@
@@ -66382,8 +66382,8 @@
+.NOEXPORT:
Index: gnome-settings-daemon-2.26.1/plugins/media-keys/cut-n-paste/Makefile.in
===================================================================
---- gnome-settings-daemon-2.26.1.orig/plugins/media-keys/cut-n-paste/Makefile.in 2009-04-14 19:47:02.000000000 +0200
-+++ gnome-settings-daemon-2.26.1/plugins/media-keys/cut-n-paste/Makefile.in 2009-05-29 11:21:42.637603576 +0200
+--- gnome-settings-daemon-2.26.1.orig/plugins/media-keys/cut-n-paste/Makefile.in 2009-05-29 11:46:50.017607395 +0200
++++ gnome-settings-daemon-2.26.1/plugins/media-keys/cut-n-paste/Makefile.in 2009-05-29 11:47:46.325602536 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -66507,8 +66507,8 @@
tags: TAGS
Index: gnome-settings-daemon-2.26.1/plugins/media-keys/Makefile.in
===================================================================
---- gnome-settings-daemon-2.26.1.orig/plugins/media-keys/Makefile.in 2009-04-14 19:47:01.000000000 +0200
-+++ gnome-settings-daemon-2.26.1/plugins/media-keys/Makefile.in 2009-05-29 11:21:42.393602522 +0200
+--- gnome-settings-daemon-2.26.1.orig/plugins/media-keys/Makefile.in 2009-05-29 11:46:49.989604813 +0200
++++ gnome-settings-daemon-2.26.1/plugins/media-keys/Makefile.in 2009-05-29 11:47:46.089604114 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -66703,7 +66703,7 @@
libmedia_keys_la_CFLAGS = \
$(SETTINGS_PLUGIN_CFLAGS) \
$(AM_CFLAGS)
-@@ -357,12 +352,9 @@ libmedia_keys_la_CFLAGS = \
+@@ -357,30 +352,23 @@ libmedia_keys_la_CFLAGS = \
libmedia_keys_la_LDFLAGS = \
$(GSD_PLUGIN_LDFLAGS)
@@ -66719,7 +66719,11 @@
plugin_in_files = \
media-keys.gnome-settings-plugin.in
-@@ -373,14 +365,10 @@ test_media_window_SOURCES = \
+- at HAVE_PULSE_TRUE@plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
++plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin)
+ test_media_window_SOURCES = \
+ gsd-media-keys-window.c \
+ gsd-media-keys-window.h \
test-media-window.c \
$(NULL)
@@ -66809,8 +66813,8 @@
tags: TAGS
Index: gnome-settings-daemon-2.26.1/plugins/mouse/Makefile.in
===================================================================
---- gnome-settings-daemon-2.26.1.orig/plugins/mouse/Makefile.in 2009-04-14 19:47:03.000000000 +0200
-+++ gnome-settings-daemon-2.26.1/plugins/mouse/Makefile.in 2009-05-29 11:21:42.773602700 +0200
+--- gnome-settings-daemon-2.26.1.orig/plugins/mouse/Makefile.in 2009-05-29 11:46:49.969604365 +0200
++++ gnome-settings-daemon-2.26.1/plugins/mouse/Makefile.in 2009-05-29 11:47:46.457602562 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -66934,8 +66938,8 @@
tags: TAGS
Index: gnome-settings-daemon-2.26.1/plugins/screensaver/Makefile.in
===================================================================
---- gnome-settings-daemon-2.26.1.orig/plugins/screensaver/Makefile.in 2009-04-14 19:47:04.000000000 +0200
-+++ gnome-settings-daemon-2.26.1/plugins/screensaver/Makefile.in 2009-05-29 11:21:42.913602902 +0200
+--- gnome-settings-daemon-2.26.1.orig/plugins/screensaver/Makefile.in 2009-05-29 11:46:49.953608407 +0200
++++ gnome-settings-daemon-2.26.1/plugins/screensaver/Makefile.in 2009-05-29 11:47:46.585603466 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -67059,8 +67063,8 @@
tags: TAGS
Index: gnome-settings-daemon-2.26.1/plugins/sound/Makefile.in
===================================================================
---- gnome-settings-daemon-2.26.1.orig/plugins/sound/Makefile.in 2009-04-14 19:47:05.000000000 +0200
-+++ gnome-settings-daemon-2.26.1/plugins/sound/Makefile.in 2009-05-29 11:21:43.037602745 +0200
+--- gnome-settings-daemon-2.26.1.orig/plugins/sound/Makefile.in 2009-05-29 11:46:49.925606801 +0200
++++ gnome-settings-daemon-2.26.1/plugins/sound/Makefile.in 2009-05-29 11:47:46.709602315 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -67184,8 +67188,8 @@
tags: TAGS
Index: gnome-settings-daemon-2.26.1/plugins/typing-break/Makefile.in
===================================================================
---- gnome-settings-daemon-2.26.1.orig/plugins/typing-break/Makefile.in 2009-04-14 19:47:05.000000000 +0200
-+++ gnome-settings-daemon-2.26.1/plugins/typing-break/Makefile.in 2009-05-29 11:21:43.169603239 +0200
+--- gnome-settings-daemon-2.26.1.orig/plugins/typing-break/Makefile.in 2009-05-29 11:46:49.909608886 +0200
++++ gnome-settings-daemon-2.26.1/plugins/typing-break/Makefile.in 2009-05-29 11:47:46.841606247 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -67309,8 +67313,8 @@
tags: TAGS
Index: gnome-settings-daemon-2.26.1/plugins/xrandr/Makefile.in
===================================================================
---- gnome-settings-daemon-2.26.1.orig/plugins/xrandr/Makefile.in 2009-04-14 19:47:06.000000000 +0200
-+++ gnome-settings-daemon-2.26.1/plugins/xrandr/Makefile.in 2009-05-29 11:21:43.301603745 +0200
+--- gnome-settings-daemon-2.26.1.orig/plugins/xrandr/Makefile.in 2009-05-29 11:46:49.897606172 +0200
++++ gnome-settings-daemon-2.26.1/plugins/xrandr/Makefile.in 2009-05-29 11:47:46.969604716 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -67434,8 +67438,8 @@
tags: TAGS
Index: gnome-settings-daemon-2.26.1/plugins/xrdb/data/Makefile.in
===================================================================
---- gnome-settings-daemon-2.26.1.orig/plugins/xrdb/data/Makefile.in 2009-04-14 19:47:07.000000000 +0200
-+++ gnome-settings-daemon-2.26.1/plugins/xrdb/data/Makefile.in 2009-05-29 11:21:43.545602364 +0200
+--- gnome-settings-daemon-2.26.1.orig/plugins/xrdb/data/Makefile.in 2009-05-29 11:46:49.873604656 +0200
++++ gnome-settings-daemon-2.26.1/plugins/xrdb/data/Makefile.in 2009-05-29 11:47:47.185603177 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -67550,8 +67554,8 @@
done; \
Index: gnome-settings-daemon-2.26.1/plugins/xrdb/Makefile.in
===================================================================
---- gnome-settings-daemon-2.26.1.orig/plugins/xrdb/Makefile.in 2009-04-14 19:47:07.000000000 +0200
-+++ gnome-settings-daemon-2.26.1/plugins/xrdb/Makefile.in 2009-05-29 11:21:43.437602881 +0200
+--- gnome-settings-daemon-2.26.1.orig/plugins/xrdb/Makefile.in 2009-05-29 11:46:49.841605407 +0200
++++ gnome-settings-daemon-2.26.1/plugins/xrdb/Makefile.in 2009-05-29 11:47:47.097603664 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
@@ -67675,8 +67679,8 @@
tags: TAGS
Index: gnome-settings-daemon-2.26.1/plugins/xsettings/Makefile.in
===================================================================
---- gnome-settings-daemon-2.26.1.orig/plugins/xsettings/Makefile.in 2009-04-14 19:47:09.000000000 +0200
-+++ gnome-settings-daemon-2.26.1/plugins/xsettings/Makefile.in 2009-05-29 11:21:43.689603127 +0200
+--- gnome-settings-daemon-2.26.1.orig/plugins/xsettings/Makefile.in 2009-05-29 11:46:49.817603404 +0200
++++ gnome-settings-daemon-2.26.1/plugins/xsettings/Makefile.in 2009-05-29 11:47:47.337603154 +0200
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.10.1 from Makefile.am.
+# Makefile.in generated by automake 1.10.2 from Makefile.am.
More information about the pkg-gnome-commits
mailing list