diff -Nru clutter-1.0-1.26.0+dfsg/debian/changelog clutter-1.0-1.26.0+dfsg/debian/changelog --- clutter-1.0-1.26.0+dfsg/debian/changelog 2016-11-18 21:23:04.000000000 +0000 +++ clutter-1.0-1.26.0+dfsg/debian/changelog 2016-12-04 06:26:42.000000000 +0000 @@ -1,3 +1,13 @@ +clutter-1.0 (1.26.0+dfsg-2+rpi1) stretch-staging; urgency=medium + + [changes brought forward from 1.24.0-1+rpi1 by Peter Michael Green at Fri, 25 Sep 2015 00:25:32 +0000] + * Disable wayland and egl support. + * Move libwayland-dev from depends to build-conflicts (not sure why it doesn't + seem to be in build-depends). attempting to disable wayland + from debian/rules doesn't seem to work. + + -- Raspbian forward porter Sun, 04 Dec 2016 06:26:42 +0000 + clutter-1.0 (1.26.0+dfsg-2) unstable; urgency=medium * d/p/Don-t-create-the-Cogl-GLib-source-multiple-times.patch: diff -Nru clutter-1.0-1.26.0+dfsg/debian/control clutter-1.0-1.26.0+dfsg/debian/control --- clutter-1.0-1.26.0+dfsg/debian/control 2016-11-18 21:23:04.000000000 +0000 +++ clutter-1.0-1.26.0+dfsg/debian/control 2016-12-04 06:26:42.000000000 +0000 @@ -6,7 +6,7 @@ Section: libs Priority: optional Maintainer: Debian GNOME Maintainers -Uploaders: Andreas Henriksson , Emilio Pozuelo Monfort , Michael Biebl , Sjoerd Simons , Rico Tzschichholz +Uploaders: Andreas Henriksson , Michael Biebl , Sjoerd Simons , Rico Tzschichholz Build-Depends: debhelper (>= 9), cdbs (>= 0.4.93~), dh-autoreconf, @@ -36,6 +36,8 @@ libudev-dev (>= 136) [linux-any], libgudev-1.0-dev [linux-any], libxkbcommon-dev, +Build-Conflicts: + libwayland-dev Standards-Version: 3.9.8 Homepage: http://www.clutter-project.org/ Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/clutter-1.0 @@ -89,7 +91,6 @@ libxcomposite-dev, libxi-dev, libjson-glib-dev (>= 0.12), - libwayland-dev [linux-any], libinput-dev (>= 0.4.0) [linux-any], libudev-dev (>= 136) [linux-any], libxkbcommon-dev, diff -Nru clutter-1.0-1.26.0+dfsg/debian/control.in clutter-1.0-1.26.0+dfsg/debian/control.in --- clutter-1.0-1.26.0+dfsg/debian/control.in 2016-10-09 11:21:17.000000000 +0000 +++ clutter-1.0-1.26.0+dfsg/debian/control.in 2016-12-04 06:26:42.000000000 +0000 @@ -32,6 +32,8 @@ libudev-dev (>= 136) [linux-any], libgudev-1.0-dev [linux-any], libxkbcommon-dev, +Build-Conflicts: + libwayland-dev Standards-Version: 3.9.8 Homepage: http://www.clutter-project.org/ Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/clutter-1.0 @@ -85,7 +87,6 @@ libxcomposite-dev, libxi-dev, libjson-glib-dev (>= 0.12), - libwayland-dev [linux-any], libinput-dev (>= 0.4.0) [linux-any], libudev-dev (>= 136) [linux-any], libxkbcommon-dev, diff -Nru clutter-1.0-1.26.0+dfsg/debian/libclutter-1.0-0.symbols clutter-1.0-1.26.0+dfsg/debian/libclutter-1.0-0.symbols --- clutter-1.0-1.26.0+dfsg/debian/libclutter-1.0-0.symbols 2016-03-26 12:44:57.000000000 +0000 +++ clutter-1.0-1.26.0+dfsg/debian/libclutter-1.0-0.symbols 2016-12-04 06:26:42.000000000 +0000 @@ -655,28 +655,22 @@ clutter_effect_get_type@Base 1.10.0 clutter_effect_paint_flags_get_type@Base 1.10.0 clutter_effect_queue_repaint@Base 1.10.0 - clutter_egl_display@Base 1.16.0 - clutter_egl_freeze_master_clock@Base 1.19.8 - clutter_egl_get_egl_display@Base 1.16.0 - (arch=linux-any)clutter_egl_set_kms_fd@Base 1.18.0 - clutter_egl_thaw_master_clock@Base 1.19.8 - clutter_eglx_display@Base 1.16.0 - (arch=linux-any)clutter_evdev_add_filter@Base 1.19.8 - (arch=linux-any)clutter_evdev_event_get_event_code@Base 1.25.6 - (arch=linux-any)clutter_evdev_event_get_relative_motion@Base 1.25.6 - (arch=linux-any)clutter_evdev_event_get_time_usec@Base 1.25.6 - (arch=linux-any)clutter_evdev_event_sequence_get_slot@Base 1.19.8 - (arch=linux-any)clutter_evdev_get_keyboard_map@Base 1.18.2~ - (arch=linux-any)clutter_evdev_input_device_get_libinput_device@Base 1.19.8 - (arch=linux-any)clutter_evdev_reclaim_devices@Base 1.18.2~ - (arch=linux-any)clutter_evdev_release_devices@Base 1.18.2~ - (arch=linux-any)clutter_evdev_remove_filter@Base 1.19.8 - (arch=linux-any)clutter_evdev_set_device_callbacks@Base 1.18.2~ - (arch=linux-any)clutter_evdev_set_keyboard_layout_index@Base 1.19.8 - (arch=linux-any)clutter_evdev_set_keyboard_map@Base 1.18.2~ - (arch=linux-any)clutter_evdev_set_keyboard_repeat@Base 1.18.2~ - (arch=linux-any)clutter_evdev_set_pointer_constrain_callback@Base 1.18.2~ - (arch=linux-any)clutter_evdev_warp_pointer@Base 1.19.8 + clutter_evdev_add_filter@Base 1.26.0-2 + clutter_evdev_event_get_event_code@Base 1.26.0-2 + clutter_evdev_event_get_relative_motion@Base 1.26.0-2 + clutter_evdev_event_get_time_usec@Base 1.26.0-2 + clutter_evdev_event_sequence_get_slot@Base 1.26.0-2 + clutter_evdev_get_keyboard_map@Base 1.26.0-2 + clutter_evdev_input_device_get_libinput_device@Base 1.26.0-2 + clutter_evdev_reclaim_devices@Base 1.26.0-2 + clutter_evdev_release_devices@Base 1.26.0-2 + clutter_evdev_remove_filter@Base 1.26.0-2 + clutter_evdev_set_device_callbacks@Base 1.26.0-2 + clutter_evdev_set_keyboard_layout_index@Base 1.26.0-2 + clutter_evdev_set_keyboard_map@Base 1.26.0-2 + clutter_evdev_set_keyboard_repeat@Base 1.26.0-2 + clutter_evdev_set_pointer_constrain_callback@Base 1.26.0-2 + clutter_evdev_warp_pointer@Base 1.26.0-2 clutter_event_add_filter@Base 1.17.6 clutter_event_copy@Base 1.10.0 clutter_event_flags_get_type@Base 1.10.0 @@ -1633,20 +1627,6 @@ clutter_vertex_get_type@Base 1.10.0 clutter_vertex_init@Base 1.10.0 clutter_vertex_new@Base 1.10.0 - (arch=linux-any)clutter_wayland_disable_event_retrieval@Base 1.16.0 - (arch=linux-any)clutter_wayland_input_device_get_wl_seat@Base 1.16.0 - (arch=linux-any)clutter_wayland_set_compositor_display@Base 1.16.0 - (arch=linux-any)clutter_wayland_set_display@Base 1.16.0 - (arch=linux-any)clutter_wayland_stage_get_wl_shell_surface@Base 1.16.0 - (arch=linux-any)clutter_wayland_stage_get_wl_surface@Base 1.16.0 - (arch=linux-any)clutter_wayland_stage_set_wl_surface@Base 1.16.0 - (arch=linux-any)clutter_wayland_surface_attach_buffer@Base 1.16.0 - (arch=linux-any)clutter_wayland_surface_damage_buffer@Base 1.16.0 - (arch=linux-any)clutter_wayland_surface_get_cogl_texture@Base 1.16.0 - (arch=linux-any)clutter_wayland_surface_get_surface@Base 1.16.0 - (arch=linux-any)clutter_wayland_surface_get_type@Base 1.16.0 - (arch=linux-any)clutter_wayland_surface_new@Base 1.16.0 - (arch=linux-any)clutter_wayland_surface_set_surface@Base 1.16.0 clutter_x11_add_filter@Base 1.10.0 clutter_x11_disable_event_retrieval@Base 1.10.0 clutter_x11_enable_xinput@Base 1.10.0 diff -Nru clutter-1.0-1.26.0+dfsg/debian/rules clutter-1.0-1.26.0+dfsg/debian/rules --- clutter-1.0-1.26.0+dfsg/debian/rules 2016-10-09 12:08:00.000000000 +0000 +++ clutter-1.0-1.26.0+dfsg/debian/rules 2016-12-04 06:26:42.000000000 +0000 @@ -16,7 +16,6 @@ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ --enable-x11-backend=yes \ --enable-gdk-backend=yes \ - --enable-egl-backend=yes \ --enable-gtk-doc \ --disable-docs \ --enable-installed-tests \ @@ -25,9 +24,9 @@ ifeq ($(DEB_HOST_ARCH_OS),linux) DEB_CONFIGURE_EXTRA_FLAGS += \ - --enable-wayland-backend=yes \ - --enable-wayland-compositor=yes \ - --enable-evdev-input=yes + --enable-wayland-backend=no \ + --enable-wayland-compositor=no \ + --enable-evdev-input=no endif common-binary-predeb-arch:: list-missing