r52584 - in /desktop/experimental/gnome-settings-daemon/debian: ./ patches/
bigon at users.alioth.debian.org
bigon at users.alioth.debian.org
Wed Jul 5 19:53:23 UTC 2017
Author: bigon
Date: Wed Jul 5 19:53:22 2017
New Revision: 52584
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=52584
Log:
* New upstream release.
- debian/control.in: Adjust the {build-}dependencies
- Drop d/p/media-keys-Fix-mmkeys-D-Bus-API-to-match-API-docs.patch:
applied upstream
* debian/control.in: Bump Standards-Version to 4.0.0 (no further changes)
* d/p/color-Make-the-testcase-able-to-run-uninstalled.patch: Fix the tests
* debian/gnome-settings-daemon.maintscript: Remove
/etc/xdg/autostart/gnome-settings-daemon.desktop during the upgrade
* debian/rules: Explicitly remove the .la files instead of ignoring them in
dh_install call
Added:
desktop/experimental/gnome-settings-daemon/debian/patches/color-Make-the-testcase-able-to-run-uninstalled.patch
Removed:
desktop/experimental/gnome-settings-daemon/debian/patches/media-keys-Fix-mmkeys-D-Bus-API-to-match-API-docs.patch
Modified:
desktop/experimental/gnome-settings-daemon/debian/changelog
desktop/experimental/gnome-settings-daemon/debian/control
desktop/experimental/gnome-settings-daemon/debian/control.in
desktop/experimental/gnome-settings-daemon/debian/gnome-settings-daemon.install
desktop/experimental/gnome-settings-daemon/debian/gnome-settings-daemon.maintscript
desktop/experimental/gnome-settings-daemon/debian/patches/series
desktop/experimental/gnome-settings-daemon/debian/rules
Modified: desktop/experimental/gnome-settings-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/changelog?rev=52584&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/changelog [utf-8] Wed Jul 5 19:53:22 2017
@@ -1,3 +1,18 @@
+gnome-settings-daemon (3.24.2-1) UNRELEASED; urgency=medium
+
+ * New upstream release.
+ - debian/control.in: Adjust the {build-}dependencies
+ - Drop d/p/media-keys-Fix-mmkeys-D-Bus-API-to-match-API-docs.patch:
+ applied upstream
+ * debian/control.in: Bump Standards-Version to 4.0.0 (no further changes)
+ * d/p/color-Make-the-testcase-able-to-run-uninstalled.patch: Fix the tests
+ * debian/gnome-settings-daemon.maintscript: Remove
+ /etc/xdg/autostart/gnome-settings-daemon.desktop during the upgrade
+ * debian/rules: Explicitly remove the .la files instead of ignoring them in
+ dh_install call
+
+ -- Laurent Bigonville <bigon at debian.org> Wed, 05 Jul 2017 21:32:58 +0200
+
gnome-settings-daemon (3.22.2-4) unstable; urgency=medium
* debian/control.in: Add udev to the build-dependencies to fix the tests
Modified: desktop/experimental/gnome-settings-daemon/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/control?rev=52584&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/control [utf-8] Wed Jul 5 19:53:22 2017
@@ -13,7 +13,7 @@
dh-exec,
intltool (>= 0.37.1),
libasound2-dev [linux-any],
- libglib2.0-dev (>= 2.37.7),
+ libglib2.0-dev (>= 2.44.0),
libgtk-3-dev (>= 3.16),
libnm-dev (>= 1.0) [linux-any],
libnotify-dev (>= 0.7.3),
@@ -24,7 +24,7 @@
libxext-dev,
libx11-dev,
libibus-1.0-dev (>= 1.5.2),
- gsettings-desktop-schemas-dev (>= 3.20),
+ gsettings-desktop-schemas-dev (>= 3.23.3),
libgnome-desktop-3-dev (>= 3.11.1),
libpulse-dev (>= 2.0),
libcanberra-gtk3-dev,
@@ -48,7 +48,7 @@
xauth <!nocheck>,
xvfb <!nocheck>,
xkb-data
-Standards-Version: 3.9.8
+Standards-Version: 4.0.0
Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-settings-daemon/
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-settings-daemon/
@@ -58,7 +58,7 @@
Depends: ${shlibs:Depends},
${misc:Depends},
libpam-systemd [!hurd-any !kfreebsd-any],
- gsettings-desktop-schemas (>= 3.20),
+ gsettings-desktop-schemas (>= 3.23.3),
nautilus-data (>= 2.91.3-1)
Recommends: pulseaudio,
iio-sensor-proxy
Modified: desktop/experimental/gnome-settings-daemon/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/control.in?rev=52584&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/control.in [utf-8] Wed Jul 5 19:53:22 2017
@@ -9,7 +9,7 @@
dh-exec,
intltool (>= 0.37.1),
libasound2-dev [linux-any],
- libglib2.0-dev (>= 2.37.7),
+ libglib2.0-dev (>= 2.44.0),
libgtk-3-dev (>= 3.16),
libnm-dev (>= 1.0) [linux-any],
libnotify-dev (>= 0.7.3),
@@ -20,7 +20,7 @@
libxext-dev,
libx11-dev,
libibus-1.0-dev (>= 1.5.2),
- gsettings-desktop-schemas-dev (>= 3.20),
+ gsettings-desktop-schemas-dev (>= 3.23.3),
libgnome-desktop-3-dev (>= 3.11.1),
libpulse-dev (>= 2.0),
libcanberra-gtk3-dev,
@@ -44,7 +44,7 @@
xauth <!nocheck>,
xvfb <!nocheck>,
xkb-data
-Standards-Version: 3.9.8
+Standards-Version: 4.0.0
Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-settings-daemon/
Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-settings-daemon/
@@ -54,7 +54,7 @@
Depends: ${shlibs:Depends},
${misc:Depends},
libpam-systemd [!hurd-any !kfreebsd-any],
- gsettings-desktop-schemas (>= 3.20),
+ gsettings-desktop-schemas (>= 3.23.3),
nautilus-data (>= 2.91.3-1)
Recommends: pulseaudio,
iio-sensor-proxy
Modified: desktop/experimental/gnome-settings-daemon/debian/gnome-settings-daemon.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/gnome-settings-daemon.install?rev=52584&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/gnome-settings-daemon.install [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/gnome-settings-daemon.install [utf-8] Wed Jul 5 19:53:22 2017
@@ -1,7 +1,7 @@
#!/usr/bin/dh-exec
etc/xdg/autostart
usr/lib/gnome-settings-daemon*
-usr/share/man
+#usr/share/man
usr/share/icons
usr/share/locale
usr/share/gnome-settings-daemon
Modified: desktop/experimental/gnome-settings-daemon/debian/gnome-settings-daemon.maintscript
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/gnome-settings-daemon.maintscript?rev=52584&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/gnome-settings-daemon.maintscript [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/gnome-settings-daemon.maintscript [utf-8] Wed Jul 5 19:53:22 2017
@@ -1 +1,2 @@
rm_conffile /etc/dbus-1/system.d/org.gnome.SettingsDaemon.DateTimeMechanism.conf 3.8.2-2~ gnome-settings-daemon
+rm_conffile /etc/xdg/autostart/gnome-settings-daemon.desktop 3.24.2-1~ gnome-settings-daemon
Added: desktop/experimental/gnome-settings-daemon/debian/patches/color-Make-the-testcase-able-to-run-uninstalled.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/patches/color-Make-the-testcase-able-to-run-uninstalled.patch?rev=52584&op=file
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/patches/color-Make-the-testcase-able-to-run-uninstalled.patch (added)
+++ desktop/experimental/gnome-settings-daemon/debian/patches/color-Make-the-testcase-able-to-run-uninstalled.patch [utf-8] Wed Jul 5 19:53:22 2017
@@ -0,0 +1,85 @@
+From 63b73af23efd97de34a9dde58938c5c772040974 Mon Sep 17 00:00:00 2001
+From: Iain Lane <iain at orangesquash.org.uk>
+Date: Fri, 19 May 2017 16:38:07 +0100
+Subject: [PATCH 1/3] color: Make the testcase able to run uninstalled
+
+Distributions might want to be able to run their tests during package
+builds, for example.
+
+Compile the schema and set GSETTINGS_SCHEMA_DIR to the build dir.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=782170
+---
+ Makefile.am | 2 +-
+ plugins/color/Makefile.am | 11 ++++++++++-
+ plugins/color/gcm-self-test.c | 6 ++++++
+ 3 files changed, 17 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 0a329541..096c2458 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,8 +2,8 @@ NULL =
+
+ SUBDIRS = \
+ gnome-settings-daemon \
+- plugins \
+ data \
++ plugins \
+ po \
+ tests \
+ $(NULL)
+diff --git a/plugins/color/Makefile.am b/plugins/color/Makefile.am
+index a280ba8a..35dcad42 100644
+--- a/plugins/color/Makefile.am
++++ b/plugins/color/Makefile.am
+@@ -30,6 +30,15 @@ gcm_self_test_LDADD = \
+
+ TESTS = gcm-self-test
+
++BUILT_SOURCES = gschemas.compiled
++
++CLEANFILES = gschemas.compiled
++
++gschemas.compiled: $(top_builddir)/data/org.gnome.settings-daemon.plugins.color.gschema.xml
++ $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --schema-file=$< --targetdir=$(builddir)
++
++all-am: gschemas.compiled
++
+ libexec_PROGRAMS = gsd-color
+ gsd_color_SOURCES = \
+ main.c \
+@@ -80,7 +89,7 @@ EXTRA_DIST = \
+ test-data/Lenovo-T61-Internal.bin \
+ test-data/LG-L225W-External.bin
+
+-CLEANFILES = \
++CLEANFILES += \
+ $(desktop_DATA)
+
+ DISTCLEANFILES = \
+diff --git a/plugins/color/gcm-self-test.c b/plugins/color/gcm-self-test.c
+index 83c06c52..3f00b601 100644
+--- a/plugins/color/gcm-self-test.c
++++ b/plugins/color/gcm-self-test.c
+@@ -281,11 +281,17 @@ gcm_test_frac_day (void)
+ int
+ main (int argc, char **argv)
+ {
++ char *schema_dir;
++
+ g_setenv ("GSETTINGS_BACKEND", "memory", TRUE);
+
+ gtk_init (&argc, &argv);
+ g_test_init (&argc, &argv, NULL);
+
++ schema_dir = g_test_build_filename (G_TEST_BUILT, "", NULL);
++ g_setenv("GSETTINGS_SCHEMA_DIR", schema_dir, TRUE);
++ g_free (schema_dir);
++
+ g_test_add_func ("/color/edid", gcm_test_edid_func);
+ g_test_add_func ("/color/sunset-sunrise", gcm_test_sunset_sunrise);
+ g_test_add_func ("/color/sunset-sunrise/fractional-timezone", gcm_test_sunset_sunrise_fractional_timezone);
+--
+2.13.2
+
Modified: desktop/experimental/gnome-settings-daemon/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/patches/series?rev=52584&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/patches/series [utf-8] Wed Jul 5 19:53:22 2017
@@ -1,2 +1,2 @@
-media-keys-Fix-mmkeys-D-Bus-API-to-match-API-docs.patch
04_superP.patch
+color-Make-the-testcase-able-to-run-uninstalled.patch
Modified: desktop/experimental/gnome-settings-daemon/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/rules?rev=52584&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/rules [utf-8] Wed Jul 5 19:53:22 2017
@@ -25,7 +25,8 @@
dh_autoreconf --as-needed
override_dh_install:
- dh_install --fail-missing -X.la
+ find debian/tmp -type f -name '*.la' -delete -print
+ dh_install --fail-missing
override_dh_auto_test:
xvfb-run dh_auto_test
More information about the pkg-gnome-commits
mailing list