* New upstream development release:

+ debian/rules:
    - Include check-dist.mk to prevent accidental uploads to unstable.
  + debian/control.in:
    - Update ATK build dependency.
  + debian/rules,
    debian/libgtk-directfb-2.0-0.symbols,
    debian/libgtk2.0-0.symbols:
    - Update SHVER to 2.19.1 for the new API and add new symbols.
  + debian/patches/009_gtk-export-filechooser.patch,
    debian/patches/021_loader-files-d.patch:
    - Updated to apply cleanly again.
  + debian/patches/070_mandatory-relibtoolize.patch:
    - Regenerated for the new version.
This commit is contained in:
Sebastian Dröge
2009-12-01 15:27:33 +00:00
parent 0df81bc36f
commit 75c6d96a81
9 changed files with 7150 additions and 5545 deletions

19
debian/changelog vendored
View File

@ -1,3 +1,22 @@
gtk+2.0 (2.19.1-1) experimental; urgency=low
* New upstream development release:
+ debian/rules:
- Include check-dist.mk to prevent accidental uploads to unstable.
+ debian/control.in:
- Update ATK build dependency.
+ debian/rules,
debian/libgtk-directfb-2.0-0.symbols,
debian/libgtk2.0-0.symbols:
- Update SHVER to 2.19.1 for the new API and add new symbols.
+ debian/patches/009_gtk-export-filechooser.patch,
debian/patches/021_loader-files-d.patch:
- Updated to apply cleanly again.
+ debian/patches/070_mandatory-relibtoolize.patch:
- Regenerated for the new version.
-- Sebastian Dröge <slomo@debian.org> Tue, 01 Dec 2009 15:28:10 +0100
gtk+2.0 (2.18.4-1) unstable; urgency=low gtk+2.0 (2.18.4-1) unstable; urgency=low
* New upstream bugfix release: * New upstream bugfix release:

2
debian/control vendored
View File

@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0.22),
autotools-dev, autotools-dev,
libglib2.0-dev (>= 2.21.3), libglib2.0-dev (>= 2.21.3),
libpango1.0-dev (>= 1.20), libpango1.0-dev (>= 1.20),
libatk1.0-dev (>= 1.13.0), libatk1.0-dev (>= 1.29.2),
libx11-dev (>= 2:1.0.0-6), libx11-dev (>= 2:1.0.0-6),
libxext-dev (>= 1:1.0.1-2), libxext-dev (>= 1:1.0.1-2),
libxi-dev (>= 1:1.0.1-4), libxi-dev (>= 1:1.0.1-4),

2
debian/control.in vendored
View File

@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 5.0.22),
autotools-dev, autotools-dev,
libglib2.0-dev (>= 2.21.3), libglib2.0-dev (>= 2.21.3),
libpango1.0-dev (>= 1.20), libpango1.0-dev (>= 1.20),
libatk1.0-dev (>= 1.13.0), libatk1.0-dev (>= 1.29.2),
libx11-dev (>= 2:1.0.0-6), libx11-dev (>= 2:1.0.0-6),
libxext-dev (>= 1:1.0.1-2), libxext-dev (>= 1:1.0.1-2),
libxi-dev (>= 1:1.0.1-4), libxi-dev (>= 1:1.0.1-4),

View File

@ -802,6 +802,7 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER#
gtk_action_disconnect_proxy@Base 2.8.0 gtk_action_disconnect_proxy@Base 2.8.0
gtk_action_get_accel_closure@Base 2.8.0 gtk_action_get_accel_closure@Base 2.8.0
gtk_action_get_accel_path@Base 2.8.0 gtk_action_get_accel_path@Base 2.8.0
gtk_action_get_always_show_image@Base 2.19.1
gtk_action_get_gicon@Base 2.16.0 gtk_action_get_gicon@Base 2.16.0
gtk_action_get_icon_name@Base 2.16.0 gtk_action_get_icon_name@Base 2.16.0
gtk_action_get_is_important@Base 2.16.0 gtk_action_get_is_important@Base 2.16.0
@ -842,6 +843,7 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER#
gtk_action_new@Base 2.8.0 gtk_action_new@Base 2.8.0
gtk_action_set_accel_group@Base 2.8.0 gtk_action_set_accel_group@Base 2.8.0
gtk_action_set_accel_path@Base 2.8.0 gtk_action_set_accel_path@Base 2.8.0
gtk_action_set_always_show_image@Base 2.19.1
gtk_action_set_gicon@Base 2.16.0 gtk_action_set_gicon@Base 2.16.0
gtk_action_set_icon_name@Base 2.16.0 gtk_action_set_icon_name@Base 2.16.0
gtk_action_set_is_important@Base 2.16.0 gtk_action_set_is_important@Base 2.16.0
@ -1079,6 +1081,8 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER#
gtk_cell_renderer_set_visible@Base 2.18.0 gtk_cell_renderer_set_visible@Base 2.18.0
gtk_cell_renderer_spin_get_type@Base 2.10.0 gtk_cell_renderer_spin_get_type@Base 2.10.0
gtk_cell_renderer_spin_new@Base 2.10.0 gtk_cell_renderer_spin_new@Base 2.10.0
gtk_cell_renderer_spinner_get_type@Base 2.19.1
gtk_cell_renderer_spinner_new@Base 2.19.1
gtk_cell_renderer_start_editing@Base 2.8.0 gtk_cell_renderer_start_editing@Base 2.8.0
gtk_cell_renderer_state_get_type@Base 2.8.0 gtk_cell_renderer_state_get_type@Base 2.8.0
gtk_cell_renderer_stop_editing@Base 2.8.0 gtk_cell_renderer_stop_editing@Base 2.8.0
@ -1447,6 +1451,7 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER#
gtk_dialog_get_has_separator@Base 2.8.0 gtk_dialog_get_has_separator@Base 2.8.0
gtk_dialog_get_response_for_widget@Base 2.8.0 gtk_dialog_get_response_for_widget@Base 2.8.0
gtk_dialog_get_type@Base 2.8.0 gtk_dialog_get_type@Base 2.8.0
gtk_dialog_get_widget_for_response@Base 2.19.1
gtk_dialog_new@Base 2.8.0 gtk_dialog_new@Base 2.8.0
gtk_dialog_new_with_buttons@Base 2.8.0 gtk_dialog_new_with_buttons@Base 2.8.0
gtk_dialog_response@Base 2.8.0 gtk_dialog_response@Base 2.8.0
@ -2399,6 +2404,7 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER#
gtk_movement_step_get_type@Base 2.8.0 gtk_movement_step_get_type@Base 2.8.0
gtk_notebook_append_page@Base 2.8.0 gtk_notebook_append_page@Base 2.8.0
gtk_notebook_append_page_menu@Base 2.8.0 gtk_notebook_append_page_menu@Base 2.8.0
gtk_notebook_get_action_widget@Base 2.19.1
gtk_notebook_get_current_page@Base 2.8.0 gtk_notebook_get_current_page@Base 2.8.0
gtk_notebook_get_group@Base 2.12.0 gtk_notebook_get_group@Base 2.12.0
gtk_notebook_get_group_id@Base 2.10.0 gtk_notebook_get_group_id@Base 2.10.0
@ -2428,6 +2434,7 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER#
gtk_notebook_query_tab_label_packing@Base 2.8.0 gtk_notebook_query_tab_label_packing@Base 2.8.0
gtk_notebook_remove_page@Base 2.8.0 gtk_notebook_remove_page@Base 2.8.0
gtk_notebook_reorder_child@Base 2.8.0 gtk_notebook_reorder_child@Base 2.8.0
gtk_notebook_set_action_widget@Base 2.19.1
gtk_notebook_set_current_page@Base 2.8.0 gtk_notebook_set_current_page@Base 2.8.0
gtk_notebook_set_group@Base 2.12.0 gtk_notebook_set_group@Base 2.12.0
gtk_notebook_set_group_id@Base 2.10.0 gtk_notebook_set_group_id@Base 2.10.0
@ -2541,6 +2548,7 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER#
gtk_paint_shadow@Base 2.8.0 gtk_paint_shadow@Base 2.8.0
gtk_paint_shadow_gap@Base 2.8.0 gtk_paint_shadow_gap@Base 2.8.0
gtk_paint_slider@Base 2.8.0 gtk_paint_slider@Base 2.8.0
gtk_paint_spinner@Base 2.19.1
gtk_paint_string@Base 2.8.0 gtk_paint_string@Base 2.8.0
gtk_paint_tab@Base 2.8.0 gtk_paint_tab@Base 2.8.0
gtk_paint_vline@Base 2.8.0 gtk_paint_vline@Base 2.8.0
@ -3252,6 +3260,10 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER#
gtk_spin_button_update@Base 2.8.0 gtk_spin_button_update@Base 2.8.0
gtk_spin_button_update_policy_get_type@Base 2.8.0 gtk_spin_button_update_policy_get_type@Base 2.8.0
gtk_spin_type_get_type@Base 2.8.0 gtk_spin_type_get_type@Base 2.8.0
gtk_spinner_get_type@Base 2.19.1
gtk_spinner_new@Base 2.19.1
gtk_spinner_start@Base 2.19.1
gtk_spinner_stop@Base 2.19.1
gtk_state_type_get_type@Base 2.8.0 gtk_state_type_get_type@Base 2.8.0
gtk_status_icon_get_blinking@Base 2.10.0 gtk_status_icon_get_blinking@Base 2.10.0
gtk_status_icon_get_geometry@Base 2.10.0 gtk_status_icon_get_geometry@Base 2.10.0
@ -3292,6 +3304,7 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER#
gtk_status_icon_set_visible@Base 2.10.0 gtk_status_icon_set_visible@Base 2.10.0
gtk_statusbar_get_context_id@Base 2.8.0 gtk_statusbar_get_context_id@Base 2.8.0
gtk_statusbar_get_has_resize_grip@Base 2.8.0 gtk_statusbar_get_has_resize_grip@Base 2.8.0
gtk_statusbar_get_message_area@Base 2.19.1
gtk_statusbar_get_type@Base 2.8.0 gtk_statusbar_get_type@Base 2.8.0
gtk_statusbar_new@Base 2.8.0 gtk_statusbar_new@Base 2.8.0
gtk_statusbar_pop@Base 2.8.0 gtk_statusbar_pop@Base 2.8.0
@ -3757,6 +3770,7 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER#
gtk_tool_button_set_label_widget@Base 2.8.0 gtk_tool_button_set_label_widget@Base 2.8.0
gtk_tool_button_set_stock_id@Base 2.8.0 gtk_tool_button_set_stock_id@Base 2.8.0
gtk_tool_button_set_use_underline@Base 2.8.0 gtk_tool_button_set_use_underline@Base 2.8.0
gtk_tool_item_get_ellipsize_mode@Base 2.19.1
gtk_tool_item_get_expand@Base 2.8.0 gtk_tool_item_get_expand@Base 2.8.0
gtk_tool_item_get_homogeneous@Base 2.8.0 gtk_tool_item_get_homogeneous@Base 2.8.0
gtk_tool_item_get_icon_size@Base 2.8.0 gtk_tool_item_get_icon_size@Base 2.8.0
@ -3764,11 +3778,32 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER#
gtk_tool_item_get_orientation@Base 2.8.0 gtk_tool_item_get_orientation@Base 2.8.0
gtk_tool_item_get_proxy_menu_item@Base 2.8.0 gtk_tool_item_get_proxy_menu_item@Base 2.8.0
gtk_tool_item_get_relief_style@Base 2.8.0 gtk_tool_item_get_relief_style@Base 2.8.0
gtk_tool_item_get_text_alignment@Base 2.19.1
gtk_tool_item_get_text_orientation@Base 2.19.1
gtk_tool_item_get_text_size_group@Base 2.19.1
gtk_tool_item_get_toolbar_style@Base 2.8.0 gtk_tool_item_get_toolbar_style@Base 2.8.0
gtk_tool_item_get_type@Base 2.8.0 gtk_tool_item_get_type@Base 2.8.0
gtk_tool_item_get_use_drag_window@Base 2.8.0 gtk_tool_item_get_use_drag_window@Base 2.8.0
gtk_tool_item_get_visible_horizontal@Base 2.8.0 gtk_tool_item_get_visible_horizontal@Base 2.8.0
gtk_tool_item_get_visible_vertical@Base 2.8.0 gtk_tool_item_get_visible_vertical@Base 2.8.0
gtk_tool_item_group_get_collapsed@Base 2.19.1
gtk_tool_item_group_get_drop_item@Base 2.19.1
gtk_tool_item_group_get_ellipsize@Base 2.19.1
gtk_tool_item_group_get_header_relief@Base 2.19.1
gtk_tool_item_group_get_item_position@Base 2.19.1
gtk_tool_item_group_get_label@Base 2.19.1
gtk_tool_item_group_get_label_widget@Base 2.19.1
gtk_tool_item_group_get_n_items@Base 2.19.1
gtk_tool_item_group_get_nth_item@Base 2.19.1
gtk_tool_item_group_get_type@Base 2.19.1
gtk_tool_item_group_insert@Base 2.19.1
gtk_tool_item_group_new@Base 2.19.1
gtk_tool_item_group_set_collapsed@Base 2.19.1
gtk_tool_item_group_set_ellipsize@Base 2.19.1
gtk_tool_item_group_set_header_relief@Base 2.19.1
gtk_tool_item_group_set_item_position@Base 2.19.1
gtk_tool_item_group_set_label@Base 2.19.1
gtk_tool_item_group_set_label_widget@Base 2.19.1
gtk_tool_item_new@Base 2.8.0 gtk_tool_item_new@Base 2.8.0
gtk_tool_item_rebuild_menu@Base 2.8.0 gtk_tool_item_rebuild_menu@Base 2.8.0
gtk_tool_item_retrieve_proxy_menu_item@Base 2.8.0 gtk_tool_item_retrieve_proxy_menu_item@Base 2.8.0
@ -3783,10 +3818,38 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER#
gtk_tool_item_set_visible_horizontal@Base 2.8.0 gtk_tool_item_set_visible_horizontal@Base 2.8.0
gtk_tool_item_set_visible_vertical@Base 2.8.0 gtk_tool_item_set_visible_vertical@Base 2.8.0
gtk_tool_item_toolbar_reconfigured@Base 2.14.0 gtk_tool_item_toolbar_reconfigured@Base 2.14.0
gtk_tool_palette_add_drag_dest@Base 2.19.1
gtk_tool_palette_drag_targets_get_type@Base 2.19.1
gtk_tool_palette_get_drag_item@Base 2.19.1
gtk_tool_palette_get_drag_target_group@Base 2.19.1
gtk_tool_palette_get_drag_target_item@Base 2.19.1
gtk_tool_palette_get_drop_group@Base 2.19.1
gtk_tool_palette_get_drop_item@Base 2.19.1
gtk_tool_palette_get_exclusive@Base 2.19.1
gtk_tool_palette_get_expand@Base 2.19.1
gtk_tool_palette_get_group_position@Base 2.19.1
gtk_tool_palette_get_hadjustment@Base 2.19.1
gtk_tool_palette_get_icon_size@Base 2.19.1
gtk_tool_palette_get_style@Base 2.19.1
gtk_tool_palette_get_type@Base 2.19.1
gtk_tool_palette_get_vadjustment@Base 2.19.1
gtk_tool_palette_new@Base 2.19.1
gtk_tool_palette_set_drag_source@Base 2.19.1
gtk_tool_palette_set_exclusive@Base 2.19.1
gtk_tool_palette_set_expand@Base 2.19.1
gtk_tool_palette_set_group_position@Base 2.19.1
gtk_tool_palette_set_icon_size@Base 2.19.1
gtk_tool_palette_set_style@Base 2.19.1
gtk_tool_palette_unset_icon_size@Base 2.19.1
gtk_tool_palette_unset_style@Base 2.19.1
gtk_tool_shell_get_ellipsize_mode@Base 2.19.1
gtk_tool_shell_get_icon_size@Base 2.14.0 gtk_tool_shell_get_icon_size@Base 2.14.0
gtk_tool_shell_get_orientation@Base 2.14.0 gtk_tool_shell_get_orientation@Base 2.14.0
gtk_tool_shell_get_relief_style@Base 2.14.0 gtk_tool_shell_get_relief_style@Base 2.14.0
gtk_tool_shell_get_style@Base 2.14.0 gtk_tool_shell_get_style@Base 2.14.0
gtk_tool_shell_get_text_alignment@Base 2.19.1
gtk_tool_shell_get_text_orientation@Base 2.19.1
gtk_tool_shell_get_text_size_group@Base 2.19.1
gtk_tool_shell_get_type@Base 2.14.0 gtk_tool_shell_get_type@Base 2.14.0
gtk_tool_shell_rebuild_menu@Base 2.14.0 gtk_tool_shell_rebuild_menu@Base 2.14.0
gtk_toolbar_append_element@Base 2.8.0 gtk_toolbar_append_element@Base 2.8.0
@ -3830,6 +3893,7 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER#
gtk_tooltip_get_type@Base 2.12.0 gtk_tooltip_get_type@Base 2.12.0
gtk_tooltip_set_custom@Base 2.12.0 gtk_tooltip_set_custom@Base 2.12.0
gtk_tooltip_set_icon@Base 2.12.0 gtk_tooltip_set_icon@Base 2.12.0
gtk_tooltip_set_icon_from_gicon@Base 2.19.1
gtk_tooltip_set_icon_from_icon_name@Base 2.14.0 gtk_tooltip_set_icon_from_icon_name@Base 2.14.0
gtk_tooltip_set_icon_from_stock@Base 2.12.0 gtk_tooltip_set_icon_from_stock@Base 2.12.0
gtk_tooltip_set_markup@Base 2.12.0 gtk_tooltip_set_markup@Base 2.12.0
@ -4207,6 +4271,7 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER#
gtk_vbutton_box_new@Base 2.8.0 gtk_vbutton_box_new@Base 2.8.0
gtk_vbutton_box_set_layout_default@Base 2.8.0 gtk_vbutton_box_set_layout_default@Base 2.8.0
gtk_vbutton_box_set_spacing_default@Base 2.8.0 gtk_vbutton_box_set_spacing_default@Base 2.8.0
gtk_viewport_get_bin_window@Base 2.19.1
gtk_viewport_get_hadjustment@Base 2.8.0 gtk_viewport_get_hadjustment@Base 2.8.0
gtk_viewport_get_shadow_type@Base 2.8.0 gtk_viewport_get_shadow_type@Base 2.8.0
gtk_viewport_get_type@Base 2.8.0 gtk_viewport_get_type@Base 2.8.0
@ -4443,6 +4508,7 @@ libgtk-directfb-2.0.so.0 libgtk-directfb-2.0-0 #MINVER#
gtk_window_get_type@Base 2.8.0 gtk_window_get_type@Base 2.8.0
gtk_window_get_type_hint@Base 2.8.0 gtk_window_get_type_hint@Base 2.8.0
gtk_window_get_urgency_hint@Base 2.8.0 gtk_window_get_urgency_hint@Base 2.8.0
gtk_window_get_window_type@Base 2.19.1
gtk_window_group_add_window@Base 2.8.0 gtk_window_group_add_window@Base 2.8.0
gtk_window_group_get_type@Base 2.8.0 gtk_window_group_get_type@Base 2.8.0
gtk_window_group_list_windows@Base 2.14.0 gtk_window_group_list_windows@Base 2.14.0

View File

@ -949,6 +949,7 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER#
gtk_action_disconnect_proxy@Base 2.8.0 gtk_action_disconnect_proxy@Base 2.8.0
gtk_action_get_accel_closure@Base 2.8.0 gtk_action_get_accel_closure@Base 2.8.0
gtk_action_get_accel_path@Base 2.8.0 gtk_action_get_accel_path@Base 2.8.0
gtk_action_get_always_show_image@Base 2.19.1
gtk_action_get_gicon@Base 2.16.0 gtk_action_get_gicon@Base 2.16.0
gtk_action_get_icon_name@Base 2.16.0 gtk_action_get_icon_name@Base 2.16.0
gtk_action_get_is_important@Base 2.16.0 gtk_action_get_is_important@Base 2.16.0
@ -989,6 +990,7 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER#
gtk_action_new@Base 2.8.0 gtk_action_new@Base 2.8.0
gtk_action_set_accel_group@Base 2.8.0 gtk_action_set_accel_group@Base 2.8.0
gtk_action_set_accel_path@Base 2.8.0 gtk_action_set_accel_path@Base 2.8.0
gtk_action_set_always_show_image@Base 2.19.1
gtk_action_set_gicon@Base 2.16.0 gtk_action_set_gicon@Base 2.16.0
gtk_action_set_icon_name@Base 2.16.0 gtk_action_set_icon_name@Base 2.16.0
gtk_action_set_is_important@Base 2.16.0 gtk_action_set_is_important@Base 2.16.0
@ -1226,6 +1228,8 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER#
gtk_cell_renderer_set_visible@Base 2.18.0 gtk_cell_renderer_set_visible@Base 2.18.0
gtk_cell_renderer_spin_get_type@Base 2.10.0 gtk_cell_renderer_spin_get_type@Base 2.10.0
gtk_cell_renderer_spin_new@Base 2.10.0 gtk_cell_renderer_spin_new@Base 2.10.0
gtk_cell_renderer_spinner_get_type@Base 2.19.1
gtk_cell_renderer_spinner_new@Base 2.19.1
gtk_cell_renderer_start_editing@Base 2.8.0 gtk_cell_renderer_start_editing@Base 2.8.0
gtk_cell_renderer_state_get_type@Base 2.8.0 gtk_cell_renderer_state_get_type@Base 2.8.0
gtk_cell_renderer_stop_editing@Base 2.8.0 gtk_cell_renderer_stop_editing@Base 2.8.0
@ -1594,6 +1598,7 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER#
gtk_dialog_get_has_separator@Base 2.8.0 gtk_dialog_get_has_separator@Base 2.8.0
gtk_dialog_get_response_for_widget@Base 2.8.0 gtk_dialog_get_response_for_widget@Base 2.8.0
gtk_dialog_get_type@Base 2.8.0 gtk_dialog_get_type@Base 2.8.0
gtk_dialog_get_widget_for_response@Base 2.19.1
gtk_dialog_new@Base 2.8.0 gtk_dialog_new@Base 2.8.0
gtk_dialog_new_with_buttons@Base 2.8.0 gtk_dialog_new_with_buttons@Base 2.8.0
gtk_dialog_response@Base 2.8.0 gtk_dialog_response@Base 2.8.0
@ -2546,6 +2551,7 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER#
gtk_movement_step_get_type@Base 2.8.0 gtk_movement_step_get_type@Base 2.8.0
gtk_notebook_append_page@Base 2.8.0 gtk_notebook_append_page@Base 2.8.0
gtk_notebook_append_page_menu@Base 2.8.0 gtk_notebook_append_page_menu@Base 2.8.0
gtk_notebook_get_action_widget@Base 2.19.1
gtk_notebook_get_current_page@Base 2.8.0 gtk_notebook_get_current_page@Base 2.8.0
gtk_notebook_get_group@Base 2.12.0 gtk_notebook_get_group@Base 2.12.0
gtk_notebook_get_group_id@Base 2.10.0 gtk_notebook_get_group_id@Base 2.10.0
@ -2575,6 +2581,7 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER#
gtk_notebook_query_tab_label_packing@Base 2.8.0 gtk_notebook_query_tab_label_packing@Base 2.8.0
gtk_notebook_remove_page@Base 2.8.0 gtk_notebook_remove_page@Base 2.8.0
gtk_notebook_reorder_child@Base 2.8.0 gtk_notebook_reorder_child@Base 2.8.0
gtk_notebook_set_action_widget@Base 2.19.1
gtk_notebook_set_current_page@Base 2.8.0 gtk_notebook_set_current_page@Base 2.8.0
gtk_notebook_set_group@Base 2.12.0 gtk_notebook_set_group@Base 2.12.0
gtk_notebook_set_group_id@Base 2.10.0 gtk_notebook_set_group_id@Base 2.10.0
@ -2688,6 +2695,7 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER#
gtk_paint_shadow@Base 2.8.0 gtk_paint_shadow@Base 2.8.0
gtk_paint_shadow_gap@Base 2.8.0 gtk_paint_shadow_gap@Base 2.8.0
gtk_paint_slider@Base 2.8.0 gtk_paint_slider@Base 2.8.0
gtk_paint_spinner@Base 2.19.1
gtk_paint_string@Base 2.8.0 gtk_paint_string@Base 2.8.0
gtk_paint_tab@Base 2.8.0 gtk_paint_tab@Base 2.8.0
gtk_paint_vline@Base 2.8.0 gtk_paint_vline@Base 2.8.0
@ -3399,6 +3407,10 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER#
gtk_spin_button_update@Base 2.8.0 gtk_spin_button_update@Base 2.8.0
gtk_spin_button_update_policy_get_type@Base 2.8.0 gtk_spin_button_update_policy_get_type@Base 2.8.0
gtk_spin_type_get_type@Base 2.8.0 gtk_spin_type_get_type@Base 2.8.0
gtk_spinner_get_type@Base 2.19.1
gtk_spinner_new@Base 2.19.1
gtk_spinner_start@Base 2.19.1
gtk_spinner_stop@Base 2.19.1
gtk_state_type_get_type@Base 2.8.0 gtk_state_type_get_type@Base 2.8.0
gtk_status_icon_get_blinking@Base 2.10.0 gtk_status_icon_get_blinking@Base 2.10.0
gtk_status_icon_get_geometry@Base 2.10.0 gtk_status_icon_get_geometry@Base 2.10.0
@ -3439,6 +3451,7 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER#
gtk_status_icon_set_visible@Base 2.10.0 gtk_status_icon_set_visible@Base 2.10.0
gtk_statusbar_get_context_id@Base 2.8.0 gtk_statusbar_get_context_id@Base 2.8.0
gtk_statusbar_get_has_resize_grip@Base 2.8.0 gtk_statusbar_get_has_resize_grip@Base 2.8.0
gtk_statusbar_get_message_area@Base 2.19.1
gtk_statusbar_get_type@Base 2.8.0 gtk_statusbar_get_type@Base 2.8.0
gtk_statusbar_new@Base 2.8.0 gtk_statusbar_new@Base 2.8.0
gtk_statusbar_pop@Base 2.8.0 gtk_statusbar_pop@Base 2.8.0
@ -3904,6 +3917,7 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER#
gtk_tool_button_set_label_widget@Base 2.8.0 gtk_tool_button_set_label_widget@Base 2.8.0
gtk_tool_button_set_stock_id@Base 2.8.0 gtk_tool_button_set_stock_id@Base 2.8.0
gtk_tool_button_set_use_underline@Base 2.8.0 gtk_tool_button_set_use_underline@Base 2.8.0
gtk_tool_item_get_ellipsize_mode@Base 2.19.1
gtk_tool_item_get_expand@Base 2.8.0 gtk_tool_item_get_expand@Base 2.8.0
gtk_tool_item_get_homogeneous@Base 2.8.0 gtk_tool_item_get_homogeneous@Base 2.8.0
gtk_tool_item_get_icon_size@Base 2.8.0 gtk_tool_item_get_icon_size@Base 2.8.0
@ -3911,11 +3925,32 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER#
gtk_tool_item_get_orientation@Base 2.8.0 gtk_tool_item_get_orientation@Base 2.8.0
gtk_tool_item_get_proxy_menu_item@Base 2.8.0 gtk_tool_item_get_proxy_menu_item@Base 2.8.0
gtk_tool_item_get_relief_style@Base 2.8.0 gtk_tool_item_get_relief_style@Base 2.8.0
gtk_tool_item_get_text_alignment@Base 2.19.1
gtk_tool_item_get_text_orientation@Base 2.19.1
gtk_tool_item_get_text_size_group@Base 2.19.1
gtk_tool_item_get_toolbar_style@Base 2.8.0 gtk_tool_item_get_toolbar_style@Base 2.8.0
gtk_tool_item_get_type@Base 2.8.0 gtk_tool_item_get_type@Base 2.8.0
gtk_tool_item_get_use_drag_window@Base 2.8.0 gtk_tool_item_get_use_drag_window@Base 2.8.0
gtk_tool_item_get_visible_horizontal@Base 2.8.0 gtk_tool_item_get_visible_horizontal@Base 2.8.0
gtk_tool_item_get_visible_vertical@Base 2.8.0 gtk_tool_item_get_visible_vertical@Base 2.8.0
gtk_tool_item_group_get_collapsed@Base 2.19.1
gtk_tool_item_group_get_drop_item@Base 2.19.1
gtk_tool_item_group_get_ellipsize@Base 2.19.1
gtk_tool_item_group_get_header_relief@Base 2.19.1
gtk_tool_item_group_get_item_position@Base 2.19.1
gtk_tool_item_group_get_label@Base 2.19.1
gtk_tool_item_group_get_label_widget@Base 2.19.1
gtk_tool_item_group_get_n_items@Base 2.19.1
gtk_tool_item_group_get_nth_item@Base 2.19.1
gtk_tool_item_group_get_type@Base 2.19.1
gtk_tool_item_group_insert@Base 2.19.1
gtk_tool_item_group_new@Base 2.19.1
gtk_tool_item_group_set_collapsed@Base 2.19.1
gtk_tool_item_group_set_ellipsize@Base 2.19.1
gtk_tool_item_group_set_header_relief@Base 2.19.1
gtk_tool_item_group_set_item_position@Base 2.19.1
gtk_tool_item_group_set_label@Base 2.19.1
gtk_tool_item_group_set_label_widget@Base 2.19.1
gtk_tool_item_new@Base 2.8.0 gtk_tool_item_new@Base 2.8.0
gtk_tool_item_rebuild_menu@Base 2.8.0 gtk_tool_item_rebuild_menu@Base 2.8.0
gtk_tool_item_retrieve_proxy_menu_item@Base 2.8.0 gtk_tool_item_retrieve_proxy_menu_item@Base 2.8.0
@ -3930,10 +3965,38 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER#
gtk_tool_item_set_visible_horizontal@Base 2.8.0 gtk_tool_item_set_visible_horizontal@Base 2.8.0
gtk_tool_item_set_visible_vertical@Base 2.8.0 gtk_tool_item_set_visible_vertical@Base 2.8.0
gtk_tool_item_toolbar_reconfigured@Base 2.14.0 gtk_tool_item_toolbar_reconfigured@Base 2.14.0
gtk_tool_palette_add_drag_dest@Base 2.19.1
gtk_tool_palette_drag_targets_get_type@Base 2.19.1
gtk_tool_palette_get_drag_item@Base 2.19.1
gtk_tool_palette_get_drag_target_group@Base 2.19.1
gtk_tool_palette_get_drag_target_item@Base 2.19.1
gtk_tool_palette_get_drop_group@Base 2.19.1
gtk_tool_palette_get_drop_item@Base 2.19.1
gtk_tool_palette_get_exclusive@Base 2.19.1
gtk_tool_palette_get_expand@Base 2.19.1
gtk_tool_palette_get_group_position@Base 2.19.1
gtk_tool_palette_get_hadjustment@Base 2.19.1
gtk_tool_palette_get_icon_size@Base 2.19.1
gtk_tool_palette_get_style@Base 2.19.1
gtk_tool_palette_get_type@Base 2.19.1
gtk_tool_palette_get_vadjustment@Base 2.19.1
gtk_tool_palette_new@Base 2.19.1
gtk_tool_palette_set_drag_source@Base 2.19.1
gtk_tool_palette_set_exclusive@Base 2.19.1
gtk_tool_palette_set_expand@Base 2.19.1
gtk_tool_palette_set_group_position@Base 2.19.1
gtk_tool_palette_set_icon_size@Base 2.19.1
gtk_tool_palette_set_style@Base 2.19.1
gtk_tool_palette_unset_icon_size@Base 2.19.1
gtk_tool_palette_unset_style@Base 2.19.1
gtk_tool_shell_get_ellipsize_mode@Base 2.19.1
gtk_tool_shell_get_icon_size@Base 2.14.0 gtk_tool_shell_get_icon_size@Base 2.14.0
gtk_tool_shell_get_orientation@Base 2.14.0 gtk_tool_shell_get_orientation@Base 2.14.0
gtk_tool_shell_get_relief_style@Base 2.14.0 gtk_tool_shell_get_relief_style@Base 2.14.0
gtk_tool_shell_get_style@Base 2.14.0 gtk_tool_shell_get_style@Base 2.14.0
gtk_tool_shell_get_text_alignment@Base 2.19.1
gtk_tool_shell_get_text_orientation@Base 2.19.1
gtk_tool_shell_get_text_size_group@Base 2.19.1
gtk_tool_shell_get_type@Base 2.14.0 gtk_tool_shell_get_type@Base 2.14.0
gtk_tool_shell_rebuild_menu@Base 2.14.0 gtk_tool_shell_rebuild_menu@Base 2.14.0
gtk_toolbar_append_element@Base 2.8.0 gtk_toolbar_append_element@Base 2.8.0
@ -3977,6 +4040,7 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER#
gtk_tooltip_get_type@Base 2.12.0 gtk_tooltip_get_type@Base 2.12.0
gtk_tooltip_set_custom@Base 2.12.0 gtk_tooltip_set_custom@Base 2.12.0
gtk_tooltip_set_icon@Base 2.12.0 gtk_tooltip_set_icon@Base 2.12.0
gtk_tooltip_set_icon_from_gicon@Base 2.19.1
gtk_tooltip_set_icon_from_icon_name@Base 2.14.0 gtk_tooltip_set_icon_from_icon_name@Base 2.14.0
gtk_tooltip_set_icon_from_stock@Base 2.12.0 gtk_tooltip_set_icon_from_stock@Base 2.12.0
gtk_tooltip_set_markup@Base 2.12.0 gtk_tooltip_set_markup@Base 2.12.0
@ -4355,6 +4419,7 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER#
gtk_vbutton_box_new@Base 2.8.0 gtk_vbutton_box_new@Base 2.8.0
gtk_vbutton_box_set_layout_default@Base 2.8.0 gtk_vbutton_box_set_layout_default@Base 2.8.0
gtk_vbutton_box_set_spacing_default@Base 2.8.0 gtk_vbutton_box_set_spacing_default@Base 2.8.0
gtk_viewport_get_bin_window@Base 2.19.1
gtk_viewport_get_hadjustment@Base 2.8.0 gtk_viewport_get_hadjustment@Base 2.8.0
gtk_viewport_get_shadow_type@Base 2.8.0 gtk_viewport_get_shadow_type@Base 2.8.0
gtk_viewport_get_type@Base 2.8.0 gtk_viewport_get_type@Base 2.8.0
@ -4591,6 +4656,7 @@ libgtk-x11-2.0.so.0 libgtk2.0-0 #MINVER#
gtk_window_get_type@Base 2.8.0 gtk_window_get_type@Base 2.8.0
gtk_window_get_type_hint@Base 2.8.0 gtk_window_get_type_hint@Base 2.8.0
gtk_window_get_urgency_hint@Base 2.8.0 gtk_window_get_urgency_hint@Base 2.8.0
gtk_window_get_window_type@Base 2.19.1
gtk_window_group_add_window@Base 2.8.0 gtk_window_group_add_window@Base 2.8.0
gtk_window_group_get_type@Base 2.8.0 gtk_window_group_get_type@Base 2.8.0
gtk_window_group_list_windows@Base 2.14.0 gtk_window_group_list_windows@Base 2.14.0

View File

@ -178,8 +178,8 @@
+#error "GtkFileSystemModel is not supported API for general use" +#error "GtkFileSystemModel is not supported API for general use"
+#endif +#endif
+ +
#include "gtkfilesystem.h" #include <gio/gio.h>
#include <gtk/gtktreemodel.h> #include <gtk/gtkfilefilter.h>
--- a/gtk/gtkquery.h --- a/gtk/gtkquery.h
+++ b/gtk/gtkquery.h +++ b/gtk/gtkquery.h

View File

@ -29,7 +29,7 @@
#ifndef GDK_PIXBUF_USE_GIO_MIME #ifndef GDK_PIXBUF_USE_GIO_MIME
static gint static gint
format_check (GdkPixbufModule *module, guchar *buffer, int size) format_check (GdkPixbufModule *module, guchar *buffer, int size)
@@ -316,115 +319,93 @@ @@ -316,118 +319,93 @@
gdk_pixbuf_load_module_unlocked (GdkPixbufModule *image_module, gdk_pixbuf_load_module_unlocked (GdkPixbufModule *image_module,
GError **error); GError **error);
@ -188,6 +188,9 @@
-#ifdef INCLUDE_jasper -#ifdef INCLUDE_jasper
- load_one_builtin_module (jasper); - load_one_builtin_module (jasper);
-#endif -#endif
-#ifdef INCLUDE_qtif
- load_one_builtin_module (qtif);
-#endif
-#ifdef INCLUDE_gdiplus -#ifdef INCLUDE_gdiplus
- /* We don't bother having the GDI+ loaders individually selectable - /* We don't bother having the GDI+ loaders individually selectable
- * for building in or not. - * for building in or not.
@ -221,7 +224,7 @@
while (!have_error && g_io_channel_read_line (channel, &line_buf, NULL, &term, NULL) == G_IO_STATUS_NORMAL) { while (!have_error && g_io_channel_read_line (channel, &line_buf, NULL, &term, NULL) == G_IO_STATUS_NORMAL) {
const char *p; const char *p;
@@ -562,8 +543,156 @@ @@ -562,8 +543,159 @@
g_free (line_buf); g_free (line_buf);
} }
g_string_free (tmp_buf, TRUE); g_string_free (tmp_buf, TRUE);
@ -300,6 +303,9 @@
+#ifdef INCLUDE_jasper +#ifdef INCLUDE_jasper
+ load_one_builtin_module (jasper); + load_one_builtin_module (jasper);
+#endif +#endif
+#ifdef INCLUDE_qtif
+ load_one_builtin_module (qtif);
+#endif
+#ifdef INCLUDE_gdiplus +#ifdef INCLUDE_gdiplus
+ /* We don't bother having the GDI+ loaders individually selectable + /* We don't bother having the GDI+ loaders individually selectable
+ * for building in or not. + * for building in or not.

File diff suppressed because it is too large Load Diff

3
debian/rules vendored
View File

@ -3,6 +3,7 @@
# Debian GNOME Maintainers # Debian GNOME Maintainers
DISABLE_UPDATE_UPLOADERS := 1 DISABLE_UPDATE_UPLOADERS := 1
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
# get-orig-source target # get-orig-source target
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
@ -53,7 +54,7 @@ DEBVERSION := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p')
VERSION := $(shell echo $(DEBVERSION) | sed -e 's/-[^-]*$$//') VERSION := $(shell echo $(DEBVERSION) | sed -e 's/-[^-]*$$//')
APIVER := 2.0 APIVER := 2.0
SONAME := 0 SONAME := 0
SHVER := 2.18.0 SHVER := 2.19.1
# earliest version that this release has backwards binary compatibility for # earliest version that this release has backwards binary compatibility for
GTK_BINARY_VERSION := 2.10.0 GTK_BINARY_VERSION := 2.10.0