diff -Nru clutter-1.0-1.9.16/debian/changelog clutter-1.0-1.9.16/debian/changelog --- clutter-1.0-1.9.16/debian/changelog 2012-03-21 14:43:15.000000000 -0300 +++ clutter-1.0-1.9.16/debian/changelog 2012-03-21 20:01:46.000000000 -0300 @@ -1,3 +1,21 @@ +clutter-1.0 (1.9.16-0ubuntu2) precise; urgency=low + + * debian/rules: + - EGL support for ARM doesn't mean EGLX anymore, that's now part of cogl. + As we don't yet support EGL framebuffer (EGL native windowing), drop + --enable-egl-backend=yes for ARM (LP: #960893) + * debian/control.in: + - adding libgtk-3-dev as it's now required for gdk related symbols + - removing libgles2-dev dependencies for ARM, as the EGL support is now + part the cogl package + * debian/libclutter-1.0-0.symbols: + - removing egl related symbols as it's not related with the EGLX support + anymore + * debian/patches/eglx_glx_share_same_soname.patch: + - removing patch as this is now fixed with upstream and cogl + + -- Ricardo Salveti de Araujo Wed, 21 Mar 2012 19:46:37 -0300 + clutter-1.0 (1.9.16-0ubuntu1) precise; urgency=low * New upstream release. diff -Nru clutter-1.0-1.9.16/debian/control clutter-1.0-1.9.16/debian/control --- clutter-1.0-1.9.16/debian/control 2012-03-21 14:43:18.000000000 -0300 +++ clutter-1.0-1.9.16/debian/control 2012-03-21 20:01:50.000000000 -0300 @@ -15,7 +15,6 @@ autopoint, gnome-pkg-tools, libgl1-mesa-dev (>= 7.1~rc3-1~) [!armel !armhf], - libgles2-mesa-dev (>= 7.1~rc3-1~) [armel armhf] | libgles2-dev [armel armhf], libcairo2-dev (>= 1.10), libcogl-dev (>= 1.9.6), libcogl-pango-dev (>= 1.9.6), @@ -32,7 +31,8 @@ libgirepository1.0-dev (>= 0.9.12), gobject-introspection (>= 0.9.12-4~), libatk1.0-dev (>= 2.1.5), - libgdk-pixbuf2.0-dev (>= 2.0) + libgdk-pixbuf2.0-dev (>= 2.0), + libgtk-3-dev Standards-Version: 3.9.2 Homepage: http://www.clutter-project.org/ Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/clutter-1.0 @@ -75,7 +75,6 @@ libcogl-dev (>= 1.9.6), libcogl-pango-dev (>= 1.9.6), libgl1-mesa-dev (>= 7.1~rc3-1~) [!armel !armhf], - libgles2-mesa-dev (>= 7.1~rc3-1~) [armel armhf] | libgles2-dev [armel armhf], libdrm-dev [!hurd-any], libx11-dev, libxext-dev, @@ -84,6 +83,7 @@ libxcomposite-dev, libxi-dev, libjson-glib-dev (>= 0.12), + libgtk-3-dev, ${misc:Depends}, ${shlibs:Depends} Recommends: pkg-config diff -Nru clutter-1.0-1.9.16/debian/control.in clutter-1.0-1.9.16/debian/control.in --- clutter-1.0-1.9.16/debian/control.in 2012-03-21 14:43:15.000000000 -0300 +++ clutter-1.0-1.9.16/debian/control.in 2012-03-21 19:57:39.000000000 -0300 @@ -10,7 +10,6 @@ autopoint, gnome-pkg-tools, libgl1-mesa-dev (>= 7.1~rc3-1~) [!armel !armhf], - libgles2-mesa-dev (>= 7.1~rc3-1~) [armel armhf] | libgles2-dev [armel armhf], libcairo2-dev (>= 1.10), libcogl-dev (>= 1.9.6), libcogl-pango-dev (>= 1.9.6), @@ -27,7 +26,8 @@ libgirepository1.0-dev (>= 0.9.12), gobject-introspection (>= 0.9.12-4~), libatk1.0-dev (>= 2.1.5), - libgdk-pixbuf2.0-dev (>= 2.0) + libgdk-pixbuf2.0-dev (>= 2.0), + libgtk-3-dev Standards-Version: 3.9.2 Homepage: http://www.clutter-project.org/ Vcs-Svn: svn://anonscm.debian.org/svn/pkg-gnome/desktop/unstable/clutter-1.0 @@ -70,7 +70,6 @@ libcogl-dev (>= 1.9.6), libcogl-pango-dev (>= 1.9.6), libgl1-mesa-dev (>= 7.1~rc3-1~) [!armel !armhf], - libgles2-mesa-dev (>= 7.1~rc3-1~) [armel armhf] | libgles2-dev [armel armhf], libdrm-dev [!hurd-any], libx11-dev, libxext-dev, @@ -79,6 +78,7 @@ libxcomposite-dev, libxi-dev, libjson-glib-dev (>= 0.12), + libgtk-3-dev, ${misc:Depends}, ${shlibs:Depends} Recommends: pkg-config diff -Nru clutter-1.0-1.9.16/debian/libclutter-1.0-0.symbols clutter-1.0-1.9.16/debian/libclutter-1.0-0.symbols --- clutter-1.0-1.9.16/debian/libclutter-1.0-0.symbols 2012-03-21 14:43:15.000000000 -0300 +++ clutter-1.0-1.9.16/debian/libclutter-1.0-0.symbols 2012-03-21 19:57:39.000000000 -0300 @@ -614,7 +614,6 @@ clutter_effect_get_type@Base 1.4.0 clutter_effect_paint_flags_get_type@Base 1.7.6 clutter_effect_queue_repaint@Base 1.7.6 -(arch=armel armhf)#include "libclutter-1.0-0.symbols.egl" clutter_event_copy@Base 1.0.0 clutter_event_flags_get_type@Base 1.0.0 clutter_event_free@Base 1.0.0 diff -Nru clutter-1.0-1.9.16/debian/libclutter-1.0-0.symbols.egl clutter-1.0-1.9.16/debian/libclutter-1.0-0.symbols.egl --- clutter-1.0-1.9.16/debian/libclutter-1.0-0.symbols.egl 2012-03-21 14:43:15.000000000 -0300 +++ clutter-1.0-1.9.16/debian/libclutter-1.0-0.symbols.egl 1969-12-31 21:00:00.000000000 -0300 @@ -1,3 +0,0 @@ - clutter_egl_display@Base 1.0.0 - clutter_egl_get_egl_display@Base 1.5.10 - clutter_eglx_display@Base 1.0.0 diff -Nru clutter-1.0-1.9.16/debian/patches/eglx_glx_share_same_soname.patch clutter-1.0-1.9.16/debian/patches/eglx_glx_share_same_soname.patch --- clutter-1.0-1.9.16/debian/patches/eglx_glx_share_same_soname.patch 2012-03-21 14:43:15.000000000 -0300 +++ clutter-1.0-1.9.16/debian/patches/eglx_glx_share_same_soname.patch 1969-12-31 21:00:00.000000000 -0300 @@ -1,27 +0,0 @@ -From: Rico Tzschichholz -Subject: Eglx and glx should share the same SONAME, for compatibility reasons. -Last-Update: 2012-02-23 - -Based on: http://bugzilla.clutter-project.org/show_bug.cgi?id=2276 - -Index: clutter-1.0-1.9.12/clutter/Makefile.am -=================================================================== ---- clutter-1.0-1.9.12.orig/clutter/Makefile.am -+++ clutter-1.0-1.9.12/clutter/Makefile.am -@@ -632,10 +632,14 @@ - clutteregl_includedir = $(clutter_includedir)/egl - clutteregl_include_HEADERS = $(egl_source_h) - --clutter-egl-$(CLUTTER_API_VERSION).pc: clutter-$(CLUTTER_API_VERSION).pc -+clutter-glx-$(CLUTTER_API_VERSION).pc: clutter-$(CLUTTER_API_VERSION).pc - $(QUIET_GEN)cp -f $< $(@F) - --pc_files += clutter-egl-$(CLUTTER_API_VERSION).pc -+pc_files += clutter-glx-$(CLUTTER_API_VERSION).pc -+ -+compat_libs += \ -+ libclutter-glx-$(CLUTTER_API_VERSION).so \ -+ $(NULL) - endif # SUPPORT_EGL - - # OSX backend rules diff -Nru clutter-1.0-1.9.16/debian/patches/series clutter-1.0-1.9.16/debian/patches/series --- clutter-1.0-1.9.16/debian/patches/series 2012-03-21 14:43:15.000000000 -0300 +++ clutter-1.0-1.9.16/debian/patches/series 2012-03-21 19:57:39.000000000 -0300 @@ -1,2 +1 @@ fix_test_data_path.patch -#eglx_glx_share_same_soname.patch diff -Nru clutter-1.0-1.9.16/debian/rules clutter-1.0-1.9.16/debian/rules --- clutter-1.0-1.9.16/debian/rules 2012-03-21 14:43:15.000000000 -0300 +++ clutter-1.0-1.9.16/debian/rules 2012-03-21 19:57:39.000000000 -0300 @@ -19,9 +19,5 @@ --enable-introspection=yes DEB_DBG_PACKAGE_libclutter-1.0-0 := libclutter-1.0-dbg -ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),armel armhf)) - DEB_CONFIGURE_EXTRA_FLAGS += --enable-egl-backend=yes -endif - common-binary-predeb-arch:: list-missing