r49457 - in /desktop/experimental/mutter/debian: ./ patches/
sjoerd at users.alioth.debian.org
sjoerd at users.alioth.debian.org
Mon Aug 8 19:27:18 UTC 2016
Author: sjoerd
Date: Mon Aug 8 19:27:17 2016
New Revision: 49457
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=49457
Log:
* New upstream release
* debian/patches/fix-gint64-format.patch
debian/patches/wayland-add-extended-state-for-tiled.patch:
- Dropped fixed upstream
* debian/patches/Fix-build-of-clutter-tests.patch
- Added, fix build of test (bgo#769636)
* debian/patches/clutter-Fix-typo-in-assert.patch
- Added, fix build. From upstream git
* debian/control.in: Bump libmutter0 to libmutter0i
* debian/control.in: Update build-dependencies
* debian/*.install: Install private helper libraries.
Added:
desktop/experimental/mutter/debian/libmutter0i.install
desktop/experimental/mutter/debian/patches/Fix-build-of-clutter-tests.patch
desktop/experimental/mutter/debian/patches/clutter-Fix-typo-in-assert.patch
Removed:
desktop/experimental/mutter/debian/libmutter0h.install
desktop/experimental/mutter/debian/patches/fix-gint64-format.patch
desktop/experimental/mutter/debian/patches/wayland-add-extended-state-for-tiled.patch
Modified:
desktop/experimental/mutter/debian/changelog
desktop/experimental/mutter/debian/control
desktop/experimental/mutter/debian/control.in
desktop/experimental/mutter/debian/gir1.2-mutter-3.0.install
desktop/experimental/mutter/debian/libmutter-dev.install
desktop/experimental/mutter/debian/patches/series
desktop/experimental/mutter/debian/rules
Modified: desktop/experimental/mutter/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/changelog?rev=49457&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/changelog [utf-8] (original)
+++ desktop/experimental/mutter/debian/changelog [utf-8] Mon Aug 8 19:27:17 2016
@@ -1,3 +1,19 @@
+mutter (3.21.4-1) UNRELEASED; urgency=medium
+
+ * New upstream release
+ * debian/patches/fix-gint64-format.patch
+ debian/patches/wayland-add-extended-state-for-tiled.patch:
+ - Dropped fixed upstream
+ * debian/patches/Fix-build-of-clutter-tests.patch
+ - Added, fix build of test (bgo#769636)
+ * debian/patches/clutter-Fix-typo-in-assert.patch
+ - Added, fix build. From upstream git
+ * debian/control.in: Bump libmutter0 to libmutter0i
+ * debian/control.in: Update build-dependencies
+ * debian/*.install: Install private helper libraries.
+
+ -- Sjoerd Simons <sjoerd at debian.org> Mon, 08 Aug 2016 21:19:51 +0200
+
mutter (3.20.3-2) unstable; urgency=medium
[ Simon McVittie ]
Modified: desktop/experimental/mutter/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/control?rev=49457&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/control [utf-8] (original)
+++ desktop/experimental/mutter/debian/control [utf-8] Mon Aug 8 19:27:17 2016
@@ -6,24 +6,24 @@
Section: x11
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Michael Biebl <biebl at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
Build-Depends: debhelper (>= 9.20160114),
gnome-pkg-tools (>= 0.10),
dh-autoreconf,
intltool (>= 0.41),
gtk-doc-tools (>= 1.15),
libgtk-3-dev (>= 3.19.8),
- libglib2.0-dev (>= 2.35.1),
+ libglib2.0-dev (>= 2.49.1),
libcanberra-gtk3-dev,
gobject-introspection (>= 1.41.3),
gsettings-desktop-schemas-dev (>= 3.19.3),
libgirepository1.0-dev (>= 0.9.12),
libjson-glib-dev (>= 0.13.2-1~),
- libcogl-dev (>= 1.17.1),
- libclutter-1.0-dev (>= 1.25.6),
libgbm-dev (>= 10.3),
libpango1.0-dev (>= 1.2.0),
libcairo2-dev (>= 1.10.0),
+ libgl1-mesa-dev (>= 7.1~rc3-1~),
+ libdrm-dev [!hurd-any],
libgnome-desktop-3-dev (>= 3.10),
libgudev-1.0-dev [linux-any],
libinput-dev [linux-any],
@@ -79,7 +79,7 @@
.
This package contains the core binaries.
-Package: libmutter0h
+Package: libmutter0i
Section: libs
Architecture: any
Multi-Arch: same
@@ -96,6 +96,7 @@
libmutter0e,
libmutter0f,
libmutter0g,
+ libmutter0h
Replaces: libmutter0,
libmutter0a,
libmutter0b,
@@ -104,6 +105,7 @@
libmutter0e,
libmutter0f,
libmutter0g,
+ libmutter0h
Description: window manager library from the Mutter window manager
Mutter is a small window manager, using GTK+ and Clutter to do
everything.
@@ -137,10 +139,9 @@
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
- libmutter0h (= ${binary:Version}),
+ libmutter0i (= ${binary:Version}),
gir1.2-mutter-3.0 (= ${binary:Version}),
gsettings-desktop-schemas-dev,
- libclutter-1.0-dev,
libgtk-3-dev,
libx11-dev
Description: Development files for the Mutter window manager
@@ -161,7 +162,7 @@
Depends: ${gir:Depends},
${shlibs:Depends},
${misc:Depends},
- libmutter0h (= ${binary:Version})
+ libmutter0i (= ${binary:Version})
Breaks: gnome-shell (<< 3.13.92~)
Description: GObject introspection data for Mutter
Mutter is a small window manager, using GTK+ and Clutter to do
Modified: desktop/experimental/mutter/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/control.in?rev=49457&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/control.in [utf-8] (original)
+++ desktop/experimental/mutter/debian/control.in [utf-8] Mon Aug 8 19:27:17 2016
@@ -9,17 +9,17 @@
intltool (>= 0.41),
gtk-doc-tools (>= 1.15),
libgtk-3-dev (>= 3.19.8),
- libglib2.0-dev (>= 2.35.1),
+ libglib2.0-dev (>= 2.49.1),
libcanberra-gtk3-dev,
gobject-introspection (>= 1.41.3),
gsettings-desktop-schemas-dev (>= 3.19.3),
libgirepository1.0-dev (>= 0.9.12),
libjson-glib-dev (>= 0.13.2-1~),
- libcogl-dev (>= 1.17.1),
- libclutter-1.0-dev (>= 1.25.6),
libgbm-dev (>= 10.3),
libpango1.0-dev (>= 1.2.0),
libcairo2-dev (>= 1.10.0),
+ libgl1-mesa-dev (>= 7.1~rc3-1~),
+ libdrm-dev [!hurd-any],
libgnome-desktop-3-dev (>= 3.10),
libgudev-1.0-dev [linux-any],
libinput-dev [linux-any],
@@ -75,7 +75,7 @@
.
This package contains the core binaries.
-Package: libmutter0h
+Package: libmutter0i
Section: libs
Architecture: any
Multi-Arch: same
@@ -92,6 +92,7 @@
libmutter0e,
libmutter0f,
libmutter0g,
+ libmutter0h
Replaces: libmutter0,
libmutter0a,
libmutter0b,
@@ -100,6 +101,7 @@
libmutter0e,
libmutter0f,
libmutter0g,
+ libmutter0h
Description: window manager library from the Mutter window manager
Mutter is a small window manager, using GTK+ and Clutter to do
everything.
@@ -133,10 +135,9 @@
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends},
- libmutter0h (= ${binary:Version}),
+ libmutter0i (= ${binary:Version}),
gir1.2-mutter-3.0 (= ${binary:Version}),
gsettings-desktop-schemas-dev,
- libclutter-1.0-dev,
libgtk-3-dev,
libx11-dev
Description: Development files for the Mutter window manager
@@ -157,7 +158,7 @@
Depends: ${gir:Depends},
${shlibs:Depends},
${misc:Depends},
- libmutter0h (= ${binary:Version})
+ libmutter0i (= ${binary:Version})
Breaks: gnome-shell (<< 3.13.92~)
Description: GObject introspection data for Mutter
Mutter is a small window manager, using GTK+ and Clutter to do
Modified: desktop/experimental/mutter/debian/gir1.2-mutter-3.0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/gir1.2-mutter-3.0.install?rev=49457&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/gir1.2-mutter-3.0.install [utf-8] (original)
+++ desktop/experimental/mutter/debian/gir1.2-mutter-3.0.install [utf-8] Mon Aug 8 19:27:17 2016
@@ -1 +1 @@
-usr/lib/*/mutter/Meta-*.typelib
+usr/lib/*/mutter/*.typelib
Modified: desktop/experimental/mutter/debian/libmutter-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/libmutter-dev.install?rev=49457&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/libmutter-dev.install [utf-8] (original)
+++ desktop/experimental/mutter/debian/libmutter-dev.install [utf-8] Mon Aug 8 19:27:17 2016
@@ -1,4 +1,4 @@
usr/include
usr/lib/*/lib*.so
usr/lib/*/pkgconfig/*.pc
-usr/lib/*/mutter/Meta-*.gir
+usr/lib/*/mutter/*.gir
Added: desktop/experimental/mutter/debian/libmutter0i.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/libmutter0i.install?rev=49457&op=file
==============================================================================
--- desktop/experimental/mutter/debian/libmutter0i.install (added)
+++ desktop/experimental/mutter/debian/libmutter0i.install [utf-8] Mon Aug 8 19:27:17 2016
@@ -0,0 +1,2 @@
+usr/lib/*/libmutter.so.*
+usr/lib/*/mutter/*.so
Added: desktop/experimental/mutter/debian/patches/Fix-build-of-clutter-tests.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/patches/Fix-build-of-clutter-tests.patch?rev=49457&op=file
==============================================================================
--- desktop/experimental/mutter/debian/patches/Fix-build-of-clutter-tests.patch (added)
+++ desktop/experimental/mutter/debian/patches/Fix-build-of-clutter-tests.patch [utf-8] Mon Aug 8 19:27:17 2016
@@ -0,0 +1,45 @@
+From 612644ccd045a5b895e7fb3c56de0c426327233d Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd.simons at collabora.co.uk>
+Date: Mon, 8 Aug 2016 15:52:36 +0200
+Subject: [PATCH] Fix build of clutter tests
+
+Various clutter test directly use cogl symbols, so they should be linked
+against mutter-cogl as well.
+
+Signed-off-by: Sjoerd Simons <sjoerd.simons at collabora.co.uk>
+---
+ clutter/tests/interactive/Makefile.am | 4 +++-
+ clutter/tests/micro-bench/Makefile.am | 5 ++++-
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/clutter/tests/interactive/Makefile.am b/clutter/tests/interactive/Makefile.am
+index ebea6d2..24a7f48 100644
+--- a/clutter/tests/interactive/Makefile.am
++++ b/clutter/tests/interactive/Makefile.am
+@@ -109,7 +109,9 @@ clean-wrappers:
+
+ .PHONY: wrappers clean-wrappers
+
+-common_ldadd = $(top_builddir)/clutter/libmutter-clutter- at CLUTTER_API_VERSION@.la
++common_ldadd = \
++ $(top_builddir)/clutter/libmutter-clutter- at CLUTTER_API_VERSION@.la \
++ $(top_builddir)/../cogl/cogl/libmutter-cogl.la
+
+ check_PROGRAMS = test-interactive
+ check_SCRIPTS = wrappers
+diff --git a/clutter/tests/micro-bench/Makefile.am b/clutter/tests/micro-bench/Makefile.am
+index 9060c38..2731b9e 100644
+--- a/clutter/tests/micro-bench/Makefile.am
++++ b/clutter/tests/micro-bench/Makefile.am
+@@ -1,4 +1,7 @@
+-common_ldadd = $(top_builddir)/clutter/libmutter-clutter- at CLUTTER_API_VERSION@.la
++common_ldadd = \
++ $(top_builddir)/clutter/libmutter-clutter- at CLUTTER_API_VERSION@.la \
++ $(top_builddir)/../cogl/cogl/libmutter-cogl.la
++
+
+ check_PROGRAMS = \
+ test-text \
+--
+2.8.1
+
Added: desktop/experimental/mutter/debian/patches/clutter-Fix-typo-in-assert.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/patches/clutter-Fix-typo-in-assert.patch?rev=49457&op=file
==============================================================================
--- desktop/experimental/mutter/debian/patches/clutter-Fix-typo-in-assert.patch (added)
+++ desktop/experimental/mutter/debian/patches/clutter-Fix-typo-in-assert.patch [utf-8] Mon Aug 8 19:27:17 2016
@@ -0,0 +1,25 @@
+From 740748af3e76c25cc86174548288018889ea9eeb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner at gnome.org>
+Date: Fri, 29 Jul 2016 11:28:29 +0200
+Subject: [PATCH] clutter: Fix typo in assert
+
+---
+ clutter/clutter/clutter-canvas.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/clutter/clutter/clutter-canvas.c b/clutter/clutter/clutter-canvas.c
+index 6c92c44..98f8c07 100644
+--- a/clutter/clutter/clutter-canvas.c
++++ b/clutter/clutter/clutter-canvas.c
+@@ -401,7 +401,7 @@ clutter_canvas_emit_draw (ClutterCanvas *self)
+ gboolean res;
+ cairo_t *cr;
+
+- g_assert (priv->width > 0 && priv->width > 0);
++ g_assert (priv->height > 0 && priv->width > 0);
+
+ priv->dirty = TRUE;
+
+--
+2.8.1
+
Modified: desktop/experimental/mutter/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/patches/series?rev=49457&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/patches/series [utf-8] (original)
+++ desktop/experimental/mutter/debian/patches/series [utf-8] Mon Aug 8 19:27:17 2016
@@ -1,3 +1,3 @@
+Fix-build-of-clutter-tests.patch
+clutter-Fix-typo-in-assert.patch
01_Wcast-align.patch
-wayland-add-extended-state-for-tiled.patch
-fix-gint64-format.patch
Modified: desktop/experimental/mutter/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/mutter/debian/rules?rev=49457&op=diff
==============================================================================
--- desktop/experimental/mutter/debian/rules [utf-8] (original)
+++ desktop/experimental/mutter/debian/rules [utf-8] Mon Aug 8 19:27:17 2016
@@ -30,7 +30,7 @@
dh_girepository /usr/lib/$(DEB_HOST_MULTIARCH)/mutter
override_dh_makeshlibs:
- dh_makeshlibs -V'libmutter0h (>= 3.19.0)'
+ dh_makeshlibs -V'libmutter0i (>= 3.21.0)'
override_dh_strip:
dh_strip --dbgsym-migration='mutter-dbg (<< 3.18.3-2~)'
More information about the pkg-gnome-commits
mailing list