diff -Nru mutter-3.14.2/debian/changelog mutter-3.14.2/debian/changelog --- mutter-3.14.2/debian/changelog 2014-12-01 01:05:15.000000000 +1100 +++ mutter-3.14.2/debian/changelog 2014-12-20 09:07:35.000000000 +1100 @@ -1,3 +1,13 @@ +mutter (3.14.2-1ubuntu1) vivid; urgency=low + + * Merge with Debian. Remaining changes: LP: #1399047 + - debian/patches/04_ignore_shadow_and_padding.patch: + + Silently ignore padding and shadow tags (for light-themes) + - Add Replaces for previous libmutter sonames, so that the library + upgrades properly. + + -- Jackson Doak Sun, 30 Nov 2014 21:47:39 +0000 + mutter (3.14.2-1) unstable; urgency=medium * New upstream bugfix release. @@ -115,6 +125,34 @@ -- Andreas Henriksson Mon, 14 Jul 2014 23:20:08 +0200 +mutter (3.12.2-1ubuntu4) vivid; urgency=medium + + * Drop revert_upower_api_changes.patch and build against upower 0.99. + (LP: #1330037) + * Skip version number for rejected -1ubuntu3. + + -- Martin Pitt Thu, 30 Oct 2014 15:02:03 +0100 + +mutter (3.12.2-1ubuntu2) utopic; urgency=medium + + * No change rebuild for gnome-desktop 3.12 + + -- Tim Lunn Tue, 23 Sep 2014 08:28:28 +1000 + +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 ] @@ -166,6 +204,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 @@ -205,6 +304,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. diff -Nru mutter-3.14.2/debian/control mutter-3.14.2/debian/control --- mutter-3.14.2/debian/control 2014-12-01 01:08:08.000000000 +1100 +++ mutter-3.14.2/debian/control 2014-12-20 09:07:48.000000000 +1100 @@ -5,8 +5,9 @@ Source: mutter Section: x11 Priority: optional -Maintainer: Debian GNOME Maintainers -Uploaders: Andreas Henriksson , Josselin Mouette , Michael Biebl , Sjoerd Simons +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers +Uploaders: Andreas Henriksson , Debian GNOME Maintainers , Josselin Mouette , Michael Biebl Build-Depends: cdbs (>= 0.4.90), debhelper (>= 9), gnome-pkg-tools (>= 0.10), @@ -106,6 +107,7 @@ gsettings-desktop-schemas (>= 3.13.1), mutter-common (= ${source:Version}) Conflicts: libmutter0, libmutter0a, libmutter0b, libmutter0c, libmutter0d +Replaces: libmutter0, libmutter0a, libmutter0b, libmutter0c, libmutter0d 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.14.2/debian/control.in mutter-3.14.2/debian/control.in --- mutter-3.14.2/debian/control.in 2014-10-25 05:52:54.000000000 +1100 +++ mutter-3.14.2/debian/control.in 2014-12-18 10:02:36.000000000 +1100 @@ -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), @@ -102,6 +103,7 @@ gsettings-desktop-schemas (>= 3.13.1), mutter-common (= ${source:Version}) Conflicts: libmutter0, libmutter0a, libmutter0b, libmutter0c, libmutter0d +Replaces: libmutter0, libmutter0a, libmutter0b, libmutter0c, libmutter0d 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.14.2/debian/patches/01_Wcast-align.patch mutter-3.14.2/debian/patches/01_Wcast-align.patch --- mutter-3.14.2/debian/patches/01_Wcast-align.patch 2014-10-16 08:47:46.000000000 +1100 +++ mutter-3.14.2/debian/patches/01_Wcast-align.patch 2013-10-12 04:24:18.000000000 +1100 @@ -1,8 +1,8 @@ -Index: mutter-3.14.1/configure.ac +Index: mutter-3.8.4/configure.ac =================================================================== ---- mutter-3.14.1.orig/configure.ac 2014-10-15 23:47:04.942780626 +0200 -+++ mutter-3.14.1/configure.ac 2014-10-15 23:47:04.938780626 +0200 -@@ -362,11 +362,6 @@ +--- mutter-3.8.4.orig/configure.ac 2013-10-11 19:23:53.551350692 +0200 ++++ mutter-3.8.4/configure.ac 2013-10-11 19:23:53.551350692 +0200 +@@ -413,11 +413,6 @@ esac case " $CFLAGS " in diff -Nru mutter-3.14.2/debian/patches/04_ignore_shadow_and_padding.patch mutter-3.14.2/debian/patches/04_ignore_shadow_and_padding.patch --- mutter-3.14.2/debian/patches/04_ignore_shadow_and_padding.patch 1970-01-01 10:00:00.000000000 +1000 +++ mutter-3.14.2/debian/patches/04_ignore_shadow_and_padding.patch 2014-09-29 21:59:05.000000000 +1000 @@ -0,0 +1,88 @@ +--- + src/ui/theme-parser.c | 38 ++++++++++++++++++++++++++++++++++++-- + 1 file changed, 36 insertions(+), 2 deletions(-) + +Index: b/src/ui/theme-parser.c +=================================================================== +--- a/src/ui/theme-parser.c ++++ b/src/ui/theme-parser.c +@@ -88,7 +88,9 @@ + 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 @@ + */ + 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 @@ + + 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 @@ + _("Element <%s> is not allowed inside a <%s> element"), + element_name, "fallback"); + break; ++ case UBUNTU_STATE_IGNORE: ++ break; + } + } + +@@ -3959,6 +3987,9 @@ + 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 @@ + case STATE_FALLBACK: + NO_TEXT ("fallback"); + break; ++ case UBUNTU_STATE_IGNORE: ++ NO_TEXT ("ignored_element"); ++ break; + } + } + diff -Nru mutter-3.14.2/debian/patches/series mutter-3.14.2/debian/patches/series --- mutter-3.14.2/debian/patches/series 2014-12-01 01:04:12.000000000 +1100 +++ mutter-3.14.2/debian/patches/series 2014-12-18 10:03:37.000000000 +1100 @@ -1,3 +1,4 @@ 01_Wcast-align.patch +04_ignore_shadow_and_padding.patch 10_window-actor_unredirect.patch 11_black_background.patch