diff -Nru mutter-2.91.92/debian/changelog mutter-2.91.92/debian/changelog --- mutter-2.91.92/debian/changelog 2011-03-24 06:27:21.000000000 +0000 +++ mutter-2.91.92/debian/changelog 2011-03-25 06:17:04.000000000 +0000 @@ -1,13 +1,29 @@ -mutter (2.91.92-1~build0) natty; urgency=low +mutter (2.91.92-1ubuntu1~build1) natty; urgency=low + + * Sync with debian experimental, remaining changes: + + debian/patches/03_link_gles2.patch: Link to clutter-glx-1.0 + explicitily at the end of link flags, to bring in libGLESv2 on armel. + Fixes FTBFS (LP:#726827) + * debian/patches: + + fix 03_link_gles2.patch + + -- Rico Tzschichholz Fri, 25 Mar 2011 07:16:23 +0100 + +mutter (2.91.92-1) experimental; urgency=low * New upstream release + + [ Rico Tzschichholz ] * debian/patches: + drop 02_arm_include_clutter_x11.patch, is upstream + drop 10_mutter-ldflags.patch, is upstream * debian/control.in,debian/rules: + add libmutter0 which replaces libmutter-wm0 and libmutter-private0 - -- Rico Tzschichholz Thu, 24 Mar 2011 07:27:05 +0100 + [ Frederic Peters ] + * debian/control.in: mention gnome-shell in libmutter0 package description. + + -- Frederic Peters Thu, 24 Mar 2011 19:56:48 +0100 mutter (2.91.91-1) experimental; urgency=low diff -Nru mutter-2.91.92/debian/control mutter-2.91.92/debian/control --- mutter-2.91.92/debian/control 2011-03-24 06:28:22.000000000 +0000 +++ mutter-2.91.92/debian/control 2011-03-25 06:18:01.000000000 +0000 @@ -6,8 +6,9 @@ Source: mutter Section: x11 Priority: optional -Maintainer: Debian GNOME Maintainers -Uploaders: Emilio Pozuelo Monfort , Gustavo Noronha Silva +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers +Uploaders: Debian GNOME Maintainers , Emilio Pozuelo Monfort , Gustavo Noronha Silva Build-Depends: cdbs (>= 0.4.41), debhelper (>= 5), dh-autoreconf, @@ -77,7 +78,7 @@ ${misc:Depends}, mutter-common (>= ${gnome:Version}), mutter-common (<< ${gnome:NextVersion}) -Description: window manager library for the Mutter window manager +Description: window manager library from the Mutter window manager Mutter is a small window manager, using GTK+ and Clutter to do everything. . @@ -86,7 +87,8 @@ window managers are like Marshmallow Froot Loops; Metacity is like Cheerios." . - This package contains the window manager shared library. + This package contains the window manager shared library, used by mutter + itself, and gnome-shell. Package: mutter-common Section: misc diff -Nru mutter-2.91.92/debian/control.in mutter-2.91.92/debian/control.in --- mutter-2.91.92/debian/control.in 2011-03-23 16:59:32.000000000 +0000 +++ mutter-2.91.92/debian/control.in 2011-03-25 06:17:41.000000000 +0000 @@ -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.41), debhelper (>= 5), @@ -72,7 +73,7 @@ ${misc:Depends}, mutter-common (>= ${gnome:Version}), mutter-common (<< ${gnome:NextVersion}) -Description: window manager library for the Mutter window manager +Description: window manager library from the Mutter window manager Mutter is a small window manager, using GTK+ and Clutter to do everything. . @@ -81,7 +82,8 @@ window managers are like Marshmallow Froot Loops; Metacity is like Cheerios." . - This package contains the window manager shared library. + This package contains the window manager shared library, used by mutter + itself, and gnome-shell. Package: mutter-common Section: misc diff -Nru mutter-2.91.92/debian/patches/03_link_gles2.patch mutter-2.91.92/debian/patches/03_link_gles2.patch --- mutter-2.91.92/debian/patches/03_link_gles2.patch 1970-01-01 00:00:00.000000000 +0000 +++ mutter-2.91.92/debian/patches/03_link_gles2.patch 2011-03-25 06:13:04.000000000 +0000 @@ -0,0 +1,48 @@ +## Description: Mutter is using a GL symbol (glGetBooleanv) and not explicit linking to it. +## The symbols is available in libGL and libGLESv2 +## Origin/Author: Jani Monoses +## Bug: https://bugs.launchpad.net/ubuntu/+source/mutter/+bug/726827 +Index: mutter-2.91.92/src/Makefile.am +=================================================================== +--- mutter-2.91.92.orig/src/Makefile.am ++++ mutter-2.91.92/src/Makefile.am +@@ -155,7 +155,7 @@ + $(mutter_built_sources) + + libmutter_la_LDFLAGS = -no-undefined +-libmutter_la_LIBADD = $(MUTTER_LIBS) ++libmutter_la_LIBADD = $(MUTTER_LIBS) -lclutter-glx-1.0 + + # Headers installed for plugins; introspected information will + # be extracted into Mutter-.gir +@@ -199,7 +199,7 @@ + bin_PROGRAMS=mutter mutter-theme-viewer + + mutter_SOURCES = core/mutter.c +-mutter_LDADD = $(MUTTER_LIBS) libmutter.la ++mutter_LDADD = $(MUTTER_LIBS) libmutter.la -lclutter-glx-1.0 + + if HAVE_INTROSPECTION + include $(INTROSPECTION_MAKEFILE) +Index: mutter-2.91.92/src/Makefile.in +=================================================================== +--- mutter-2.91.92.orig/src/Makefile.in ++++ mutter-2.91.92/src/Makefile.in +@@ -546,7 +546,7 @@ + $(mutter_built_sources) + + libmutter_la_LDFLAGS = -no-undefined +-libmutter_la_LIBADD = $(MUTTER_LIBS) ++libmutter_la_LIBADD = $(MUTTER_LIBS) -lclutter-glx-1.0 + + # Headers installed for plugins; introspected information will + # be extracted into Mutter-.gir +@@ -588,7 +588,7 @@ + ui/theme-viewer.c + + mutter_SOURCES = core/mutter.c +-mutter_LDADD = $(MUTTER_LIBS) libmutter.la ++mutter_LDADD = $(MUTTER_LIBS) libmutter.la -lclutter-glx-1.0 + @HAVE_INTROSPECTION_TRUE@api_version = $(MUTTER_MAJOR_VERSION).$(MUTTER_MINOR_VERSION) + + # These files are in package-private directories, even though they may be used diff -Nru mutter-2.91.92/debian/patches/series mutter-2.91.92/debian/patches/series --- mutter-2.91.92/debian/patches/series 2011-03-24 06:28:15.000000000 +0000 +++ mutter-2.91.92/debian/patches/series 2011-03-25 06:17:19.000000000 +0000 @@ -1 +1,2 @@ 01_Wcast-align.patch +03_link_gles2.patch