diff -Nru mutter-3.12.2/debian/changelog mutter-3.12.2/debian/changelog --- mutter-3.12.2/debian/changelog 2014-05-17 01:36:24.000000000 +1000 +++ mutter-3.12.2/debian/changelog 2014-06-07 17:01:35.000000000 +1000 @@ -1,3 +1,17 @@ +mutter (3.12.2-1ubuntu1) utopic; urgency=medium + + * Merge with Debian. Remaining changes: + - debian/patches/04_ignore_shadow_and_padding.patch: + + Silently ignore padding and shadow tags (for light-themes) + - debian/control.in: Don't depend on gnome-desktop3 3.10 + - Add Replaces for previous libmutter sonames, so that the library + upgrades properly. + * Drop all our git patches + * Set upower build-depend to << 0.99 + * Add revert_upower_api_changes.patch + + -- Jackson Doak Sat, 07 Jun 2014 16:47:00 +1000 + mutter (3.12.2-1) experimental; urgency=medium [ Sjoerd Simons ] @@ -49,6 +63,67 @@ -- Andreas Henriksson Sat, 29 Mar 2014 22:09:55 +0100 +mutter (3.10.4-0ubuntu5) utopic; urgency=medium + + * debian/patches/git-dont-leave-focus-on-unmanage.patch: git patch + to fix meta_window_unmanage crash (LP: #1279919) + + -- Tim Lunn Tue, 03 Jun 2014 13:05:23 +1000 + +mutter (3.10.4-0ubuntu4) utopic; urgency=medium + + * debian/patches/git-fix-crash-on-hotplug-*.patch: + - Backport crasher fix from upstream git (LP: #1319897, BGO#725637) + + -- Marius Gedminas Fri, 16 May 2014 18:08:32 +0300 + +mutter (3.10.4-0ubuntu3) utopic; urgency=high + + * debian/patches/0001-Update-for-Cogl-API-breaks.patch: cherry pick + patch from upstream to fix FTBFS against cogl20. + + -- Dimitri John Ledkov Sun, 27 Apr 2014 00:00:49 +0100 + +mutter (3.10.4-0ubuntu2) trusty; urgency=medium + + * debian/patches/git_ignore_error_when_settings_primary.patch (LP: #1288572) + + -- Tim Lunn Wed, 19 Mar 2014 08:16:08 +1100 + +mutter (3.10.4-0ubuntu1) trusty; urgency=medium + + * New upstream release + * debian/patches/git_fix_xrandr_backlight.patch: Dropped, included + in the new version + + -- Tim Lunn Thu, 20 Feb 2014 17:16:01 +1100 + +mutter (3.10.3-0ubuntu3) trusty; urgency=medium + + * debian/patches: + - remove unused git patches + - git_fix_xrandr_backlight.patch, fix backlight not working on various + GPU's (LP: #947919) + + -- Tim Lunn Thu, 06 Feb 2014 20:01:34 +1100 + +mutter (3.10.3-0ubuntu2) trusty; urgency=medium + + * Add Replaces for previous libmutter sonames, so that the library + upgrades properly. + + -- Steve Langasek Wed, 22 Jan 2014 14:12:56 -0800 + +mutter (3.10.3-0ubuntu1) trusty; urgency=medium + + * New upstream release (LP: #1269916) + * Merge with Debian. Remaining changes: + - debian/patches/04_ignore_shadow_and_padding.patch: + + Silently ignore padding and shadow tags (for light-themes) + - debian/control.in: Don't depend on gnome-desktop3 3.10 + + -- Tim Lunn Sun, 29 Dec 2013 09:57:51 +1100 + mutter (3.10.1-2) experimental; urgency=low * Force build against G3.10 version of gnome-desktop @@ -88,6 +163,51 @@ -- Michael Biebl Fri, 11 Oct 2013 19:37:56 +0200 +mutter (3.8.4-0ubuntu4) trusty; urgency=medium + + * No-change rebuild for new cogl + + -- Iain Lane Tue, 14 Jan 2014 20:15:33 +0000 + +mutter (3.8.4-0ubuntu3) trusty; urgency=medium + + * git-ui-add-missing-delimiter.patch, + git-prefs-fix-introspection-issues.patch: Add git patch to fix build + with current gobject-introspection. + + -- Colin Watson Fri, 03 Jan 2014 15:06:05 +0000 + +mutter (3.8.4-0ubuntu2) saucy; urgency=low + + * debian/patches/git-background-dont-save-pixbuf.patch: Add git patch + to avoid leaking background pixbuf's (LP: #1217649) + + -- Tim Lunn Thu, 29 Aug 2013 13:37:30 +1000 + +mutter (3.8.4-0ubuntu1) saucy; urgency=low + + * New upstream release. + + -- Jeremy Bicha Wed, 31 Jul 2013 20:13:05 -0400 + +mutter (3.8.3-1ubuntu2) saucy; urgency=low + + * No-change rebuild against X 1.14 for pressure-sensitive message + tray reveal in GNOME Shell + + -- Jeremy Bicha Mon, 08 Jul 2013 09:54:03 -0400 + +mutter (3.8.3-1ubuntu1) saucy; urgency=low + + * Sync with Debian. Remaining changes: + - debian/patches/04_ignore_shadow_and_padding.patch: + + Silently ignore padding and shadow tags (for light-themes) + - debian/control.in: + + Use standard Breaks/Replaces instead of Conflicts against older mutter + libraries + + -- Jeremy Bicha Sat, 08 Jun 2013 13:46:06 -0400 + mutter (3.8.3-1) experimental; urgency=low * New upstream release. @@ -200,22 +320,6 @@ -- Sjoerd Simons Sun, 14 Oct 2012 19:24:21 +0200 -mutter (3.4.1-7) unstable; urgency=low - - * d/p/0001-meta-texture-rectangle-Use-Cogl-s-API-to-create-a-re.patch: - + Patch from upstream git, don't use GL types as cogl doesn't expose - GL headers in newer releases. This will ease the cogl transition. - - -- Emilio Pozuelo Monfort Sun, 26 May 2013 17:54:55 +0200 - -mutter (3.4.1-6) unstable; urgency=low - - * Team upload - * Add debian/patches/02_switch_to_gtk-doc_syntax.patch: - - from upstream, fixes FTBFS with new gobject-introspection. - - -- Andreas Henriksson Mon, 13 May 2013 11:03:34 +0200 - mutter (3.4.1-5) unstable; urgency=low [ Rico Tzschichholz ] @@ -1641,4 +1745,3 @@ * Initial Release. (Closes: #107181) -- Thom May Sun, 10 Feb 2002 12:03:22 +0000 - diff -Nru mutter-3.12.2/debian/control mutter-3.12.2/debian/control --- mutter-3.12.2/debian/control 2014-05-17 01:37:18.000000000 +1000 +++ mutter-3.12.2/debian/control 2014-06-07 17:02:46.000000000 +1000 @@ -2,12 +2,12 @@ # # Modifications should be made to debian/control.in instead. # This file is regenerated automatically in the clean target. - Source: mutter Section: x11 Priority: optional -Maintainer: Debian GNOME Maintainers -Uploaders: Andreas Henriksson , Emilio Pozuelo Monfort , Michael Biebl , Sjoerd Simons +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers +Uploaders: Andreas Henriksson , Debian GNOME Maintainers , Emilio Pozuelo Monfort , Sjoerd Simons Build-Depends: cdbs (>= 0.4.90), debhelper (>= 9), gnome-pkg-tools (>= 0.10), @@ -24,9 +24,9 @@ libclutter-1.0-dev (>= 1.15.90), libpango1.0-dev (>= 1.2.0), libcairo2-dev (>= 1.2.0), - libgnome-desktop-3-dev (>= 3.10), + libgnome-desktop-3-dev, libstartup-notification0-dev (>= 0.7), - libupower-glib-dev (>= 0.99.0), + libupower-glib-dev (<< 0.99.0), libxcomposite-dev (>= 1:0.2), libxi-dev (>= 2:1.6.0), libxfixes-dev, @@ -96,6 +96,7 @@ gsettings-desktop-schemas (>= 3.7.3), mutter-common (= ${source:Version}) Conflicts: libmutter0, libmutter0a, libmutter0b, libmutter0c +Replaces: libmutter0, libmutter0a, libmutter0b, libmutter0c Description: window manager library from the Mutter window manager Mutter is a small window manager, using GTK+ and Clutter to do everything. diff -Nru mutter-3.12.2/debian/control.in mutter-3.12.2/debian/control.in --- mutter-3.12.2/debian/control.in 2014-04-03 19:29:50.000000000 +1100 +++ mutter-3.12.2/debian/control.in 2014-06-07 17:01:53.000000000 +1000 @@ -1,7 +1,8 @@ Source: mutter Section: x11 Priority: optional -Maintainer: Debian GNOME Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ Build-Depends: cdbs (>= 0.4.90), debhelper (>= 9), @@ -19,9 +20,9 @@ libclutter-1.0-dev (>= 1.15.90), libpango1.0-dev (>= 1.2.0), libcairo2-dev (>= 1.2.0), - libgnome-desktop-3-dev (>= 3.10), + libgnome-desktop-3-dev, libstartup-notification0-dev (>= 0.7), - libupower-glib-dev (>= 0.99.0), + libupower-glib-dev (<< 0.99.0), libxcomposite-dev (>= 1:0.2), libxi-dev (>= 2:1.6.0), libxfixes-dev, @@ -91,6 +92,7 @@ gsettings-desktop-schemas (>= 3.7.3), mutter-common (= ${source:Version}) Conflicts: libmutter0, libmutter0a, libmutter0b, libmutter0c +Replaces: libmutter0, libmutter0a, libmutter0b, libmutter0c Description: window manager library from the Mutter window manager Mutter is a small window manager, using GTK+ and Clutter to do everything. diff -Nru mutter-3.12.2/debian/patches/04_ignore_shadow_and_padding.patch mutter-3.12.2/debian/patches/04_ignore_shadow_and_padding.patch --- mutter-3.12.2/debian/patches/04_ignore_shadow_and_padding.patch 1970-01-01 10:00:00.000000000 +1000 +++ mutter-3.12.2/debian/patches/04_ignore_shadow_and_padding.patch 2014-06-07 16:53:47.000000000 +1000 @@ -0,0 +1,86 @@ +--- + src/ui/theme-parser.c | 38 ++++++++++++++++++++++++++++++++++++-- + 1 file changed, 36 insertions(+), 2 deletions(-) + +--- a/src/ui/theme-parser.c ++++ b/src/ui/theme-parser.c +@@ -88,7 +88,9 @@ typedef enum + STATE_WINDOW, + /* things we don't use any more but we can still parse: */ + STATE_MENU_ICON, +- STATE_FALLBACK ++ STATE_FALLBACK, ++ /* an ubuntu specific ignore-this-element state */ ++ UBUNTU_STATE_IGNORE + } ParseState; + + typedef struct +@@ -1308,7 +1310,19 @@ parse_toplevel_element (GMarkupParseCont + */ + push_state (info, STATE_FALLBACK); + } +- else ++ else if (ELEMENT_IS ("shadow")) ++ { ++ /* ubuntu specific, workaround for light-themes: silently ignore shadow tag. ++ */ ++ push_state (info, UBUNTU_STATE_IGNORE); ++ } ++ else if (ELEMENT_IS ("padding")) ++ { ++ /* ubuntu specific, workaround for light-themes: silently ignore padding tag. ++ */ ++ push_state (info, UBUNTU_STATE_IGNORE); ++ } ++ else + { + set_error (error, context, + G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE, +@@ -3029,6 +3043,18 @@ parse_style_element (GMarkupParseContext + + push_state (info, STATE_BUTTON); + } ++ else if (ELEMENT_IS ("shadow")) ++ { ++ /* ubuntu specific, workaround for light-themes: silently ignore shadow tag. ++ */ ++ push_state (info, UBUNTU_STATE_IGNORE); ++ } ++ else if (ELEMENT_IS ("padding")) ++ { ++ /* ubuntu specific, workaround for light-themes: silently ignore padding tag. ++ */ ++ push_state (info, UBUNTU_STATE_IGNORE); ++ } + else + { + set_error (error, context, +@@ -3670,6 +3696,8 @@ start_element_handler (GMarkupParseConte + _("Element <%s> is not allowed inside a <%s> element"), + element_name, "fallback"); + break; ++ case UBUNTU_STATE_IGNORE: ++ break; + } + } + +@@ -3959,6 +3987,9 @@ end_element_handler (GMarkupParseContext + pop_state (info); + g_assert (peek_state (info) == STATE_THEME); + break; ++ case UBUNTU_STATE_IGNORE: ++ pop_state (info); ++ break; + } + + pop_required_version (info); +@@ -4164,6 +4195,9 @@ text_handler (GMarkupParseContext *conte + case STATE_FALLBACK: + NO_TEXT ("fallback"); + break; ++ case UBUNTU_STATE_IGNORE: ++ NO_TEXT ("ignored_element"); ++ break; + } + } + diff -Nru mutter-3.12.2/debian/patches/revert_upower_api_changes.patch mutter-3.12.2/debian/patches/revert_upower_api_changes.patch --- mutter-3.12.2/debian/patches/revert_upower_api_changes.patch 1970-01-01 10:00:00.000000000 +1000 +++ mutter-3.12.2/debian/patches/revert_upower_api_changes.patch 2014-06-07 09:38:16.000000000 +1000 @@ -0,0 +1,61 @@ +From b095e0a39df3837d3a03c9832803fafd742a8171 Mon Sep 17 00:00:00 2001 +From: Tim Lunn +Date: Thu, 14 Nov 2013 21:10:46 +1100 +Subject: [PATCH] Revert "MonitorConfig: Use new UPower API" + +This reverts commit a9a10aaa2070d726c255b035f4664079373f733a. +--- + configure.ac | 2 +- + src/core/monitor-config.c | 12 +++++------- + 2 files changed, 6 insertions(+), 8 deletions(-) + +Index: mutter-3.12.2/configure.ac +=================================================================== +--- mutter-3.12.2.orig/configure.ac ++++ mutter-3.12.2/configure.ac +@@ -77,7 +77,7 @@ MUTTER_PC_MODULES=" + xcomposite >= 0.2 xfixes xrender xdamage xi >= 1.6.0 + $CLUTTER_PACKAGE >= 1.15.90 + cogl-1.0 >= 1.17.1 +- upower-glib >= 0.99.0 ++ upower-glib >= 0.9.11 + gnome-desktop-3.0 + " + +Index: mutter-3.12.2/src/core/monitor-config.c +=================================================================== +--- mutter-3.12.2.orig/src/core/monitor-config.c ++++ mutter-3.12.2/src/core/monitor-config.c +@@ -98,9 +98,8 @@ static gboolean meta_monitor_config_assi + GPtrArray *crtcs, + GPtrArray *outputs); + +-static void power_client_changed_cb (UpClient *client, +- GParamSpec *pspec, +- gpointer user_data); ++static void power_client_changed_cb (UpClient *client, ++ gpointer user_data); + + static void + free_output_key (MetaOutputKey *key) +@@ -232,7 +231,7 @@ meta_monitor_config_init (MetaMonitorCon + self->up_client = up_client_new (); + self->lid_is_closed = up_client_get_lid_is_closed (self->up_client); + +- g_signal_connect_object (self->up_client, "notify::lid-is-closed", ++ g_signal_connect_object (self->up_client, "changed", + G_CALLBACK (power_client_changed_cb), self, 0); + } + +@@ -1386,9 +1385,8 @@ turn_off_laptop_display (MetaMonitorConf + } + + static void +-power_client_changed_cb (UpClient *client, +- GParamSpec *pspec, +- gpointer user_data) ++power_client_changed_cb (UpClient *client, ++ gpointer user_data) + { + MetaMonitorManager *manager = meta_monitor_manager_get (); + MetaMonitorConfig *self = user_data; diff -Nru mutter-3.12.2/debian/patches/series mutter-3.12.2/debian/patches/series --- mutter-3.12.2/debian/patches/series 2013-11-05 20:56:28.000000000 +1100 +++ mutter-3.12.2/debian/patches/series 2014-06-07 17:02:28.000000000 +1000 @@ -1,2 +1,4 @@ 01_Wcast-align.patch prevent-double-lock-deadlock.patch +04_ignore_shadow_and_padding.patch +revert_upower_api_changes.patch