diff --git a/debian/changelog b/debian/changelog index 6cf3988bdd..03c18a39e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,50 @@ +gtk+3.0 (3.13.9-2) unstable; urgency=medium + + * Upload to unstable. + + -- Andreas Henriksson Fri, 19 Sep 2014 22:25:39 +0200 + +gtk+3.0 (3.13.9-1) experimental; urgency=medium + + [ Andreas Henriksson ] + * libgtk-3-common: Depend on adwaita-icon-theme (>= ${gnome:Version}) + - gtk+ should guarantee we have atleast one sane icon theme available. + * debian/rules: Include gnome-version.mk to generate ${gnome:Version} + + [ Emilio Pozuelo Monfort ] + * New upstream development release. + * debian/control.in: + + Bump libpango1.0-dev minimum (build-)dependency. + + -- Emilio Pozuelo Monfort Fri, 19 Sep 2014 17:37:42 +0200 + +gtk+3.0 (3.13.8-1) experimental; urgency=medium + + [ Andreas Henriksson ] + * New upstream development release (3.13.7) + * Update build-dependencies according to configure.ac + - bump libglib2.0-dev to (>= 2.41.2) + * Update libgtk-3.0-dev dependency on libglib2.0-dev to (>= 2.41.2) + * Massage debian/patches/018_gdkenumtypes.c_location.patch to apply again + * Drop backported/merged patches now in released version: + - debian/patches/072_Avoid-pkg-config-atleast-version.patch + * Have quilt refresh remaining patches. + * Bump gobject-introspection build-dependency to (>= 1.41.3) + - this one supports new "nullable" annotation. + * Build-depend on adwaita-icon-theme instead of gnome-icon-theme-symbolic + * Update debian/libgtk-3-0.symbols with many additions + * New upstream development release (3.13.8) + * Update build-dependencies according to configure.ac changes: + - Bump libgdk-pixbuf2.0-dev to (>= 2.30.0) + - Bump libwayland-dev to (>= 1.5.91) + * debian/patches/032_mips_treeview_row_separator_height.patch: + - massage the patch into applying again. + * Update debian/libgtk-3-0.symbols + - 4 dropped gdk_wayland_*_libgtk_only symbols, should be unused. + - 3 new wayland related symbols + + -- Sjoerd Simons Fri, 05 Sep 2014 22:50:11 +0200 + gtk+3.0 (3.12.2-3) unstable; urgency=medium * Team upload diff --git a/debian/control b/debian/control index dcc0e5265e..bfcdcb3ae7 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: gtk+3.0 Section: libs Priority: optional Maintainer: Debian GNOME Maintainers -Uploaders: Andreas Henriksson , Emilio Pozuelo Monfort +Uploaders: Andreas Henriksson , Emilio Pozuelo Monfort , Sjoerd Simons Build-Depends: debhelper (>= 8.1.3), cdbs (>= 0.4.93), gnome-pkg-tools (>= 0.11), @@ -14,14 +14,14 @@ Build-Depends: debhelper (>= 8.1.3), autotools-dev, dbus-x11, gsettings-desktop-schemas, - gnome-icon-theme-symbolic, + adwaita-icon-theme, at-spi2-core, - libglib2.0-dev (>= 2.39.5), - libgdk-pixbuf2.0-dev (>= 2.27.1), - libpango1.0-dev (>= 1.32.4), + libglib2.0-dev (>= 2.41.2), + libgdk-pixbuf2.0-dev (>= 2.30.0), + libpango1.0-dev (>= 1.36.7), libatk1.0-dev (>= 2.7.5), libatk-bridge2.0-dev, - libwayland-dev (>= 1.4.0) [linux-any], + libwayland-dev (>= 1.5.91) [linux-any], libxkbcommon-dev (>= 0.2.0), libx11-dev (>= 2:1.3.3-2), libxext-dev (>= 2:1.1.1-3), @@ -42,7 +42,7 @@ Build-Depends: debhelper (>= 8.1.3), libcolord-dev (>= 0.1.9), librest-dev, libjson-glib-dev, - gobject-introspection (>= 1.39.0), + gobject-introspection (>= 1.41.3), libgirepository1.0-dev (>= 1.39.0), xvfb Build-Depends-Indep: docbook-xml, @@ -104,7 +104,7 @@ Description: GTK+ graphical user interface library - minimal runtime Package: libgtk-3-common Section: misc Architecture: all -Depends: ${misc:Depends} +Depends: ${misc:Depends}, adwaita-icon-theme (>= ${gnome:Version}) Recommends: libgtk-3-0 Breaks: libgtk-3-0 (<< 3.5.4) Replaces: libgtk-3-0 (<< 3.5.4) @@ -141,9 +141,9 @@ Depends: libgtk-3-0 (= ${binary:Version}), libgtk-3-common, ${misc:Depends}, ${shlibs:Depends}, - libglib2.0-dev (>= 2.39.0), + libglib2.0-dev (>= 2.41.2), libgdk-pixbuf2.0-dev (>= 2.27.1), - libpango1.0-dev (>= 1.32.4), + libpango1.0-dev (>= 1.36.7), libatk1.0-dev (>= 2.7.5), libatk-bridge2.0-dev, libcairo2-dev (>= 1.10.0), diff --git a/debian/control.in b/debian/control.in index b4b87ca90c..9588738e9b 100644 --- a/debian/control.in +++ b/debian/control.in @@ -14,14 +14,14 @@ Build-Depends: debhelper (>= 8.1.3), autotools-dev, dbus-x11, gsettings-desktop-schemas, - gnome-icon-theme-symbolic, + adwaita-icon-theme, at-spi2-core, - libglib2.0-dev (>= 2.39.5), - libgdk-pixbuf2.0-dev (>= 2.27.1), - libpango1.0-dev (>= 1.32.4), + libglib2.0-dev (>= 2.41.2), + libgdk-pixbuf2.0-dev (>= 2.30.0), + libpango1.0-dev (>= 1.36.7), libatk1.0-dev (>= 2.7.5), libatk-bridge2.0-dev, - libwayland-dev (>= 1.4.0) [linux-any], + libwayland-dev (>= 1.5.91) [linux-any], libxkbcommon-dev (>= 0.2.0), libx11-dev (>= 2:1.3.3-2), libxext-dev (>= 2:1.1.1-3), @@ -42,7 +42,7 @@ Build-Depends: debhelper (>= 8.1.3), libcolord-dev (>= 0.1.9), librest-dev, libjson-glib-dev, - gobject-introspection (>= 1.39.0), + gobject-introspection (>= 1.41.3), libgirepository1.0-dev (>= 1.39.0), xvfb Build-Depends-Indep: docbook-xml, @@ -104,7 +104,7 @@ Description: GTK+ graphical user interface library - minimal runtime Package: @COMMON_PKG@ Section: misc Architecture: all -Depends: ${misc:Depends} +Depends: ${misc:Depends}, adwaita-icon-theme (>= ${gnome:Version}) Recommends: @SHARED_PKG@ Breaks: @SHARED_PKG@ (<< 3.5.4) Replaces: @SHARED_PKG@ (<< 3.5.4) @@ -141,9 +141,9 @@ Depends: @SHARED_PKG@ (= ${binary:Version}), @COMMON_PKG@, ${misc:Depends}, ${shlibs:Depends}, - libglib2.0-dev (>= 2.39.0), + libglib2.0-dev (>= 2.41.2), libgdk-pixbuf2.0-dev (>= 2.27.1), - libpango1.0-dev (>= 1.32.4), + libpango1.0-dev (>= 1.36.7), libatk1.0-dev (>= 2.7.5), libatk-bridge2.0-dev, libcairo2-dev (>= 1.10.0), diff --git a/debian/libgtk-3-0.symbols b/debian/libgtk-3-0.symbols index 8e45229fac..6ca9d16ed3 100644 --- a/debian/libgtk-3-0.symbols +++ b/debian/libgtk-3-0.symbols @@ -191,6 +191,7 @@ libgdk-3.so.0 libgtk-3-0 #MINVER# gdk_event_peek@Base 3.0.0 gdk_event_put@Base 3.0.0 gdk_event_request_motions@Base 3.0.0 + gdk_event_sequence_get_type@Base 3.13.7 gdk_event_set_device@Base 3.0.0 gdk_event_set_screen@Base 3.0.0 gdk_event_set_source_device@Base 3.0.0 @@ -386,19 +387,22 @@ libgdk-3.so.0 libgtk-3-0 #MINVER# gdk_visual_get_type@Base 3.0.0 gdk_visual_get_visual_type@Base 3.0.0 gdk_visual_type_get_type@Base 3.0.0 - (arch=linux-any)gdk_wayland_device_clear_selection_content_libgtk_only@Base 3.9.10 - (arch=linux-any)gdk_wayland_device_get_selection_type_atoms_libgtk_only@Base 3.9.10 +#MISSING: 3.13.8-1# (arch=linux-any)gdk_wayland_device_clear_selection_content_libgtk_only@Base 3.9.10 +#MISSING: 3.13.8-1# (arch=linux-any)gdk_wayland_device_get_selection_type_atoms_libgtk_only@Base 3.9.10 (arch=linux-any)gdk_wayland_device_get_type@Base 3.9.10 (arch=linux-any)gdk_wayland_device_get_wl_keyboard@Base 3.9.10 (arch=linux-any)gdk_wayland_device_get_wl_pointer@Base 3.9.10 (arch=linux-any)gdk_wayland_device_get_wl_seat@Base 3.9.10 - (arch=linux-any)gdk_wayland_device_offer_selection_content_libgtk_only@Base 3.9.10 - (arch=linux-any)gdk_wayland_device_request_selection_content_libgtk_only@Base 3.9.10 +#MISSING: 3.13.8-1# (arch=linux-any)gdk_wayland_device_offer_selection_content_libgtk_only@Base 3.9.10 +#MISSING: 3.13.8-1# (arch=linux-any)gdk_wayland_device_request_selection_content_libgtk_only@Base 3.9.10 (arch=linux-any)gdk_wayland_display_get_type@Base 3.9.10 (arch=linux-any)gdk_wayland_display_get_wl_compositor@Base 3.9.10 (arch=linux-any)gdk_wayland_display_get_wl_display@Base 3.9.10 (arch=linux-any)gdk_wayland_display_get_xdg_shell@Base 3.11.5 (arch=linux-any)gdk_wayland_display_set_cursor_theme@Base 3.9.10 + (arch=linux-any)gdk_wayland_drag_context_get_dnd_window_libgtk_only@Base 3.13.8 + (arch=linux-any)gdk_wayland_selection_add_targets_libgtk_only@Base 3.13.8 + (arch=linux-any)gdk_wayland_selection_clear_targets_libgtk_only@Base 3.13.8 (arch=linux-any)gdk_wayland_window_get_type@Base 3.9.10 (arch=linux-any)gdk_wayland_window_get_wl_surface@Base 3.9.10 (arch=linux-any)gdk_wayland_window_set_dbus_properties_libgtk_only@Base 3.10.0 @@ -553,6 +557,7 @@ libgdk-3.so.0 libgtk-3-0 #MINVER# gdk_window_shape_combine_region@Base 3.0.0 gdk_window_show@Base 3.0.0 gdk_window_show_unraised@Base 3.0.0 + gdk_window_show_window_menu@Base 3.13.7 gdk_window_state_get_type@Base 3.0.0 gdk_window_stick@Base 3.0.0 gdk_window_thaw_toplevel_updates_libgtk_only@Base 3.0.0 @@ -878,8 +883,10 @@ libgtk-3.so.0 libgtk-3-0 #MINVER# gtk_application_add_accelerator@Base 3.3.16 gtk_application_add_window@Base 3.0.0 gtk_application_get_accels_for_action@Base 3.11.5 + gtk_application_get_actions_for_accel@Base 3.13.7 gtk_application_get_active_window@Base 3.5.12 gtk_application_get_app_menu@Base 3.3.16 + gtk_application_get_menu_by_id@Base 3.13.7 gtk_application_get_menubar@Base 3.3.16 gtk_application_get_type@Base 3.0.0 gtk_application_get_window_by_id@Base 3.5.4 @@ -889,6 +896,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER# gtk_application_is_inhibited@Base 3.3.16 gtk_application_list_action_descriptions@Base 3.11.5 gtk_application_new@Base 3.0.0 + gtk_application_prefers_app_menu@Base 3.13.7 gtk_application_remove_accelerator@Base 3.3.16 gtk_application_remove_window@Base 3.0.0 gtk_application_set_accels_for_action@Base 3.11.5 @@ -1092,6 +1100,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER# gtk_cell_area_apply_attributes@Base 3.0.0 gtk_cell_area_attribute_connect@Base 3.0.0 gtk_cell_area_attribute_disconnect@Base 3.0.0 + gtk_cell_area_attribute_get_column@Base 3.13.7 gtk_cell_area_box_get_spacing@Base 3.0.0 gtk_cell_area_box_get_type@Base 3.0.0 gtk_cell_area_box_new@Base 3.0.0 @@ -1655,6 +1664,13 @@ libgtk-3.so.0 libgtk-3-0 #MINVER# gtk_event_box_new@Base 3.0.0 gtk_event_box_set_above_child@Base 3.0.0 gtk_event_box_set_visible_window@Base 3.0.0 + gtk_event_controller_get_propagation_phase@Base 3.13.7 + gtk_event_controller_get_type@Base 3.13.7 + gtk_event_controller_get_widget@Base 3.13.7 + gtk_event_controller_handle_event@Base 3.13.7 + gtk_event_controller_reset@Base 3.13.7 + gtk_event_controller_set_propagation_phase@Base 3.13.7 + gtk_event_sequence_state_get_type@Base 3.13.7 gtk_events_pending@Base 3.0.0 gtk_expander_accessible_get_type@Base 3.7.10 gtk_expander_get_expanded@Base 3.0.0 @@ -1873,6 +1889,58 @@ libgtk-3.so.0 libgtk-3-0 #MINVER# gtk_frame_set_label_align@Base 3.0.0 gtk_frame_set_label_widget@Base 3.0.0 gtk_frame_set_shadow_type@Base 3.0.0 + gtk_gesture_drag_get_offset@Base 3.13.7 + gtk_gesture_drag_get_start_point@Base 3.13.7 + gtk_gesture_drag_get_type@Base 3.13.7 + gtk_gesture_drag_new@Base 3.13.7 + gtk_gesture_get_bounding_box@Base 3.13.7 + gtk_gesture_get_bounding_box_center@Base 3.13.7 + gtk_gesture_get_device@Base 3.13.7 + gtk_gesture_get_group@Base 3.13.7 + gtk_gesture_get_last_event@Base 3.13.7 + gtk_gesture_get_last_updated_sequence@Base 3.13.7 + gtk_gesture_get_point@Base 3.13.7 + gtk_gesture_get_sequence_state@Base 3.13.7 + gtk_gesture_get_sequences@Base 3.13.7 + gtk_gesture_get_type@Base 3.13.7 + gtk_gesture_get_window@Base 3.13.7 + gtk_gesture_group@Base 3.13.7 + gtk_gesture_handles_sequence@Base 3.13.7 + gtk_gesture_is_active@Base 3.13.7 + gtk_gesture_is_grouped_with@Base 3.13.7 + gtk_gesture_is_recognized@Base 3.13.7 + gtk_gesture_long_press_get_type@Base 3.13.7 + gtk_gesture_long_press_new@Base 3.13.7 + gtk_gesture_multi_press_get_area@Base 3.13.7 + gtk_gesture_multi_press_get_type@Base 3.13.7 + gtk_gesture_multi_press_new@Base 3.13.7 + gtk_gesture_multi_press_set_area@Base 3.13.7 + gtk_gesture_pan_get_orientation@Base 3.13.7 + gtk_gesture_pan_get_type@Base 3.13.7 + gtk_gesture_pan_new@Base 3.13.7 + gtk_gesture_pan_set_orientation@Base 3.13.7 + gtk_gesture_rotate_get_angle_delta@Base 3.13.7 + gtk_gesture_rotate_get_type@Base 3.13.7 + gtk_gesture_rotate_new@Base 3.13.7 + gtk_gesture_set_sequence_state@Base 3.13.7 + gtk_gesture_set_state@Base 3.13.7 + gtk_gesture_set_window@Base 3.13.7 + gtk_gesture_single_get_button@Base 3.13.7 + gtk_gesture_single_get_current_button@Base 3.13.7 + gtk_gesture_single_get_current_sequence@Base 3.13.7 + gtk_gesture_single_get_exclusive@Base 3.13.7 + gtk_gesture_single_get_touch_only@Base 3.13.7 + gtk_gesture_single_get_type@Base 3.13.7 + gtk_gesture_single_set_button@Base 3.13.7 + gtk_gesture_single_set_exclusive@Base 3.13.7 + gtk_gesture_single_set_touch_only@Base 3.13.7 + gtk_gesture_swipe_get_type@Base 3.13.7 + gtk_gesture_swipe_get_velocity@Base 3.13.7 + gtk_gesture_swipe_new@Base 3.13.7 + gtk_gesture_ungroup@Base 3.13.7 + gtk_gesture_zoom_get_scale_delta@Base 3.13.7 + gtk_gesture_zoom_get_type@Base 3.13.7 + gtk_gesture_zoom_new@Base 3.13.7 gtk_get_binary_age@Base 3.0.0 gtk_get_current_event@Base 3.0.0 gtk_get_current_event_device@Base 3.0.0 @@ -2041,6 +2109,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER# gtk_icon_source_set_state@Base 3.0.0 gtk_icon_source_set_state_wildcarded@Base 3.0.0 gtk_icon_theme_add_builtin_icon@Base 3.0.0 + gtk_icon_theme_add_resource_path@Base 3.13.7 gtk_icon_theme_append_search_path@Base 3.0.0 gtk_icon_theme_choose_icon@Base 3.0.0 gtk_icon_theme_choose_icon_for_scale@Base 3.9.10 @@ -2326,6 +2395,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER# gtk_list_box_get_row_at_index@Base 3.9.10 gtk_list_box_get_row_at_y@Base 3.9.10 gtk_list_box_get_selected_row@Base 3.9.10 + gtk_list_box_get_selected_rows@Base 3.13.7 gtk_list_box_get_selection_mode@Base 3.9.10 gtk_list_box_get_type@Base 3.9.10 gtk_list_box_insert@Base 3.9.12 @@ -2336,12 +2406,19 @@ libgtk-3.so.0 libgtk-3-0 #MINVER# gtk_list_box_prepend@Base 3.9.12 gtk_list_box_row_accessible_get_type@Base 3.10.0 gtk_list_box_row_changed@Base 3.9.10 + gtk_list_box_row_get_activatable@Base 3.13.7 gtk_list_box_row_get_header@Base 3.9.10 gtk_list_box_row_get_index@Base 3.9.10 + gtk_list_box_row_get_selectable@Base 3.13.7 gtk_list_box_row_get_type@Base 3.9.10 + gtk_list_box_row_is_selected@Base 3.13.7 gtk_list_box_row_new@Base 3.9.10 + gtk_list_box_row_set_activatable@Base 3.13.7 gtk_list_box_row_set_header@Base 3.9.10 + gtk_list_box_row_set_selectable@Base 3.13.7 + gtk_list_box_select_all@Base 3.13.7 gtk_list_box_select_row@Base 3.9.10 + gtk_list_box_selected_foreach@Base 3.13.7 gtk_list_box_set_activate_on_single_click@Base 3.9.10 gtk_list_box_set_adjustment@Base 3.9.10 gtk_list_box_set_filter_func@Base 3.9.10 @@ -2349,6 +2426,8 @@ libgtk-3.so.0 libgtk-3-0 #MINVER# gtk_list_box_set_placeholder@Base 3.9.10 gtk_list_box_set_selection_mode@Base 3.9.10 gtk_list_box_set_sort_func@Base 3.9.10 + gtk_list_box_unselect_all@Base 3.13.7 + gtk_list_box_unselect_row@Base 3.13.7 gtk_list_store_append@Base 3.0.0 gtk_list_store_clear@Base 3.0.0 gtk_list_store_get_type@Base 3.0.0 @@ -2633,6 +2712,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER# gtk_paint_spinner@Base 3.0.0 gtk_paint_tab@Base 3.0.0 gtk_paint_vline@Base 3.0.0 + gtk_pan_direction_get_type@Base 3.13.7 gtk_paned_accessible_get_type@Base 3.7.10 gtk_paned_add1@Base 3.0.0 gtk_paned_add2@Base 3.0.0 @@ -2679,6 +2759,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER# gtk_places_sidebar_get_open_flags@Base 3.9.10 gtk_places_sidebar_get_show_connect_to_server@Base 3.9.10 gtk_places_sidebar_get_show_desktop@Base 3.9.10 + gtk_places_sidebar_get_show_enter_location@Base 3.13.7 gtk_places_sidebar_get_type@Base 3.9.10 gtk_places_sidebar_list_shortcuts@Base 3.9.10 gtk_places_sidebar_new@Base 3.9.10 @@ -2688,6 +2769,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER# gtk_places_sidebar_set_open_flags@Base 3.9.10 gtk_places_sidebar_set_show_connect_to_server@Base 3.9.10 gtk_places_sidebar_set_show_desktop@Base 3.9.10 + gtk_places_sidebar_set_show_enter_location@Base 3.13.7 gtk_plug_construct@Base 3.0.0 gtk_plug_construct_for_display@Base 3.0.0 gtk_plug_get_embedded@Base 3.0.0 @@ -2987,6 +3069,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER# gtk_progress_bar_set_show_text@Base 3.0.0 gtk_progress_bar_set_text@Base 3.0.0 gtk_propagate_event@Base 3.0.0 + gtk_propagation_phase_get_type@Base 3.13.7 gtk_radio_action_get_current_value@Base 3.0.0 gtk_radio_action_get_group@Base 3.0.0 gtk_radio_action_get_type@Base 3.0.0 @@ -3572,9 +3655,11 @@ libgtk-3.so.0 libgtk-3-0 #MINVER# gtk_style_set_background@Base 3.0.0 gtk_switch_accessible_get_type@Base 3.7.10 gtk_switch_get_active@Base 3.0.0 + gtk_switch_get_state@Base 3.13.7 gtk_switch_get_type@Base 3.0.0 gtk_switch_new@Base 3.0.0 gtk_switch_set_active@Base 3.0.0 + gtk_switch_set_state@Base 3.13.7 gtk_symbolic_color_get_type@Base 3.0.0 gtk_symbolic_color_new_alpha@Base 3.0.0 gtk_symbolic_color_new_literal@Base 3.0.0 @@ -3935,6 +4020,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER# gtk_text_view_get_window_type@Base 3.0.0 gtk_text_view_get_wrap_mode@Base 3.0.0 gtk_text_view_im_context_filter_keypress@Base 3.0.0 + gtk_text_view_layer_get_type@Base 3.13.7 gtk_text_view_move_child@Base 3.0.0 gtk_text_view_move_mark_onscreen@Base 3.0.0 gtk_text_view_move_visually@Base 3.0.0 @@ -4541,6 +4627,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER# gtk_widget_get_can_focus@Base 3.0.0 gtk_widget_get_child_requisition@Base 3.0.0 gtk_widget_get_child_visible@Base 3.0.0 + gtk_widget_get_clip@Base 3.13.7 gtk_widget_get_clipboard@Base 3.0.0 gtk_widget_get_composite_name@Base 3.0.0 gtk_widget_get_default_direction@Base 3.0.0 @@ -4667,6 +4754,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER# gtk_widget_path_iter_get_object_type@Base 3.0.0 gtk_widget_path_iter_get_sibling_index@Base 3.1.6 gtk_widget_path_iter_get_siblings@Base 3.1.6 + gtk_widget_path_iter_get_state@Base 3.13.7 gtk_widget_path_iter_has_class@Base 3.0.0 gtk_widget_path_iter_has_name@Base 3.0.0 gtk_widget_path_iter_has_qclass@Base 3.0.0 @@ -4679,6 +4767,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER# gtk_widget_path_iter_remove_region@Base 3.0.0 gtk_widget_path_iter_set_name@Base 3.0.0 gtk_widget_path_iter_set_object_type@Base 3.0.0 + gtk_widget_path_iter_set_state@Base 3.13.7 gtk_widget_path_length@Base 3.0.0 gtk_widget_path_new@Base 3.0.0 gtk_widget_path_prepend_type@Base 3.0.0 @@ -4712,6 +4801,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER# gtk_widget_set_can_default@Base 3.0.0 gtk_widget_set_can_focus@Base 3.0.0 gtk_widget_set_child_visible@Base 3.0.0 + gtk_widget_set_clip@Base 3.13.7 gtk_widget_set_composite_name@Base 3.0.0 gtk_widget_set_default_direction@Base 3.0.0 gtk_widget_set_device_enabled@Base 3.0.0 @@ -4876,6 +4966,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER# gtk_window_set_icon_from_file@Base 3.0.0 gtk_window_set_icon_list@Base 3.0.0 gtk_window_set_icon_name@Base 3.0.0 + gtk_window_set_interactive_debugging@Base 3.13.7 gtk_window_set_keep_above@Base 3.0.0 gtk_window_set_keep_below@Base 3.0.0 gtk_window_set_mnemonic_modifier@Base 3.0.0 diff --git a/debian/missing-sources/rawinflate.js b/debian/missing-sources/rawinflate.js deleted file mode 120000 index 98a73f52a6..0000000000 --- a/debian/missing-sources/rawinflate.js +++ /dev/null @@ -1 +0,0 @@ -zlib.js-0.1.6/src/rawinflate.js \ No newline at end of file diff --git a/debian/missing-sources/rawinflate.js b/debian/missing-sources/rawinflate.js new file mode 100644 index 0000000000..98a73f52a6 --- /dev/null +++ b/debian/missing-sources/rawinflate.js @@ -0,0 +1 @@ +zlib.js-0.1.6/src/rawinflate.js \ No newline at end of file diff --git a/debian/missing-sources/zlib.js-0.1.6/closure-primitives/depswriter.py b/debian/missing-sources/zlib.js-0.1.6/closure-primitives/depswriter.py old mode 100755 new mode 100644 diff --git a/debian/missing-sources/zlib.js-0.1.6/closure-primitives/source.py b/debian/missing-sources/zlib.js-0.1.6/closure-primitives/source.py old mode 100755 new mode 100644 diff --git a/debian/missing-sources/zlib.js-0.1.6/closure-primitives/treescan.py b/debian/missing-sources/zlib.js-0.1.6/closure-primitives/treescan.py old mode 100755 new mode 100644 diff --git a/debian/patches/016_no_offscreen_widgets_grabbing.patch b/debian/patches/016_no_offscreen_widgets_grabbing.patch index 72757da64c..134cf07b44 100644 --- a/debian/patches/016_no_offscreen_widgets_grabbing.patch +++ b/debian/patches/016_no_offscreen_widgets_grabbing.patch @@ -5,7 +5,7 @@ Bug-Ubuntu: https://bugs.launchpad.net/bugs/512427 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c -@@ -2062,9 +2062,14 @@ +@@ -2060,9 +2060,14 @@ { GtkWindowGroup *group; GtkWidget *old_grab_widget; diff --git a/debian/patches/017_no_offscreen_device_grabbing.patch b/debian/patches/017_no_offscreen_device_grabbing.patch index b79905dad4..e7c5298fe8 100644 --- a/debian/patches/017_no_offscreen_device_grabbing.patch +++ b/debian/patches/017_no_offscreen_device_grabbing.patch @@ -5,7 +5,7 @@ Bug-Ubuntu: https://launchpad.net/bugs/804009 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c -@@ -2155,9 +2155,14 @@ +@@ -2153,9 +2153,14 @@ { GtkWindowGroup *group; GtkWidget *old_grab_widget; diff --git a/debian/patches/018_gdkenumtypes.c_location.patch b/debian/patches/018_gdkenumtypes.c_location.patch index 701a15d45a..cb215a2ccf 100644 --- a/debian/patches/018_gdkenumtypes.c_location.patch +++ b/debian/patches/018_gdkenumtypes.c_location.patch @@ -20,9 +20,9 @@ Bug-Ubuntu: https://launchpad.net/bugs/769256 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am -@@ -196,8 +196,8 @@ +@@ -210,8 +210,8 @@ introspection_files = \ - $(filter-out gdkkeysyms-compat.h, $(gdk_public_h_sources)) \ + $(filter-out gdkkeysyms-compat.h, $(gdk_h_sources)) \ $(gdk_c_sources) \ - gdkenumtypes.c \ - gdkenumtypes.h @@ -31,7 +31,7 @@ Bug-Ubuntu: https://launchpad.net/bugs/769256 Gdk-3.0.gir: libgdk-3.la Makefile Gdk_3_0_gir_SCANNERFLAGS = \ -@@ -311,7 +311,7 @@ +@@ -378,7 +378,7 @@ lib_LTLIBRARIES = libgdk-3.la @@ -40,24 +40,24 @@ Bug-Ubuntu: https://launchpad.net/bugs/769256 EXTRA_DIST += \ $(gdk_built_sources) \ fallback-c89.c -@@ -325,18 +325,15 @@ +@@ -392,18 +392,15 @@ $(gdk_built_sources) \ gdkconfig.h -gdkenumtypes.h: stamp-gdkenumtypes.h - @true --stamp-gdkenumtypes.h: $(gdk_public_h_sources) gdkenumtypes.h.template +-stamp-gdkenumtypes.h: $(gdk_h_sources) gdkenumtypes.h.template +gdkenumtypes.h: $(gdk_public_h_sources) $(srcdir)/gdkenumtypes.h.template $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gdkenumtypes.h.template \ - $(gdk_public_h_sources) ) >> xgen-geth \ + $(gdk_h_sources) ) >> xgen-geth \ - && (cmp -s xgen-geth gdkenumtypes.h || cp xgen-geth gdkenumtypes.h ) \ - && rm -f xgen-geth \ - && echo timestamp > $(@F) + && (cmp -s xgen-geth gdkenumtypes.h || cp xgen-geth $(srcdir)/gdkenumtypes.h ) \ + && rm -f xgen-geth - gdkenumtypes.c: $(gdk_public_h_sources) gdkenumtypes.c.template + gdkenumtypes.c: $(gdk_h_sources) gdkenumtypes.c.template $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) --template gdkenumtypes.c.template \ - $(gdk_public_h_sources) ) > xgen-getc \ + $(gdk_h_sources) ) > xgen-getc \ - && cp xgen-getc gdkenumtypes.c \ + && cp xgen-getc $(srcdir)/gdkenumtypes.c \ && rm -f xgen-getc diff --git a/debian/patches/032_mips_treeview_row_separator_height.patch b/debian/patches/032_mips_treeview_row_separator_height.patch index 358c480f2f..c21a8fdece 100644 --- a/debian/patches/032_mips_treeview_row_separator_height.patch +++ b/debian/patches/032_mips_treeview_row_separator_height.patch @@ -11,6 +11,6 @@ Bug: https://bugzilla.gnome.org/show_bug.cgi?id=702371 g_test_add_func ("/TreeView/sizing/row-separator-height", - test_row_separator_height); + test_row_separator_height);*/ + g_test_add_func ("/TreeView/selection/count", test_selection_count); return g_test_run (); - } diff --git a/debian/patches/series b/debian/patches/series index 07ce79ff37..5ae7317ab2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,4 +11,3 @@ 060_ignore-random-icons.patch 061_multiarch_module_fallback.patch 071_fix-installation-of-HTML-images.patch -072_Avoid-pkg-config-atleast-version.patch diff --git a/debian/rules b/debian/rules index c2bff8ee21..e40d6da8de 100644 --- a/debian/rules +++ b/debian/rules @@ -11,6 +11,7 @@ include /usr/share/cdbs/1/rules/utils.mk include /usr/share/cdbs/1/class/gnome.mk include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk +include /usr/share/gnome-pkg-tools/1/rules/gnome-version.mk GNOME_MODULE = gtk+