From ce61c8b5964907a403d73d3778e344c715a268ad Mon Sep 17 00:00:00 2001
From: Sjoerd Simons <sjoerd@debian.org>
Date: Sun, 23 Sep 2012 21:06:40 +0000
Subject: [PATCH 01/38] * New upstream release * Sync with ubuntu:   *
 debian/rules: Make test failures fatal again   * debian/libgtk-3-0.symbols:
 Updated   * debian/rules: Update build-depends   *
 debian/libgtk-3-bin.install: Add gtk-launch: A new commandline utility     to
 launch an application from its desktop file   * Add autopkgtest support *
 debian/patches/072_statusicon_icon_size.patch:   * Removed merged upstream *
 debian/patches/074_try-harder-to-discriminate-Shift-F10-and-F10.patch:   *
 Removed, fixed upstream * debian/patches/073_transparent_colors.patch   *
 Removed, fixed upstream * debian/control.in: bump glib2.0 build-dep to >=
 2.33.14 to trump the dodgy   version in unstable

---
 debian/changelog                              | 21 +++++
 debian/control                                | 25 +++---
 debian/control.in                             | 23 +++--
 debian/libgtk-3-0.symbols                     | 54 ++++++++++++
 debian/libgtk-3-bin.install                   |  1 +
 .../016_no_offscreen_widgets_grabbing.patch   |  8 +-
 .../017_no_offscreen_device_grabbing.patch    |  8 +-
 .../patches/018_gdkenumtypes.c_location.patch | 14 ++--
 .../022_disable-viqr-im-for-vi-locale.patch   |  6 +-
 .../patches/042_treeview_single-focus.patch   |  8 +-
 debian/patches/043_notebook_scroll.patch      | 84 +++++++++----------
 debian/patches/044_tracker_fts.patch          |  6 +-
 .../061_multiarch_module_fallback.patch       | 24 ++----
 debian/patches/072_statusicon_icon_size.patch | 47 -----------
 debian/patches/073_transparent_colors.patch   | 33 --------
 ...er-to-discriminate-Shift-F10-and-F10.patch | 69 ---------------
 debian/patches/series                         |  3 -
 debian/rules                                  |  5 +-
 debian/tests/build                            | 42 ++++++++++
 debian/tests/control                          |  2 +
 debian/tests/python3-gi                       | 16 ++++
 21 files changed, 244 insertions(+), 255 deletions(-)
 delete mode 100644 debian/patches/072_statusicon_icon_size.patch
 delete mode 100644 debian/patches/073_transparent_colors.patch
 delete mode 100644 debian/patches/074_try-harder-to-discriminate-Shift-F10-and-F10.patch
 create mode 100755 debian/tests/build
 create mode 100644 debian/tests/control
 create mode 100755 debian/tests/python3-gi

diff --git a/debian/changelog b/debian/changelog
index 882d106ecb..98bebe6b03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+gtk+3.0 (3.5.18-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * Sync with ubuntu:
+    * debian/rules: Make test failures fatal again
+    * debian/libgtk-3-0.symbols: Updated
+    * debian/rules: Update build-depends
+    * debian/libgtk-3-bin.install: Add gtk-launch: A new commandline utility
+      to launch an application from its desktop file
+    * Add autopkgtest support
+  * debian/patches/072_statusicon_icon_size.patch:
+    * Removed merged upstream
+  * debian/patches/074_try-harder-to-discriminate-Shift-F10-and-F10.patch:
+    * Removed, fixed upstream
+  * debian/patches/073_transparent_colors.patch
+    * Removed, fixed upstream
+  * debian/control.in: bump glib2.0 build-dep to >= 2.33.14 to trump the dodgy
+    version in unstable
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Sun, 23 Sep 2012 21:46:55 +0200
+
 gtk+3.0 (3.4.2-4) unstable; urgency=low
 
   * debian/patches/074_try-harder-to-discriminate-Shift-F10-and-F10.patch:
diff --git a/debian/control b/debian/control
index 8b31f32efb..ecbf069be1 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: gtk+3.0
 Section: libs
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
-Uploaders: Michael Biebl <biebl@debian.org>
+Uploaders: Michael Biebl <biebl@debian.org>, Sjoerd Simons <sjoerd@debian.org>
 Build-Depends: debhelper (>= 8.1.3),
                cdbs (>= 0.4.93),
                gnome-pkg-tools (>= 0.11),
@@ -12,10 +12,11 @@ Build-Depends: debhelper (>= 8.1.3),
                gettext,
                pkg-config,
                autotools-dev,
-               libglib2.0-dev (>= 2.32.0),
+               libglib2.0-dev (>= 2.33.14),
                libgdk-pixbuf2.0-dev (>= 2.26.0),
                libpango1.0-dev (>= 1.30.0),
-               libatk1.0-dev (>= 2.2.0),
+               libatk1.0-dev (>= 2.5.3),
+               libatk-bridge2.0-dev,
                libx11-dev (>= 2:1.3.3-2),
                libxext-dev (>= 2:1.1.1-3),
                libxi-dev (>= 2:1.3-4),
@@ -34,7 +35,8 @@ Build-Depends: debhelper (>= 8.1.3),
                libcups2-dev (>= 1.2),
                libcolord-dev (>= 0.1.9),
                gobject-introspection (>= 1.32.0),
-               libgirepository1.0-dev (>= 1.32.0)
+               libgirepository1.0-dev (>= 1.32.0),
+               xvfb
 Build-Depends-Indep: docbook-xml,
                      docbook-utils,
                      libglib2.0-doc,
@@ -45,6 +47,7 @@ Standards-Version: 3.9.3
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gtk+3.0/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gtk+3.0/
 Homepage: http://www.gtk.org/
+XS-Testsuite: autopkgtest
 
 Package: libgtk-3-0
 Architecture: any
@@ -95,8 +98,8 @@ Section: misc
 Architecture: all
 Depends: ${misc:Depends}
 Recommends: libgtk-3-0
-Breaks: libgtk-3-0 (<< 3.2.2-3)
-Replaces: libgtk-3-0 (<< 3.2.2-3)
+Breaks: libgtk-3-0 (<< 3.5.4)
+Replaces: libgtk-3-0 (<< 3.5.4)
 Multi-Arch: foreign
 Description: common files for the GTK+ graphical user interface library
  GTK+ is a multi-platform toolkit for creating graphical user
@@ -130,10 +133,11 @@ Depends: libgtk-3-0 (= ${binary:Version}),
          libgtk-3-common,
          ${misc:Depends},
          ${shlibs:Depends},
-         libglib2.0-dev (>= 2.32.0),
+         libglib2.0-dev (>= 2.33.14),
          libgdk-pixbuf2.0-dev (>= 2.26.0),
          libpango1.0-dev (>= 1.30.0),
          libatk1.0-dev (>= 2.2.0),
+         libatk-bridge2.0-dev,
          libcairo2-dev (>= 1.10.0),
          libx11-dev,
          libxext-dev,
@@ -197,8 +201,8 @@ Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          libgtk-3-0 (= ${binary:Version})
-Breaks: libgtk-3-common (<< 3.3.20-1)
-Replaces: libgtk-3-common (<< 3.3.20-1)
+Breaks: libgtk-3-common (<< 3.5.4)
+Replaces: libgtk-3-common (<< 3.5.4)
 Description: example files for GTK+ 3
  GTK+ is a multi-platform toolkit for creating graphical user
  interfaces. Offering a complete set of widgets, GTK+ is suitable
@@ -228,7 +232,8 @@ Package: libgail-3-0
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         libgtk-3-0 (= ${binary:Version})
+         libgtk-3-0 (= ${binary:Version}),
+         at-spi2-core
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Description: GNOME Accessibility Implementation Library -- shared libraries
diff --git a/debian/control.in b/debian/control.in
index d6f48bc90b..f451738016 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -12,10 +12,11 @@ Build-Depends: debhelper (>= 8.1.3),
                gettext,
                pkg-config,
                autotools-dev,
-               libglib2.0-dev (>= 2.32.0),
+               libglib2.0-dev (>= 2.33.14),
                libgdk-pixbuf2.0-dev (>= 2.26.0),
                libpango1.0-dev (>= 1.30.0),
-               libatk1.0-dev (>= 2.2.0),
+               libatk1.0-dev (>= 2.5.3),
+               libatk-bridge2.0-dev,
                libx11-dev (>= 2:1.3.3-2),
                libxext-dev (>= 2:1.1.1-3),
                libxi-dev (>= 2:1.3-4),
@@ -34,7 +35,8 @@ Build-Depends: debhelper (>= 8.1.3),
                libcups2-dev (>= 1.2),
                libcolord-dev (>= 0.1.9),
                gobject-introspection (>= 1.32.0),
-               libgirepository1.0-dev (>= 1.32.0)
+               libgirepository1.0-dev (>= 1.32.0),
+               xvfb
 Build-Depends-Indep: docbook-xml,
                      docbook-utils,
                      libglib2.0-doc,
@@ -45,6 +47,7 @@ Standards-Version: 3.9.3
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gtk+3.0/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gtk+3.0/
 Homepage: http://www.gtk.org/
+XS-Testsuite: autopkgtest
 
 Package: @SHARED_PKG@
 Architecture: any
@@ -95,8 +98,8 @@ Section: misc
 Architecture: all
 Depends: ${misc:Depends}
 Recommends: @SHARED_PKG@
-Breaks: @SHARED_PKG@ (<< 3.2.2-3)
-Replaces: @SHARED_PKG@ (<< 3.2.2-3)
+Breaks: @SHARED_PKG@ (<< 3.5.4)
+Replaces: @SHARED_PKG@ (<< 3.5.4)
 Multi-Arch: foreign
 Description: common files for the GTK+ graphical user interface library
  GTK+ is a multi-platform toolkit for creating graphical user
@@ -130,10 +133,11 @@ Depends: @SHARED_PKG@ (= ${binary:Version}),
          @COMMON_PKG@,
          ${misc:Depends},
          ${shlibs:Depends},
-         libglib2.0-dev (>= 2.32.0),
+         libglib2.0-dev (>= 2.33.14),
          libgdk-pixbuf2.0-dev (>= 2.26.0),
          libpango1.0-dev (>= 1.30.0),
          libatk1.0-dev (>= 2.2.0),
+         libatk-bridge2.0-dev,
          libcairo2-dev (>= 1.10.0),
          libx11-dev,
          libxext-dev,
@@ -197,8 +201,8 @@ Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          @SHARED_PKG@ (= ${binary:Version})
-Breaks: @COMMON_PKG@ (<< 3.3.20-1)
-Replaces: @COMMON_PKG@ (<< 3.3.20-1)
+Breaks: @COMMON_PKG@ (<< 3.5.4)
+Replaces: @COMMON_PKG@ (<< 3.5.4)
 Description: example files for GTK+ 3
  GTK+ is a multi-platform toolkit for creating graphical user
  interfaces. Offering a complete set of widgets, GTK+ is suitable
@@ -228,7 +232,8 @@ Package: libgail-3-0
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-         @SHARED_PKG@ (= ${binary:Version})
+         @SHARED_PKG@ (= ${binary:Version}),
+         at-spi2-core
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Description: GNOME Accessibility Implementation Library -- shared libraries
diff --git a/debian/libgtk-3-0.symbols b/debian/libgtk-3-0.symbols
index 83013c3eea..e8b3976807 100644
--- a/debian/libgtk-3-0.symbols
+++ b/debian/libgtk-3-0.symbols
@@ -542,7 +542,9 @@ libgdk-3.so.0 libgtk-3-0 #MINVER#
  gdk_x11_get_xatom_name@Base 3.0.0
  gdk_x11_get_xatom_name_for_display@Base 3.0.0
  gdk_x11_grab_server@Base 3.0.0
+ gdk_x11_keymap_get_group_for_state@Base 3.5.2
  gdk_x11_keymap_get_type@Base 3.0.0
+ gdk_x11_keymap_key_is_modifier@Base 3.5.2
  gdk_x11_lookup_xdisplay@Base 3.0.0
  gdk_x11_register_standard_event_type@Base 3.0.0
  gdk_x11_screen_get_monitor_output@Base 3.0.0
@@ -623,6 +625,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_accel_label_get_type@Base 3.0.0
  gtk_accel_label_new@Base 3.0.0
  gtk_accel_label_refetch@Base 3.0.0
+ gtk_accel_label_set_accel@Base 3.5.18
  gtk_accel_label_set_accel_closure@Base 3.0.0
  gtk_accel_label_set_accel_widget@Base 3.0.0
  gtk_accel_map_add_entry@Base 3.0.0
@@ -686,6 +689,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_action_group_add_radio_actions_full@Base 3.0.0
  gtk_action_group_add_toggle_actions@Base 3.0.0
  gtk_action_group_add_toggle_actions_full@Base 3.0.0
+ gtk_action_group_get_accel_group@Base 3.5.18
  gtk_action_group_get_action@Base 3.0.0
  gtk_action_group_get_name@Base 3.0.0
  gtk_action_group_get_sensitive@Base 3.0.0
@@ -694,6 +698,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_action_group_list_actions@Base 3.0.0
  gtk_action_group_new@Base 3.0.0
  gtk_action_group_remove_action@Base 3.0.0
+ gtk_action_group_set_accel_group@Base 3.5.18
  gtk_action_group_set_sensitive@Base 3.0.0
  gtk_action_group_set_translate_func@Base 3.0.0
  gtk_action_group_set_translation_domain@Base 3.0.0
@@ -794,9 +799,11 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_app_chooser_widget_set_show_recommended@Base 3.0.0
  gtk_application_add_accelerator@Base 3.3.16
  gtk_application_add_window@Base 3.0.0
+ gtk_application_get_active_window@Base 3.5.12
  gtk_application_get_app_menu@Base 3.3.16
  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
  gtk_application_get_windows@Base 3.0.0
  gtk_application_inhibit@Base 3.3.16
  gtk_application_inhibit_flags_get_type@Base 3.3.16
@@ -807,6 +814,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_application_set_app_menu@Base 3.3.16
  gtk_application_set_menubar@Base 3.3.16
  gtk_application_uninhibit@Base 3.3.16
+ gtk_application_window_get_id@Base 3.5.4
  gtk_application_window_get_show_menubar@Base 3.3.16
  gtk_application_window_get_type@Base 3.3.16
  gtk_application_window_new@Base 3.3.16
@@ -920,6 +928,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_button_clicked@Base 3.0.0
  gtk_button_enter@Base 3.0.0
  gtk_button_get_alignment@Base 3.0.0
+ gtk_button_get_always_show_image@Base 3.5.4
  gtk_button_get_event_window@Base 3.0.0
  gtk_button_get_focus_on_click@Base 3.0.0
  gtk_button_get_image@Base 3.0.0
@@ -937,6 +946,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_button_pressed@Base 3.0.0
  gtk_button_released@Base 3.0.0
  gtk_button_set_alignment@Base 3.0.0
+ gtk_button_set_always_show_image@Base 3.5.4
  gtk_button_set_focus_on_click@Base 3.0.0
  gtk_button_set_image@Base 3.0.0
  gtk_button_set_image_position@Base 3.0.0
@@ -1441,6 +1451,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_entry_completion_set_text_column@Base 3.0.0
  gtk_entry_get_activates_default@Base 3.0.0
  gtk_entry_get_alignment@Base 3.0.0
+ gtk_entry_get_attributes@Base 3.5.14
  gtk_entry_get_buffer@Base 3.0.0
  gtk_entry_get_completion@Base 3.0.0
  gtk_entry_get_current_icon_drag_source@Base 3.0.0
@@ -1458,6 +1469,8 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_entry_get_icon_tooltip_markup@Base 3.0.0
  gtk_entry_get_icon_tooltip_text@Base 3.0.0
  gtk_entry_get_inner_border@Base 3.0.0
+ gtk_entry_get_input_hints@Base 3.5.12
+ gtk_entry_get_input_purpose@Base 3.5.12
  gtk_entry_get_invisible_char@Base 3.0.0
  gtk_entry_get_layout@Base 3.0.0
  gtk_entry_get_layout_offsets@Base 3.0.0
@@ -1481,6 +1494,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_entry_reset_im_context@Base 3.0.0
  gtk_entry_set_activates_default@Base 3.0.0
  gtk_entry_set_alignment@Base 3.0.0
+ gtk_entry_set_attributes@Base 3.5.14
  gtk_entry_set_buffer@Base 3.0.0
  gtk_entry_set_completion@Base 3.0.0
  gtk_entry_set_cursor_hadjustment@Base 3.0.0
@@ -1495,6 +1509,8 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_entry_set_icon_tooltip_markup@Base 3.0.0
  gtk_entry_set_icon_tooltip_text@Base 3.0.0
  gtk_entry_set_inner_border@Base 3.0.0
+ gtk_entry_set_input_hints@Base 3.5.12
+ gtk_entry_set_input_purpose@Base 3.5.12
  gtk_entry_set_invisible_char@Base 3.0.0
  gtk_entry_set_max_length@Base 3.0.0
  gtk_entry_set_overwrite_mode@Base 3.0.0
@@ -1852,6 +1868,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_icon_view_drop_position_get_type@Base 3.0.0
  gtk_icon_view_enable_model_drag_dest@Base 3.0.0
  gtk_icon_view_enable_model_drag_source@Base 3.0.0
+ gtk_icon_view_get_cell_rect@Base 3.5.6
  gtk_icon_view_get_column_spacing@Base 3.0.0
  gtk_icon_view_get_columns@Base 3.0.0
  gtk_icon_view_get_cursor@Base 3.0.0
@@ -1990,6 +2007,8 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_init@Base 3.0.0
  gtk_init_check@Base 3.0.0
  gtk_init_with_args@Base 3.0.0
+ gtk_input_hints_get_type@Base 3.5.12
+ gtk_input_purpose_get_type@Base 3.5.12
  gtk_invisible_get_screen@Base 3.0.0
  gtk_invisible_get_type@Base 3.0.0
  gtk_invisible_new@Base 3.0.0
@@ -2055,6 +2074,21 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_layout_set_hadjustment@Base 3.0.0
  gtk_layout_set_size@Base 3.0.0
  gtk_layout_set_vadjustment@Base 3.0.0
+ gtk_level_bar_add_offset_value@Base 3.5.8
+ gtk_level_bar_get_max_value@Base 3.5.8
+ gtk_level_bar_get_min_value@Base 3.5.8
+ gtk_level_bar_get_mode@Base 3.5.8
+ gtk_level_bar_get_offset_value@Base 3.5.8
+ gtk_level_bar_get_type@Base 3.5.8
+ gtk_level_bar_get_value@Base 3.5.8
+ gtk_level_bar_mode_get_type@Base 3.5.8
+ gtk_level_bar_new@Base 3.5.8
+ gtk_level_bar_new_for_interval@Base 3.5.8
+ gtk_level_bar_remove_offset_value@Base 3.5.8
+ gtk_level_bar_set_max_value@Base 3.5.8
+ gtk_level_bar_set_min_value@Base 3.5.8
+ gtk_level_bar_set_mode@Base 3.5.8
+ gtk_level_bar_set_value@Base 3.5.8
  gtk_license_get_type@Base 3.0.0
  gtk_link_button_get_type@Base 3.0.0
  gtk_link_button_get_uri@Base 3.0.0
@@ -2104,6 +2138,18 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_menu_bar_new_from_model@Base 3.3.16
  gtk_menu_bar_set_child_pack_direction@Base 3.0.0
  gtk_menu_bar_set_pack_direction@Base 3.0.0
+ gtk_menu_button_get_align_widget@Base 3.5.6
+ gtk_menu_button_get_direction@Base 3.5.6
+ gtk_menu_button_get_menu@Base 3.5.6
+ gtk_menu_button_get_menu_model@Base 3.5.6
+ gtk_menu_button_get_popup@Base 3.5.12
+ gtk_menu_button_get_type@Base 3.5.6
+ gtk_menu_button_new@Base 3.5.6
+ gtk_menu_button_set_align_widget@Base 3.5.6
+ gtk_menu_button_set_direction@Base 3.5.6
+ gtk_menu_button_set_menu@Base 3.5.6
+ gtk_menu_button_set_menu_model@Base 3.5.6
+ gtk_menu_button_set_popup@Base 3.5.12
  gtk_menu_detach@Base 3.0.0
  gtk_menu_direction_type_get_type@Base 3.0.0
  gtk_menu_get_accel_group@Base 3.0.0
@@ -2154,6 +2200,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_menu_set_title@Base 3.0.0
  gtk_menu_shell_activate_item@Base 3.0.0
  gtk_menu_shell_append@Base 3.0.0
+ gtk_menu_shell_bind_model@Base 3.5.18
  gtk_menu_shell_cancel@Base 3.0.0
  gtk_menu_shell_deactivate@Base 3.0.0
  gtk_menu_shell_deselect@Base 3.0.0
@@ -2931,6 +2978,8 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_scrolled_window_set_shadow_type@Base 3.0.0
  gtk_scrolled_window_set_vadjustment@Base 3.0.0
  gtk_scrolled_window_unset_placement@Base 3.0.0
+ gtk_search_entry_get_type@Base 3.5.6
+ gtk_search_entry_new@Base 3.5.6
  gtk_selection_add_target@Base 3.0.0
  gtk_selection_add_targets@Base 3.0.0
  gtk_selection_clear_targets@Base 3.0.0
@@ -3510,6 +3559,8 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_text_view_get_editable@Base 3.0.0
  gtk_text_view_get_hadjustment@Base 3.0.0
  gtk_text_view_get_indent@Base 3.0.0
+ gtk_text_view_get_input_hints@Base 3.5.12
+ gtk_text_view_get_input_purpose@Base 3.5.12
  gtk_text_view_get_iter_at_location@Base 3.0.0
  gtk_text_view_get_iter_at_position@Base 3.0.0
  gtk_text_view_get_iter_location@Base 3.0.0
@@ -3546,6 +3597,8 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_text_view_set_cursor_visible@Base 3.0.0
  gtk_text_view_set_editable@Base 3.0.0
  gtk_text_view_set_indent@Base 3.0.0
+ gtk_text_view_set_input_hints@Base 3.5.12
+ gtk_text_view_set_input_purpose@Base 3.5.12
  gtk_text_view_set_justification@Base 3.0.0
  gtk_text_view_set_left_margin@Base 3.0.0
  gtk_text_view_set_overwrite@Base 3.0.0
@@ -4190,6 +4243,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_widget_hide_on_delete@Base 3.0.0
  gtk_widget_in_destruction@Base 3.0.0
  gtk_widget_input_shape_combine_region@Base 3.0.0
+ gtk_widget_insert_action_group@Base 3.5.12
  gtk_widget_intersect@Base 3.0.0
  gtk_widget_is_ancestor@Base 3.0.0
  gtk_widget_is_composited@Base 3.0.0
diff --git a/debian/libgtk-3-bin.install b/debian/libgtk-3-bin.install
index 6188080630..7fae7a65b6 100644
--- a/debian/libgtk-3-bin.install
+++ b/debian/libgtk-3-bin.install
@@ -1,2 +1,3 @@
 usr/share/man/man1/gtk-update-icon-cache.1
 usr/share/man/man1/gtk-query-immodules-3.0.1
+usr/bin/gtk-launch
diff --git a/debian/patches/016_no_offscreen_widgets_grabbing.patch b/debian/patches/016_no_offscreen_widgets_grabbing.patch
index 2fa8dd9987..9b799a0ff3 100644
--- a/debian/patches/016_no_offscreen_widgets_grabbing.patch
+++ b/debian/patches/016_no_offscreen_widgets_grabbing.patch
@@ -3,11 +3,11 @@ Author: Cody Russell <bratsche@gnome.org>
 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=607668
 Bug-Ubuntu: https://bugs.launchpad.net/bugs/512427
 
-Index: gtk+-3.3.20/gtk/gtkmain.c
+Index: gtk+-3.5.18/gtk/gtkmain.c
 ===================================================================
---- gtk+-3.3.20.orig/gtk/gtkmain.c	2012-03-21 00:38:00.982485565 +0100
-+++ gtk+-3.3.20/gtk/gtkmain.c	2012-03-21 00:38:11.186485204 +0100
-@@ -2036,9 +2036,14 @@
+--- gtk+-3.5.18.orig/gtk/gtkmain.c	2012-09-19 03:34:42.000000000 +1200
++++ gtk+-3.5.18/gtk/gtkmain.c	2012-09-19 12:16:53.696728253 +1200
+@@ -2046,9 +2046,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 13909cc4f7..4ea78fd521 100644
--- a/debian/patches/017_no_offscreen_device_grabbing.patch
+++ b/debian/patches/017_no_offscreen_device_grabbing.patch
@@ -3,11 +3,11 @@ Author: Robert Carr <racarr@canonical.com>
 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=658563
 Bug-Ubuntu: https://launchpad.net/bugs/804009
 
-Index: gtk+-3.3.20/gtk/gtkmain.c
+Index: gtk+-3.5.18/gtk/gtkmain.c
 ===================================================================
---- gtk+-3.3.20.orig/gtk/gtkmain.c	2012-03-21 00:38:11.186485204 +0100
-+++ gtk+-3.3.20/gtk/gtkmain.c	2012-03-21 00:38:14.194485098 +0100
-@@ -2129,9 +2129,14 @@
+--- gtk+-3.5.18.orig/gtk/gtkmain.c	2012-09-19 12:16:53.696728253 +1200
++++ gtk+-3.5.18/gtk/gtkmain.c	2012-09-19 12:16:57.224728130 +1200
+@@ -2139,9 +2139,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 e5e2bbde48..a028161acf 100644
--- a/debian/patches/018_gdkenumtypes.c_location.patch
+++ b/debian/patches/018_gdkenumtypes.c_location.patch
@@ -18,10 +18,10 @@ Bug-Ubuntu: https://launchpad.net/bugs/769256
  gdk/Makefile.am |   17 +++++++----------
  1 files changed, 7 insertions(+), 10 deletions(-)
 
-Index: gtk+-3.3.20/gdk/Makefile.am
+Index: gtk+-3.5.4/gdk/Makefile.am
 ===================================================================
---- gtk+-3.3.20.orig/gdk/Makefile.am	2012-03-21 00:38:00.762485573 +0100
-+++ gtk+-3.3.20/gdk/Makefile.am	2012-03-21 00:38:17.102484995 +0100
+--- gtk+-3.5.4.orig/gdk/Makefile.am	2012-06-05 16:59:15.892579046 +1200
++++ gtk+-3.5.4/gdk/Makefile.am	2012-06-05 16:59:22.904578803 +1200
 @@ -189,8 +189,8 @@
  introspection_files = 		\
  	$(filter-out gdkkeysyms-compat.h, $(gdk_public_h_sources))	\
@@ -39,10 +39,10 @@ Index: gtk+-3.3.20/gdk/Makefile.am
  
 -MAINTAINERCLEANFILES = $(gdk_built_sources) stamp-gdkenumtypes.h
 +MAINTAINERCLEANFILES = $(gdk_built_sources)
- EXTRA_DIST += $(gdk_built_sources)
- 
- install-exec-hook:
-@@ -317,18 +317,15 @@
+ EXTRA_DIST += \
+ 	$(gdk_built_sources)	\
+ 	fallback-c89.c
+@@ -319,18 +319,15 @@
  	$(gdk_built_sources)			\
  	gdkconfig.h
  
diff --git a/debian/patches/022_disable-viqr-im-for-vi-locale.patch b/debian/patches/022_disable-viqr-im-for-vi-locale.patch
index 42a04c5837..d21f5a908e 100644
--- a/debian/patches/022_disable-viqr-im-for-vi-locale.patch
+++ b/debian/patches/022_disable-viqr-im-for-vi-locale.patch
@@ -1,7 +1,7 @@
-Index: gtk+-3.3.20/modules/input/imviqr.c
+Index: gtk+3.0-3.3.20/modules/input/imviqr.c
 ===================================================================
---- gtk+-3.3.20.orig/modules/input/imviqr.c	2012-03-21 00:38:00.662485577 +0100
-+++ gtk+-3.3.20/modules/input/imviqr.c	2012-03-21 00:38:21.298484846 +0100
+--- gtk+3.0-3.3.20.orig/modules/input/imviqr.c	2012-03-18 21:44:22.000000000 +0100
++++ gtk+3.0-3.3.20/modules/input/imviqr.c	2012-03-20 18:48:18.101061455 +0100
 @@ -242,7 +242,7 @@
    N_("Vietnamese (VIQR)"), /* Human readable name */
    GETTEXT_PACKAGE,	   /* Translation domain */
diff --git a/debian/patches/042_treeview_single-focus.patch b/debian/patches/042_treeview_single-focus.patch
index 281a786eaf..03ea7e3244 100644
--- a/debian/patches/042_treeview_single-focus.patch
+++ b/debian/patches/042_treeview_single-focus.patch
@@ -1,8 +1,8 @@
-Index: gtk+-3.2.3/gtk/gtktreeview.c
+Index: gtk+3.0-3.3.4/gtk/gtktreeview.c
 ===================================================================
---- gtk+-3.2.3.orig/gtk/gtktreeview.c	2011-12-19 14:58:28.000000000 +0100
-+++ gtk+-3.2.3/gtk/gtktreeview.c	2011-12-20 18:32:45.163006233 +0100
-@@ -10090,7 +10090,8 @@
+--- gtk+3.0-3.3.4.orig/gtk/gtktreeview.c	2011-11-21 14:30:11.000000000 +0100
++++ gtk+3.0-3.3.4/gtk/gtktreeview.c	2011-12-07 18:33:01.585621058 +0100
+@@ -10113,7 +10113,8 @@
  
        if (cursor_path)
  	{
diff --git a/debian/patches/043_notebook_scroll.patch b/debian/patches/043_notebook_scroll.patch
index f8b27c4df0..61986faec7 100644
--- a/debian/patches/043_notebook_scroll.patch
+++ b/debian/patches/043_notebook_scroll.patch
@@ -4,11 +4,11 @@ Add back the feature but in a different way:
 * works from the whole area
 See GNOME #630226 and #145244
 
-Index: gtk+-3.3.16/gtk/gtkcalendar.c
+Index: gtk+-3.2.2/gtk/gtkcalendar.c
 ===================================================================
---- gtk+-3.3.16.orig/gtk/gtkcalendar.c	2012-03-05 00:06:46.168212766 +0100
-+++ gtk+-3.3.16/gtk/gtkcalendar.c	2012-03-05 01:26:58.984165734 +0100
-@@ -3159,6 +3159,10 @@
+--- gtk+-3.2.2.orig/gtk/gtkcalendar.c	2011-11-07 19:47:34.000000000 +0100
++++ gtk+-3.2.2/gtk/gtkcalendar.c	2011-11-13 02:59:34.922905814 +0100
+@@ -3161,6 +3161,10 @@
  {
    GtkCalendar *calendar = GTK_CALENDAR (widget);
  
@@ -19,11 +19,11 @@ Index: gtk+-3.3.16/gtk/gtkcalendar.c
    if (event->direction == GDK_SCROLL_UP)
      {
        if (!gtk_widget_has_focus (widget))
-Index: gtk+-3.3.16/gtk/gtkcombobox.c
+Index: gtk+-3.2.2/gtk/gtkcombobox.c
 ===================================================================
---- gtk+-3.3.16.orig/gtk/gtkcombobox.c	2012-03-05 00:06:46.168212766 +0100
-+++ gtk+-3.3.16/gtk/gtkcombobox.c	2012-03-05 01:26:58.992165734 +0100
-@@ -3059,6 +3059,10 @@
+--- gtk+-3.2.2.orig/gtk/gtkcombobox.c	2011-11-11 23:39:31.000000000 +0100
++++ gtk+-3.2.2/gtk/gtkcombobox.c	2011-11-13 02:59:34.926905815 +0100
+@@ -3002,6 +3002,10 @@
    GtkTreeIter iter;
    GtkTreeIter new_iter;
  
@@ -34,11 +34,11 @@ Index: gtk+-3.3.16/gtk/gtkcombobox.c
    if (!gtk_combo_box_get_active_iter (combo_box, &iter))
      return TRUE;
  
-Index: gtk+-3.3.16/gtk/gtkmenu.c
+Index: gtk+-3.2.2/gtk/gtkmenu.c
 ===================================================================
---- gtk+-3.3.16.orig/gtk/gtkmenu.c	2012-03-05 00:06:46.168212766 +0100
-+++ gtk+-3.3.16/gtk/gtkmenu.c	2012-03-05 01:26:59.032165732 +0100
-@@ -3922,6 +3922,10 @@
+--- gtk+-3.2.2.orig/gtk/gtkmenu.c	2011-11-11 23:39:31.000000000 +0100
++++ gtk+-3.2.2/gtk/gtkmenu.c	2011-11-13 02:59:34.930905815 +0100
+@@ -3954,6 +3954,10 @@
  {
    GtkMenu *menu = GTK_MENU (widget);
  
@@ -49,11 +49,11 @@ Index: gtk+-3.3.16/gtk/gtkmenu.c
    switch (event->direction)
      {
      case GDK_SCROLL_RIGHT:
-Index: gtk+-3.3.16/gtk/gtknotebook.c
+Index: gtk+-3.2.2/gtk/gtknotebook.c
 ===================================================================
---- gtk+-3.3.16.orig/gtk/gtknotebook.c	2012-03-05 00:06:46.168212766 +0100
-+++ gtk+-3.3.16/gtk/gtknotebook.c	2012-03-05 01:26:59.040165732 +0100
-@@ -342,6 +342,8 @@
+--- gtk+-3.2.2.orig/gtk/gtknotebook.c	2011-11-12 03:52:24.000000000 +0100
++++ gtk+-3.2.2/gtk/gtknotebook.c	2011-11-13 02:59:34.934905815 +0100
+@@ -345,6 +345,8 @@
                                                GtkAllocation    *allocation);
  static gint gtk_notebook_draw                (GtkWidget        *widget,
                                                cairo_t          *cr);
@@ -62,7 +62,7 @@ Index: gtk+-3.3.16/gtk/gtknotebook.c
  static gint gtk_notebook_button_press        (GtkWidget        *widget,
                                                GdkEventButton   *event);
  static gint gtk_notebook_button_release      (GtkWidget        *widget,
-@@ -646,6 +648,7 @@
+@@ -648,6 +650,7 @@
    widget_class->get_preferred_height_for_width = gtk_notebook_get_preferred_height_for_width;
    widget_class->size_allocate = gtk_notebook_size_allocate;
    widget_class->draw = gtk_notebook_draw;
@@ -70,7 +70,7 @@ Index: gtk+-3.3.16/gtk/gtknotebook.c
    widget_class->button_press_event = gtk_notebook_button_press;
    widget_class->button_release_event = gtk_notebook_button_release;
    widget_class->popup_menu = gtk_notebook_popup_menu;
-@@ -1894,7 +1897,8 @@
+@@ -1887,7 +1890,8 @@
    attributes.event_mask = gtk_widget_get_events (widget);
    attributes.event_mask |= (GDK_BUTTON_PRESS_MASK |
                              GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK |
@@ -80,7 +80,7 @@ Index: gtk+-3.3.16/gtk/gtknotebook.c
    attributes_mask = GDK_WA_X | GDK_WA_Y;
  
    priv->event_window = gdk_window_new (gtk_widget_get_parent_window (widget),
-@@ -2859,6 +2863,38 @@
+@@ -2810,6 +2814,38 @@
      return FALSE;
  }
  
@@ -119,11 +119,11 @@ Index: gtk+-3.3.16/gtk/gtknotebook.c
  static GList*
  get_tab_at_pos (GtkNotebook *notebook, gint x, gint y)
  {
-Index: gtk+-3.3.16/gtk/gtkpathbar.c
+Index: gtk+-3.2.2/gtk/gtkpathbar.c
 ===================================================================
---- gtk+-3.3.16.orig/gtk/gtkpathbar.c	2012-03-05 00:06:46.168212766 +0100
-+++ gtk+-3.3.16/gtk/gtkpathbar.c	2012-03-05 01:26:59.064165732 +0100
-@@ -762,6 +762,10 @@
+--- gtk+-3.2.2.orig/gtk/gtkpathbar.c	2011-11-07 19:47:35.000000000 +0100
++++ gtk+-3.2.2/gtk/gtkpathbar.c	2011-11-13 02:59:34.938905813 +0100
+@@ -757,6 +757,10 @@
  gtk_path_bar_scroll (GtkWidget      *widget,
  		     GdkEventScroll *event)
  {
@@ -134,11 +134,11 @@ Index: gtk+-3.3.16/gtk/gtkpathbar.c
    switch (event->direction)
      {
      case GDK_SCROLL_RIGHT:
-Index: gtk+-3.3.16/gtk/gtkrange.c
+Index: gtk+-3.2.2/gtk/gtkrange.c
 ===================================================================
---- gtk+-3.3.16.orig/gtk/gtkrange.c	2012-03-05 00:06:46.168212766 +0100
-+++ gtk+-3.3.16/gtk/gtkrange.c	2012-03-05 01:26:59.096165732 +0100
-@@ -2827,6 +2827,10 @@
+--- gtk+-3.2.2.orig/gtk/gtkrange.c	2011-11-11 23:39:31.000000000 +0100
++++ gtk+-3.2.2/gtk/gtkrange.c	2011-11-13 02:59:34.938905813 +0100
+@@ -2748,6 +2748,10 @@
    GtkRange *range = GTK_RANGE (widget);
    GtkRangePrivate *priv = range->priv;
  
@@ -149,10 +149,10 @@ Index: gtk+-3.3.16/gtk/gtkrange.c
    if (gtk_widget_get_realized (widget))
      {
        gdouble delta;
-Index: gtk+-3.3.16/gtk/gtkscalebutton.c
+Index: gtk+-3.2.2/gtk/gtkscalebutton.c
 ===================================================================
---- gtk+-3.3.16.orig/gtk/gtkscalebutton.c	2012-03-05 00:06:46.168212766 +0100
-+++ gtk+-3.3.16/gtk/gtkscalebutton.c	2012-03-05 01:26:59.124165731 +0100
+--- gtk+-3.2.2.orig/gtk/gtkscalebutton.c	2011-11-11 23:39:31.000000000 +0100
++++ gtk+-3.2.2/gtk/gtkscalebutton.c	2011-11-13 02:59:34.942905810 +0100
 @@ -848,6 +848,10 @@
    if (event->type != GDK_SCROLL)
      return FALSE;
@@ -164,11 +164,11 @@ Index: gtk+-3.3.16/gtk/gtkscalebutton.c
    d = gtk_scale_button_get_value (button);
    if (event->direction == GDK_SCROLL_UP)
      {
-Index: gtk+-3.3.16/gtk/gtkscrolledwindow.c
+Index: gtk+-3.2.2/gtk/gtkscrolledwindow.c
 ===================================================================
---- gtk+-3.3.16.orig/gtk/gtkscrolledwindow.c	2012-03-05 00:06:46.168212766 +0100
-+++ gtk+-3.3.16/gtk/gtkscrolledwindow.c	2012-03-05 01:26:59.148165732 +0100
-@@ -1858,6 +1858,10 @@
+--- gtk+-3.2.2.orig/gtk/gtkscrolledwindow.c	2011-11-11 23:39:31.000000000 +0100
++++ gtk+-3.2.2/gtk/gtkscrolledwindow.c	2011-11-13 02:59:34.942905810 +0100
+@@ -1852,6 +1852,10 @@
    scrolled_window = GTK_SCROLLED_WINDOW (widget);
    priv = scrolled_window->priv;
  
@@ -179,11 +179,11 @@ Index: gtk+-3.3.16/gtk/gtkscrolledwindow.c
    if (event->direction == GDK_SCROLL_UP || event->direction == GDK_SCROLL_DOWN)
      range = priv->vscrollbar;
    else
-Index: gtk+-3.3.16/gtk/gtkspinbutton.c
+Index: gtk+-3.2.2/gtk/gtkspinbutton.c
 ===================================================================
---- gtk+-3.3.16.orig/gtk/gtkspinbutton.c	2012-03-05 00:06:46.168212766 +0100
-+++ gtk+-3.3.16/gtk/gtkspinbutton.c	2012-03-05 01:26:59.152165733 +0100
-@@ -1262,6 +1262,10 @@
+--- gtk+-3.2.2.orig/gtk/gtkspinbutton.c	2011-11-11 23:39:31.000000000 +0100
++++ gtk+-3.2.2/gtk/gtkspinbutton.c	2011-11-13 02:59:34.946905809 +0100
+@@ -1181,6 +1181,10 @@
    GtkSpinButton *spin = GTK_SPIN_BUTTON (widget);
    GtkSpinButtonPrivate *priv = spin->priv;
  
@@ -194,11 +194,11 @@ Index: gtk+-3.3.16/gtk/gtkspinbutton.c
    if (event->direction == GDK_SCROLL_UP)
      {
        if (!gtk_widget_has_focus (widget))
-Index: gtk+-3.3.16/gtk/gtktreeview.c
+Index: gtk+-3.2.2/gtk/gtktreeview.c
 ===================================================================
---- gtk+-3.3.16.orig/gtk/gtktreeview.c	2012-03-05 00:06:46.000000000 +0100
-+++ gtk+-3.3.16/gtk/gtktreeview.c	2012-03-05 01:26:59.156165733 +0100
-@@ -15216,6 +15216,10 @@
+--- gtk+-3.2.2.orig/gtk/gtktreeview.c	2011-11-13 02:59:31.902905921 +0100
++++ gtk+-3.2.2/gtk/gtktreeview.c	2011-11-13 02:59:34.950905810 +0100
+@@ -15106,6 +15106,10 @@
  {
    gboolean retval = FALSE;
  
diff --git a/debian/patches/044_tracker_fts.patch b/debian/patches/044_tracker_fts.patch
index 6b9b433611..0cfd1f8838 100644
--- a/debian/patches/044_tracker_fts.patch
+++ b/debian/patches/044_tracker_fts.patch
@@ -3,10 +3,10 @@ Description: Enable tracker full text search
  GTK3's file selector dialog.
  This way files can be found by their content and not only their file name.
 
-Index: gtk+-3.3.20/gtk/gtksearchenginetracker.c
+Index: gtk+3.0-3.3.20/gtk/gtksearchenginetracker.c
 ===================================================================
---- gtk+-3.3.20.orig/gtk/gtksearchenginetracker.c	2012-03-21 00:38:00.554485580 +0100
-+++ gtk+-3.3.20/gtk/gtksearchenginetracker.c	2012-03-21 00:38:24.098484747 +0100
+--- gtk+3.0-3.3.20.orig/gtk/gtksearchenginetracker.c	2012-03-18 21:44:22.000000000 +0100
++++ gtk+3.0-3.3.20/gtk/gtksearchenginetracker.c	2012-03-20 18:48:18.113061457 +0100
 @@ -50,7 +50,7 @@
   * use filename matching instead. This doesn't use the content of the
   * file however.
diff --git a/debian/patches/061_multiarch_module_fallback.patch b/debian/patches/061_multiarch_module_fallback.patch
index da6af79965..6d290a43a2 100644
--- a/debian/patches/061_multiarch_module_fallback.patch
+++ b/debian/patches/061_multiarch_module_fallback.patch
@@ -5,19 +5,19 @@ Description: Fall back to the hard-coded pre-multiarch module directory
 Author: Steve Langasek <steve.langasek@linaro.org>
 Forwarded: not-needed
 
-Index: gtk+-3.3.20/gtk/gtkmodules.c
+Index: gtk+-3.5.2/gtk/gtkmodules.c
 ===================================================================
---- gtk+-3.3.20.orig/gtk/gtkmodules.c	2012-03-21 00:38:00.334485587 +0100
-+++ gtk+-3.3.20/gtk/gtkmodules.c	2012-03-21 00:38:29.590484553 +0100
-@@ -57,6 +57,7 @@
-   gchar *home_gtk_dir = NULL;
+--- gtk+-3.5.2.orig/gtk/gtkmodules.c	2012-04-30 22:42:29.000000000 +1200
++++ gtk+-3.5.2/gtk/gtkmodules.c	2012-05-22 17:21:02.554436536 +1200
+@@ -55,6 +55,7 @@
+   const gchar *exe_prefix;
    gchar *module_path;
    gchar *default_dir;
 +  gchar *pre_multiarch_dir = NULL;
    static gchar **result = NULL;
  
    if (result)
-@@ -71,21 +72,23 @@
+@@ -65,15 +66,17 @@
  
    if (exe_prefix)
      default_dir = g_build_filename (exe_prefix, "lib", "gtk-3.0", NULL);
@@ -27,22 +27,14 @@ Index: gtk+-3.3.20/gtk/gtkmodules.c
 +    pre_multiarch_dir = "/usr/lib/gtk-3.0";
 +  }
  
-   if (module_path_env && home_gtk_dir)
-     module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S,
--				module_path_env, home_gtk_dir, default_dir, NULL);
-+				module_path_env, home_gtk_dir, default_dir, pre_multiarch_dir, NULL);
-   else if (module_path_env)
+   if (module_path_env)
      module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S,
 -				module_path_env, default_dir, NULL);
 +				module_path_env, default_dir, pre_multiarch_dir, NULL);
-   else if (home_gtk_dir)
-     module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S,
--				home_gtk_dir, default_dir, NULL);
-+				home_gtk_dir, default_dir, pre_multiarch_dir, NULL);
    else
      module_path = g_build_path (G_SEARCHPATH_SEPARATOR_S,
 -				default_dir, NULL);
 +				default_dir, pre_multiarch_dir, NULL);
  
-   g_free (home_gtk_dir);
    g_free (default_dir);
+ 
diff --git a/debian/patches/072_statusicon_icon_size.patch b/debian/patches/072_statusicon_icon_size.patch
deleted file mode 100644
index 4a102f941c..0000000000
--- a/debian/patches/072_statusicon_icon_size.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From b4f092f17d93a9343c917e3a20b906b693965bda Mon Sep 17 00:00:00 2001
-From: Fernando Lemos <fernandotcl@gmail.com>
-Date: Tue, 15 May 2012 10:28:37 -0400
-Subject: [PATCH] statusicon: use absolute delta to find the nearest icon size
-
-Otherwise, if we only look at (pixel_size - stock_size), we miss the
-case when the pixel size is smaller than any provided stock size.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=673749
-
-statusicon: Fix implicit declaration warning
-
-gtkstatusicon.c:1333:4: warning: implicit declaration of function 'abs' [-Wimplicit-function-declaration]
-
-Added in commit c8378099600e4279cb5c608b546bbe778c451233
----
- gtk/gtkstatusicon.c |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/gtk/gtkstatusicon.c b/gtk/gtkstatusicon.c
-index 8bcb638..5c8a591 100644
---- a/gtk/gtkstatusicon.c
-+++ b/gtk/gtkstatusicon.c
-@@ -28,6 +28,7 @@
- #include "config.h"
- 
- #include <string.h>
-+#include <stdlib.h>
- 
- #include "gtkstatusicon.h"
- 
-@@ -1328,10 +1329,9 @@ round_pixel_size (GtkWidget *widget,
- 
-   for (s = GTK_ICON_SIZE_MENU; s <= GTK_ICON_SIZE_DIALOG; s++)
-     {
--      if (gtk_icon_size_lookup_for_settings (settings, s, &w, &h) &&
--	  w <= pixel_size && h <= pixel_size)
-+      if (gtk_icon_size_lookup_for_settings (settings, s, &w, &h))
- 	{
--	  d = MAX (pixel_size - w, pixel_size - h);
-+	  d = MAX (abs (pixel_size - w), abs (pixel_size - h));
- 	  if (d < dist)
- 	    {
- 	      dist = d;
--- 
-1.7.10
-
diff --git a/debian/patches/073_transparent_colors.patch b/debian/patches/073_transparent_colors.patch
deleted file mode 100644
index 80ae3e20ec..0000000000
--- a/debian/patches/073_transparent_colors.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 72feb95edb6ab8c3fac27c0c32afeb2b2f61bd1c Mon Sep 17 00:00:00 2001
-From: Alexander Larsson <alexl@redhat.com>
-Date: Thu, 28 Jun 2012 19:30:24 +0000
-Subject: Handle transparent colors better in GtkStyle emulation
-
-We can't expose colors with alpha in the GtkStyle colors, since
-GdkColor has no alpha. Currently we throw away alpha completely,
-which fails very badly for completely transparent backgrounds,
-which now is the default for most widgets, as it typically
-end up with black-on-black.
-
-We handle this by falling back on the default/previous colors for
-transparent colors. This is is simple and avoids complete failure.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=671437
-
-(cherry picked from commit 10423726709539724be0ea19bed76ba4331af774)
----
-diff --git a/gtk/deprecated/gtkstyle.c b/gtk/deprecated/gtkstyle.c
-index 5266368..16e3ce4 100644
---- a/gtk/deprecated/gtkstyle.c
-+++ b/gtk/deprecated/gtkstyle.c
-@@ -673,7 +673,7 @@ set_color (GtkStyle        *style,
-       break;
-     }
- 
--  if (color)
-+  if (color && color->alpha > 0.01)
-     {
-       dest->pixel = 0;
-       dest->red = CLAMP ((guint) (color->red * 65535), 0, 65535);
---
-cgit v0.9.0.2
diff --git a/debian/patches/074_try-harder-to-discriminate-Shift-F10-and-F10.patch b/debian/patches/074_try-harder-to-discriminate-Shift-F10-and-F10.patch
deleted file mode 100644
index 95ee4b39a7..0000000000
--- a/debian/patches/074_try-harder-to-discriminate-Shift-F10-and-F10.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 314b6abbe8d8daae1e2de50b15cc9b6553af1f3d Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Sat, 1 Sep 2012 22:51:18 -0400
-Subject: [PATCH] Try harder to discriminate Shift-F10 and F10
-
-A change in xkeyboard-config 2.4.1 made it so that function keys
-now have a shift level which has the same symbol, but 'eats' the
-shift modifier. This would ordinarily make it impossible for us
-to discriminate between these key combinations.
-
-This commit tries harder to discriminate in 2 ways:
-- XKB has a mechanism to tell us when a modifier should not be
-  consumed even though it was used in determining the level.
-  We now respect such 'preserved' modifiers. This does not fix
-  the Shift-F10 vs F10 problem yet, since xkeyboard-config does
-  not currently mark Shift as preserved for function keys.
-- Don't consume modifiers that do not change the symbol. For
-  the function keys, the symbol on the shift level is the same
-  as the base level, so we don't consider Shift consumed.
-
-For more background on the xkeyboard-config change, see
-https://bugs.freedesktop.org/show_bug.cgi?id=45008
-
-https://bugzilla.gnome.org/show_bug.cgi?id=661973
----
- gdk/x11/gdkkeys-x11.c | 20 +++++++++++++++-----
- 1 file changed, 15 insertions(+), 5 deletions(-)
-
-Index: gtk+-3.4.2/gdk/x11/gdkkeys-x11.c
-===================================================================
---- gtk+-3.4.2.orig/gdk/x11/gdkkeys-x11.c	2012-05-02 14:05:07.000000000 +0200
-+++ gtk+-3.4.2/gdk/x11/gdkkeys-x11.c	2012-09-04 03:05:24.621782410 +0200
-@@ -1113,6 +1113,8 @@
-         int found = 0;
- 
-         for (i=0,entry=type->map;i<type->map_count;i++,entry++) {
-+            if (!entry->active)
-+              continue;
-             if (mods_rtrn) {
-                 int bits = 0;
-                 unsigned long tmp = entry->mods.mask;
-@@ -1123,14 +1125,22 @@
-                 }
-                 /* We always add one-modifiers levels to mods_rtrn since
-                  * they can't wipe out bits in the state unless the
--                 * level would be triggered. But return other modifiers
--                 *
-+                 * level would be triggered. But not if they don't change
-+                 * the symbol (otherwise we can't discriminate Shift-F10
-+                 * and F10 anymore). And don't add modifiers that are
-+                 * explicitly marked as preserved, either.
-                  */
--                if (bits == 1 || (mods&type->mods.mask)==entry->mods.mask)
--                    *mods_rtrn |= entry->mods.mask;
-+                if ((bits == 1 && syms[col+entry->level] != syms[col]) ||
-+                    (mods&type->mods.mask) == entry->mods.mask)
-+                  {
-+                    if (type->preserve)
-+                      *mods_rtrn |= (entry->mods.mask & ~type->preserve[i].mask);
-+                    else
-+                      *mods_rtrn |= entry->mods.mask;
-+                  }
-             }
- 
--            if (!found&&entry->active&&((mods&type->mods.mask)==entry->mods.mask)) {
-+            if (!found&&((mods&type->mods.mask)==entry->mods.mask)) {
-                 col+= entry->level;
-                 if (type->preserve)
-                     preserve= type->preserve[i].mask;
diff --git a/debian/patches/series b/debian/patches/series
index 98b67533af..d131e2ad02 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,6 +9,3 @@
 060_ignore-random-icons.patch
 061_multiarch_module_fallback.patch
 071_fix-installation-of-HTML-images.patch
-072_statusicon_icon_size.patch
-073_transparent_colors.patch
-074_try-harder-to-discriminate-Shift-F10-and-F10.patch
diff --git a/debian/rules b/debian/rules
index 64c1508435..05a57692fa 100644
--- a/debian/rules
+++ b/debian/rules
@@ -76,7 +76,10 @@ DEB_CONFIGURE_FLAGS_shared_udeb = \
 			--disable-xfixes \
 			--disable-xrandr
 
-DEB_MAKE_CHECK_TARGET = -k check || true
+# Avoid test failures on buildd environments
+export G_HOME=$(CURDIR)/debian/build
+
+DEB_MAKE_CHECK_TARGET = -k check
 DEB_INSTALL_DOCS_ALL = AUTHORS
 DEB_INSTALL_DOCS_$(COMMON_PKG) = README NEWS
 DEB_INSTALL_DOCS_$(DOC_PKG) += -X.in
diff --git a/debian/tests/build b/debian/tests/build
new file mode 100755
index 0000000000..84d682fffa
--- /dev/null
+++ b/debian/tests/build
@@ -0,0 +1,42 @@
+#!/bin/sh
+# autopkgtest check: Build and run a program against GTK, to verify that the
+# headers and pkg-config file are installed correctly
+# (C) 2012 Canonical Ltd.
+# Author: Martin Pitt <martin.pitt@ubuntu.com>
+
+set -e
+
+WORKDIR=$(mktemp -d)
+trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM
+cd $WORKDIR
+cat <<EOF > gtktest.c
+#include <glib.h>
+#include <gtk/gtk.h>
+
+static gboolean
+do_quit (gpointer user_data)
+{   
+    gtk_main_quit ();
+}
+
+int main(int argc, char **argv)
+{
+    GtkWidget *dialog;
+
+    gtk_init (&argc, &argv);
+    dialog = gtk_dialog_new_with_buttons ("Test dialog", NULL,
+                                          GTK_DIALOG_MODAL, 
+                                          GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, 
+                                          NULL);
+    gtk_widget_show_all (dialog);
+    g_timeout_add_seconds (1, do_quit, NULL);
+    gtk_main();
+    return 0;
+}
+EOF
+
+gcc -o gtktest gtktest.c `pkg-config --cflags --libs gtk+-3.0`
+echo "build: OK"
+[ -x gtktest ]
+xvfb-run ./gtktest
+echo "run: OK"
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000000..9bdfb6b73c
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,2 @@
+Tests: build python3-gi
+Depends: libgtk-3-dev, build-essential, xvfb, python3-gi, gir1.2-gtk-3.0
diff --git a/debian/tests/python3-gi b/debian/tests/python3-gi
new file mode 100755
index 0000000000..a503b25087
--- /dev/null
+++ b/debian/tests/python3-gi
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+xvfb-run python3 <<EOF
+from gi.repository import GLib, Gtk
+
+def do_quit(user_data):
+    Gtk.main_quit()
+
+dialog = Gtk.Dialog()
+dialog.set_title('Test dialog')
+dialog.add_button(Gtk.STOCK_OK, Gtk.ResponseType.ACCEPT)
+dialog.show_all()
+GLib.timeout_add_seconds(1, do_quit, None)
+Gtk.main()
+EOF
+

From c1ea16f78ba5adc38736410c737f2914d6808882 Mon Sep 17 00:00:00 2001
From: Sjoerd Simons <sjoerd@debian.org>
Date: Wed, 3 Oct 2012 07:07:31 +0000
Subject: [PATCH 02/38] * New upstream release (3.6.0) * debian/control.in:
 Bump gnome-themes-standard break due to theme related   changes

---
 debian/changelog          | 8 +++++---
 debian/control            | 2 +-
 debian/control.in         | 2 +-
 debian/libgtk-3-0.symbols | 2 --
 4 files changed, 7 insertions(+), 7 deletions(-)
 mode change 100644 => 100755 debian/changelog
 mode change 100644 => 100755 debian/control
 mode change 100644 => 100755 debian/control.in
 mode change 100644 => 100755 debian/libgtk-3-0.symbols

diff --git a/debian/changelog b/debian/changelog
old mode 100644
new mode 100755
index 98bebe6b03..5935fd525a
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-gtk+3.0 (3.5.18-1) UNRELEASED; urgency=low
+gtk+3.0 (3.6.0-1) experimental; urgency=low
 
-  * New upstream release
+  * New upstream release (3.6.0)
   * Sync with ubuntu:
     * debian/rules: Make test failures fatal again
     * debian/libgtk-3-0.symbols: Updated
@@ -16,8 +16,10 @@ gtk+3.0 (3.5.18-1) UNRELEASED; urgency=low
     * Removed, fixed upstream
   * debian/control.in: bump glib2.0 build-dep to >= 2.33.14 to trump the dodgy
     version in unstable
+  * debian/control.in: Bump gnome-themes-standard break due to theme related
+    changes
 
- -- Sjoerd Simons <sjoerd@debian.org>  Sun, 23 Sep 2012 21:46:55 +0200
+ -- Sjoerd Simons <sjoerd@debian.org>  Wed, 03 Oct 2012 09:07:16 +0200
 
 gtk+3.0 (3.4.2-4) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
old mode 100644
new mode 100755
index ecbf069be1..9743884e58
--- a/debian/control
+++ b/debian/control
@@ -60,7 +60,7 @@ Recommends: hicolor-icon-theme,
             libgtk-3-bin
 Suggests: librsvg2-common,
           gvfs
-Breaks: gnome-themes-standard (<< 3.3),
+Breaks: gnome-themes-standard (<< 3.6),
         murrine-themes (<= 0.98.2),
         libvte-2.90-9 (<< 1:0.32),
         libwebkitgtk-3.0-0 (<< 1.8.0)
diff --git a/debian/control.in b/debian/control.in
old mode 100644
new mode 100755
index f451738016..b5a306cab3
--- a/debian/control.in
+++ b/debian/control.in
@@ -60,7 +60,7 @@ Recommends: hicolor-icon-theme,
             @BIN_PKG@
 Suggests: librsvg2-common,
           gvfs
-Breaks: gnome-themes-standard (<< 3.3),
+Breaks: gnome-themes-standard (<< 3.6),
         murrine-themes (<= 0.98.2),
         libvte-2.90-9 (<< 1:0.32),
         libwebkitgtk-3.0-0 (<< 1.8.0)
diff --git a/debian/libgtk-3-0.symbols b/debian/libgtk-3-0.symbols
old mode 100644
new mode 100755
index e8b3976807..232e4dabf0
--- a/debian/libgtk-3-0.symbols
+++ b/debian/libgtk-3-0.symbols
@@ -2140,14 +2140,12 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_menu_bar_set_pack_direction@Base 3.0.0
  gtk_menu_button_get_align_widget@Base 3.5.6
  gtk_menu_button_get_direction@Base 3.5.6
- gtk_menu_button_get_menu@Base 3.5.6
  gtk_menu_button_get_menu_model@Base 3.5.6
  gtk_menu_button_get_popup@Base 3.5.12
  gtk_menu_button_get_type@Base 3.5.6
  gtk_menu_button_new@Base 3.5.6
  gtk_menu_button_set_align_widget@Base 3.5.6
  gtk_menu_button_set_direction@Base 3.5.6
- gtk_menu_button_set_menu@Base 3.5.6
  gtk_menu_button_set_menu_model@Base 3.5.6
  gtk_menu_button_set_popup@Base 3.5.12
  gtk_menu_detach@Base 3.0.0

From e8653a23500cd8390170044d30e75f9d87343d27 Mon Sep 17 00:00:00 2001
From: Sjoerd Simons <sjoerd@debian.org>
Date: Wed, 3 Oct 2012 16:43:55 +0000
Subject: [PATCH 03/38] debian/control.in: Add ${shlibs:Depends} Depends to
 libgtk-3-bin

---
 debian/changelog  | 6 ++++++
 debian/control    | 2 +-
 debian/control.in | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5935fd525a..99d128f85f 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gtk+3.0 (3.6.0-2) UNRELEASED; urgency=low
+
+  * debian/control.in: Add ${shlibs:Depends} Depends to libgtk-3-bin
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Wed, 03 Oct 2012 18:43:06 +0200
+
 gtk+3.0 (3.6.0-1) experimental; urgency=low
 
   * New upstream release (3.6.0)
diff --git a/debian/control b/debian/control
index 9743884e58..bd74137e50 100755
--- a/debian/control
+++ b/debian/control
@@ -112,7 +112,7 @@ Description: common files for the GTK+ graphical user interface library
 Package: libgtk-3-bin
 Section: misc
 Architecture: any
-Depends: ${misc:Depends},
+Depends: ${misc:Depends}, ${shlibs:Depends},
          libgtk-3-0 (>= ${source:Version}),
          libgtk-3-common (= ${source:Version})
 Multi-Arch: foreign
diff --git a/debian/control.in b/debian/control.in
index b5a306cab3..79581f83af 100755
--- a/debian/control.in
+++ b/debian/control.in
@@ -112,7 +112,7 @@ Description: common files for the GTK+ graphical user interface library
 Package: @BIN_PKG@
 Section: misc
 Architecture: any
-Depends: ${misc:Depends},
+Depends: ${misc:Depends}, ${shlibs:Depends},
          @SHARED_PKG@ (>= ${source:Version}),
          @COMMON_PKG@ (= ${source:Version})
 Multi-Arch: foreign

From 4f6a5014b1b77f4b870937f079abafee3baf692d Mon Sep 17 00:00:00 2001
From: Sjoerd Simons <sjoerd@debian.org>
Date: Wed, 3 Oct 2012 18:05:02 +0000
Subject: [PATCH 04/38] Target experimental

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 99d128f85f..6bc7720151 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-gtk+3.0 (3.6.0-2) UNRELEASED; urgency=low
+gtk+3.0 (3.6.0-2) experimental; urgency=low
 
   * debian/control.in: Add ${shlibs:Depends} Depends to libgtk-3-bin
 
- -- Sjoerd Simons <sjoerd@debian.org>  Wed, 03 Oct 2012 18:43:06 +0200
+ -- Sjoerd Simons <sjoerd@debian.org>  Wed, 03 Oct 2012 18:44:04 +0200
 
 gtk+3.0 (3.6.0-1) experimental; urgency=low
 

From ea0305b774f0ec08e91d185224b3e6df584b4348 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Mon, 22 Oct 2012 20:01:21 +0000
Subject: [PATCH 05/38] New upstream release 3.6.1

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6bc7720151..3d3a73b98b 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gtk+3.0 (3.6.1-1) UNRELEASED; urgency=low
+
+  * New upstream release 3.6.1
+
+ -- Simon McVittie <smcv@debian.org>  Mon, 22 Oct 2012 12:18:21 +0100
+
 gtk+3.0 (3.6.0-2) experimental; urgency=low
 
   * debian/control.in: Add ${shlibs:Depends} Depends to libgtk-3-bin

From d0bc1c75df1d4ccea6adff5c5a888884a646919a Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Mon, 22 Oct 2012 20:01:48 +0000
Subject: [PATCH 06/38] drop private symbols gtk_css_image_get_parser_type and
 gtk_style_properties_get_style from symbols file (made static upstream;
 verified not to be present in any header file)

---
 debian/changelog          | 3 +++
 debian/libgtk-3-0.symbols | 2 --
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3d3a73b98b..a733eab5f0 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 gtk+3.0 (3.6.1-1) UNRELEASED; urgency=low
 
   * New upstream release 3.6.1
+    - drop private symbols gtk_css_image_get_parser_type and
+      gtk_style_properties_get_style from symbols file (made static upstream;
+      verified not to be present in any header file)
 
  -- Simon McVittie <smcv@debian.org>  Mon, 22 Oct 2012 12:18:21 +0100
 
diff --git a/debian/libgtk-3-0.symbols b/debian/libgtk-3-0.symbols
index 232e4dabf0..bbb68e21b1 100755
--- a/debian/libgtk-3-0.symbols
+++ b/debian/libgtk-3-0.symbols
@@ -1307,7 +1307,6 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_container_set_resize_mode@Base 3.0.0
  gtk_container_unset_focus_chain@Base 3.0.0
  gtk_corner_type_get_type@Base 3.0.0
- gtk_css_image_get_parser_type@Base 3.3.16
  gtk_css_provider_error_get_type@Base 3.0.0
  gtk_css_provider_error_quark@Base 3.0.0
  gtk_css_provider_get_default@Base 3.0.0
@@ -3199,7 +3198,6 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_style_properties_clear@Base 3.0.0
  gtk_style_properties_get@Base 3.0.0
  gtk_style_properties_get_property@Base 3.0.0
- gtk_style_properties_get_style@Base 3.0.0
  gtk_style_properties_get_type@Base 3.0.0
  gtk_style_properties_get_valist@Base 3.0.0
  gtk_style_properties_lookup_color@Base 3.0.0

From 24b59868482d3c4e2bcdd31b6bee445a22573892 Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@debian.org>
Date: Mon, 22 Oct 2012 20:57:22 +0000
Subject: [PATCH 07/38] Team upload

---
 debian/changelog | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a733eab5f0..2806fb9314 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-gtk+3.0 (3.6.1-1) UNRELEASED; urgency=low
+gtk+3.0 (3.6.1-1) experimental; urgency=low
 
+  * Team upload
   * New upstream release 3.6.1
     - drop private symbols gtk_css_image_get_parser_type and
       gtk_style_properties_get_style from symbols file (made static upstream;
       verified not to be present in any header file)
 
- -- Simon McVittie <smcv@debian.org>  Mon, 22 Oct 2012 12:18:21 +0100
+ -- Simon McVittie <smcv@debian.org>  Mon, 22 Oct 2012 21:17:30 +0100
 
 gtk+3.0 (3.6.0-2) experimental; urgency=low
 

From e2e6fb300d2442a708442116cf52257800e4e6e0 Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Fri, 4 Jan 2013 22:11:03 +0000
Subject: [PATCH 08/38] New upstream release.

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2806fb9314..9d0269171b 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gtk+3.0 (3.6.3-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Michael Biebl <biebl@debian.org>  Fri, 04 Jan 2013 21:42:17 +0100
+
 gtk+3.0 (3.6.1-1) experimental; urgency=low
 
   * Team upload

From 9f3309b863f2b2f3289c21cc8cb173f0b6db926d Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Fri, 4 Jan 2013 22:11:21 +0000
Subject: [PATCH 09/38] Refresh patches.

---
 debian/changelog                                       |  1 +
 debian/patches/015_default-fallback-icon-theme.patch   |  8 ++++----
 debian/patches/016_no_offscreen_widgets_grabbing.patch |  8 ++++----
 debian/patches/017_no_offscreen_device_grabbing.patch  |  8 ++++----
 .../patches/071_fix-installation-of-HTML-images.patch  | 10 +++++-----
 5 files changed, 18 insertions(+), 17 deletions(-)
 mode change 100644 => 100755 debian/patches/015_default-fallback-icon-theme.patch
 mode change 100644 => 100755 debian/patches/016_no_offscreen_widgets_grabbing.patch
 mode change 100644 => 100755 debian/patches/017_no_offscreen_device_grabbing.patch
 mode change 100644 => 100755 debian/patches/071_fix-installation-of-HTML-images.patch

diff --git a/debian/changelog b/debian/changelog
index 9d0269171b..1a73cd4956 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 gtk+3.0 (3.6.3-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * Refresh patches.
 
  -- Michael Biebl <biebl@debian.org>  Fri, 04 Jan 2013 21:42:17 +0100
 
diff --git a/debian/patches/015_default-fallback-icon-theme.patch b/debian/patches/015_default-fallback-icon-theme.patch
old mode 100644
new mode 100755
index 5dced21a31..9c11e275fb
--- a/debian/patches/015_default-fallback-icon-theme.patch
+++ b/debian/patches/015_default-fallback-icon-theme.patch
@@ -1,8 +1,8 @@
-Index: gtk+-3.4.1/gtk/gtksettings.c
+Index: gtk+-3.6.3/gtk/gtksettings.c
 ===================================================================
---- gtk+-3.4.1.orig/gtk/gtksettings.c	2012-04-04 03:06:04.000000000 +0200
-+++ gtk+-3.4.1/gtk/gtksettings.c	2012-04-15 20:55:20.822307902 +0200
-@@ -429,7 +429,7 @@
+--- gtk+-3.6.3.orig/gtk/gtksettings.c	2013-01-04 21:43:23.372362757 +0100
++++ gtk+-3.6.3/gtk/gtksettings.c	2013-01-04 21:43:23.372362757 +0100
+@@ -450,7 +450,7 @@
                                               g_param_spec_string ("gtk-fallback-icon-theme",
                                                                    P_("Fallback Icon Theme Name"),
                                                                    P_("Name of a icon theme to fall back to"),
diff --git a/debian/patches/016_no_offscreen_widgets_grabbing.patch b/debian/patches/016_no_offscreen_widgets_grabbing.patch
old mode 100644
new mode 100755
index 9b799a0ff3..859ad0793e
--- a/debian/patches/016_no_offscreen_widgets_grabbing.patch
+++ b/debian/patches/016_no_offscreen_widgets_grabbing.patch
@@ -3,11 +3,11 @@ Author: Cody Russell <bratsche@gnome.org>
 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=607668
 Bug-Ubuntu: https://bugs.launchpad.net/bugs/512427
 
-Index: gtk+-3.5.18/gtk/gtkmain.c
+Index: gtk+-3.6.3/gtk/gtkmain.c
 ===================================================================
---- gtk+-3.5.18.orig/gtk/gtkmain.c	2012-09-19 03:34:42.000000000 +1200
-+++ gtk+-3.5.18/gtk/gtkmain.c	2012-09-19 12:16:53.696728253 +1200
-@@ -2046,9 +2046,14 @@
+--- gtk+-3.6.3.orig/gtk/gtkmain.c	2013-01-04 21:43:29.888428374 +0100
++++ gtk+-3.6.3/gtk/gtkmain.c	2013-01-04 21:43:29.884428334 +0100
+@@ -2043,9 +2043,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
old mode 100644
new mode 100755
index 4ea78fd521..fab1433aac
--- a/debian/patches/017_no_offscreen_device_grabbing.patch
+++ b/debian/patches/017_no_offscreen_device_grabbing.patch
@@ -3,11 +3,11 @@ Author: Robert Carr <racarr@canonical.com>
 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=658563
 Bug-Ubuntu: https://launchpad.net/bugs/804009
 
-Index: gtk+-3.5.18/gtk/gtkmain.c
+Index: gtk+-3.6.3/gtk/gtkmain.c
 ===================================================================
---- gtk+-3.5.18.orig/gtk/gtkmain.c	2012-09-19 12:16:53.696728253 +1200
-+++ gtk+-3.5.18/gtk/gtkmain.c	2012-09-19 12:16:57.224728130 +1200
-@@ -2139,9 +2139,14 @@
+--- gtk+-3.6.3.orig/gtk/gtkmain.c	2013-01-04 21:43:32.392453591 +0100
++++ gtk+-3.6.3/gtk/gtkmain.c	2013-01-04 21:43:32.388453550 +0100
+@@ -2136,9 +2136,14 @@
  {
    GtkWindowGroup *group;
    GtkWidget *old_grab_widget;
diff --git a/debian/patches/071_fix-installation-of-HTML-images.patch b/debian/patches/071_fix-installation-of-HTML-images.patch
old mode 100644
new mode 100755
index 8aa65c1285..d2ca6b3e6e
--- a/debian/patches/071_fix-installation-of-HTML-images.patch
+++ b/debian/patches/071_fix-installation-of-HTML-images.patch
@@ -11,11 +11,11 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=656803
  gtk-doc.make |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-Index: gtk+-3.4.1/gtk-doc.make
+Index: gtk+-3.6.3/gtk-doc.make
 ===================================================================
---- gtk+-3.4.1.orig/gtk-doc.make	2012-04-10 00:52:46.000000000 +0200
-+++ gtk+-3.4.1/gtk-doc.make	2012-04-17 19:22:04.294590580 +0200
-@@ -155,8 +155,8 @@
+--- gtk+-3.6.3.orig/gtk-doc.make	2013-01-04 21:43:41.152541801 +0100
++++ gtk+-3.6.3/gtk-doc.make	2013-01-04 21:43:41.148541763 +0100
+@@ -173,8 +173,8 @@
  	  if test -f $(abs_srcdir)/$$file ; then \
  	    cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
  	  fi; \
@@ -25,4 +25,4 @@ Index: gtk+-3.4.1/gtk-doc.make
 +	    cp $$file $(abs_builddir)/html; \
  	  fi; \
  	done;
- 	@echo '  DOC   Fixing cross-references'
+ 	$(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)

From f96a5b56e66a4a61b337a967b2ab7df999911ecd Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Fri, 4 Jan 2013 22:13:01 +0000
Subject: [PATCH 10/38] debian/libgtk-3-bin.install: Install gtk-launch man
 page.

---
 debian/changelog            | 1 +
 debian/libgtk-3-bin.install | 1 +
 2 files changed, 2 insertions(+)
 mode change 100644 => 100755 debian/libgtk-3-bin.install

diff --git a/debian/changelog b/debian/changelog
index 1a73cd4956..88534342a2 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ gtk+3.0 (3.6.3-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Refresh patches.
+  * debian/libgtk-3-bin.install: Install gtk-launch man page.
 
  -- Michael Biebl <biebl@debian.org>  Fri, 04 Jan 2013 21:42:17 +0100
 
diff --git a/debian/libgtk-3-bin.install b/debian/libgtk-3-bin.install
old mode 100644
new mode 100755
index 7fae7a65b6..dc05977e41
--- a/debian/libgtk-3-bin.install
+++ b/debian/libgtk-3-bin.install
@@ -1,3 +1,4 @@
 usr/share/man/man1/gtk-update-icon-cache.1
 usr/share/man/man1/gtk-query-immodules-3.0.1
+usr/share/man/man1/gtk-launch.1
 usr/bin/gtk-launch

From b08323a6e5b5aee272ad367e4ecfd25b8a48a1f7 Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Fri, 4 Jan 2013 22:23:40 +0000
Subject: [PATCH 11/38] debian/libgtk-3-dev.install: Install gtkbuilder.rng
 RELAX NG schema file which can be used to validate GtkBuilder ui files.

---
 debian/changelog            | 2 ++
 debian/libgtk-3-dev.install | 1 +
 2 files changed, 3 insertions(+)
 mode change 100644 => 100755 debian/libgtk-3-dev.install

diff --git a/debian/changelog b/debian/changelog
index 88534342a2..08156ecfc1 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ gtk+3.0 (3.6.3-1) UNRELEASED; urgency=low
   * New upstream release.
   * Refresh patches.
   * debian/libgtk-3-bin.install: Install gtk-launch man page.
+  * debian/libgtk-3-dev.install: Install gtkbuilder.rng RELAX NG schema file
+    which can be used to validate GtkBuilder ui files.
 
  -- Michael Biebl <biebl@debian.org>  Fri, 04 Jan 2013 21:42:17 +0100
 
diff --git a/debian/libgtk-3-dev.install b/debian/libgtk-3-dev.install
old mode 100644
new mode 100755
index 4a72da84e4..5ad2f30a00
--- a/debian/libgtk-3-dev.install
+++ b/debian/libgtk-3-dev.install
@@ -3,3 +3,4 @@ usr/lib/*/libg?k*.so
 usr/lib/*/pkgconfig/g?k*
 usr/share/aclocal
 usr/share/gir-1.0
+usr/share/gtk-3.0/gtkbuilder.rng

From d5d6809c00287f0f48a3ffe281e675db44c083ff Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Fri, 4 Jan 2013 22:24:08 +0000
Subject: [PATCH 12/38] Release version 3.6.3-1 to experimental

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 08156ecfc1..828b18bbde 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-gtk+3.0 (3.6.3-1) UNRELEASED; urgency=low
+gtk+3.0 (3.6.3-1) experimental; urgency=low
 
   * New upstream release.
   * Refresh patches.
@@ -6,7 +6,7 @@ gtk+3.0 (3.6.3-1) UNRELEASED; urgency=low
   * debian/libgtk-3-dev.install: Install gtkbuilder.rng RELAX NG schema file
     which can be used to validate GtkBuilder ui files.
 
- -- Michael Biebl <biebl@debian.org>  Fri, 04 Jan 2013 21:42:17 +0100
+ -- Michael Biebl <biebl@debian.org>  Fri, 04 Jan 2013 23:23:45 +0100
 
 gtk+3.0 (3.6.1-1) experimental; urgency=low
 

From 89311c5a6dca6a1a8e1debfe585b69cda281a5ae Mon Sep 17 00:00:00 2001
From: Sjoerd Simons <sjoerd@debian.org>
Date: Tue, 8 Jan 2013 12:57:06 +0000
Subject: [PATCH 13/38] New upstream release

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 828b18bbde..7c9ccce9c2 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gtk+3.0 (3.6.4-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Tue, 08 Jan 2013 13:54:26 +0100
+
 gtk+3.0 (3.6.3-1) experimental; urgency=low
 
   * New upstream release.

From 974078291d5bff745c76b6504512bbe6497a9059 Mon Sep 17 00:00:00 2001
From: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Fri, 22 Feb 2013 17:45:51 +0000
Subject: [PATCH 14/38] New upstream release.

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)
 mode change 100755 => 100644 debian/changelog

diff --git a/debian/changelog b/debian/changelog
old mode 100755
new mode 100644
index 7c9ccce9c2..2f70892649
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gtk+3.0 (3.7.10-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org>  Fri, 22 Feb 2013 18:43:04 +0100
+
 gtk+3.0 (3.6.4-1) experimental; urgency=low
 
   * New upstream release

From 4858e2da59ab9c6bda5133a071ea75d3867b82ad Mon Sep 17 00:00:00 2001
From: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Fri, 22 Feb 2013 17:46:49 +0000
Subject: [PATCH 15/38]   + debian/control.in:     - Update build dependencies.

---
 debian/changelog  |  2 ++
 debian/control    | 18 +++++++++---------
 debian/control.in | 16 ++++++++--------
 3 files changed, 19 insertions(+), 17 deletions(-)
 mode change 100755 => 100644 debian/control
 mode change 100755 => 100644 debian/control.in

diff --git a/debian/changelog b/debian/changelog
index 2f70892649..358949dabf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 gtk+3.0 (3.7.10-1) UNRELEASED; urgency=low
 
   * New upstream release.
+    + debian/control.in:
+      - Update build dependencies.
 
  -- Emilio Pozuelo Monfort <pochu@debian.org>  Fri, 22 Feb 2013 18:43:04 +0100
 
diff --git a/debian/control b/debian/control
old mode 100755
new mode 100644
index bd74137e50..91dd234fb3
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: gtk+3.0
 Section: libs
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers@lists.alioth.debian.org>
-Uploaders: Michael Biebl <biebl@debian.org>, Sjoerd Simons <sjoerd@debian.org>
+Uploaders: Emilio Pozuelo Monfort <pochu@debian.org>, Michael Biebl <biebl@debian.org>, Sjoerd Simons <sjoerd@debian.org>
 Build-Depends: debhelper (>= 8.1.3),
                cdbs (>= 0.4.93),
                gnome-pkg-tools (>= 0.11),
@@ -12,10 +12,10 @@ Build-Depends: debhelper (>= 8.1.3),
                gettext,
                pkg-config,
                autotools-dev,
-               libglib2.0-dev (>= 2.33.14),
-               libgdk-pixbuf2.0-dev (>= 2.26.0),
-               libpango1.0-dev (>= 1.30.0),
-               libatk1.0-dev (>= 2.5.3),
+               libglib2.0-dev (>= 2.35.3),
+               libgdk-pixbuf2.0-dev (>= 2.27.1),
+               libpango1.0-dev (>= 1.32.4),
+               libatk1.0-dev (>= 2.7.5),
                libatk-bridge2.0-dev,
                libx11-dev (>= 2:1.3.3-2),
                libxext-dev (>= 2:1.1.1-3),
@@ -133,10 +133,10 @@ Depends: libgtk-3-0 (= ${binary:Version}),
          libgtk-3-common,
          ${misc:Depends},
          ${shlibs:Depends},
-         libglib2.0-dev (>= 2.33.14),
-         libgdk-pixbuf2.0-dev (>= 2.26.0),
-         libpango1.0-dev (>= 1.30.0),
-         libatk1.0-dev (>= 2.2.0),
+         libglib2.0-dev (>= 2.35.3),
+         libgdk-pixbuf2.0-dev (>= 2.27.1),
+         libpango1.0-dev (>= 1.32.4),
+         libatk1.0-dev (>= 2.7.5),
          libatk-bridge2.0-dev,
          libcairo2-dev (>= 1.10.0),
          libx11-dev,
diff --git a/debian/control.in b/debian/control.in
old mode 100755
new mode 100644
index 79581f83af..def7de5b4e
--- a/debian/control.in
+++ b/debian/control.in
@@ -12,10 +12,10 @@ Build-Depends: debhelper (>= 8.1.3),
                gettext,
                pkg-config,
                autotools-dev,
-               libglib2.0-dev (>= 2.33.14),
-               libgdk-pixbuf2.0-dev (>= 2.26.0),
-               libpango1.0-dev (>= 1.30.0),
-               libatk1.0-dev (>= 2.5.3),
+               libglib2.0-dev (>= 2.35.3),
+               libgdk-pixbuf2.0-dev (>= 2.27.1),
+               libpango1.0-dev (>= 1.32.4),
+               libatk1.0-dev (>= 2.7.5),
                libatk-bridge2.0-dev,
                libx11-dev (>= 2:1.3.3-2),
                libxext-dev (>= 2:1.1.1-3),
@@ -133,10 +133,10 @@ Depends: @SHARED_PKG@ (= ${binary:Version}),
          @COMMON_PKG@,
          ${misc:Depends},
          ${shlibs:Depends},
-         libglib2.0-dev (>= 2.33.14),
-         libgdk-pixbuf2.0-dev (>= 2.26.0),
-         libpango1.0-dev (>= 1.30.0),
-         libatk1.0-dev (>= 2.2.0),
+         libglib2.0-dev (>= 2.35.3),
+         libgdk-pixbuf2.0-dev (>= 2.27.1),
+         libpango1.0-dev (>= 1.32.4),
+         libatk1.0-dev (>= 2.7.5),
          libatk-bridge2.0-dev,
          libcairo2-dev (>= 1.10.0),
          libx11-dev,

From 59e23168cb604a639da2e8972752a1f5fbb66cbc Mon Sep 17 00:00:00 2001
From: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Sat, 23 Feb 2013 12:08:14 +0000
Subject: [PATCH 16/38]   + debian/patches:     - Refreshed.

---
 debian/changelog                                     |  2 ++
 debian/patches/015_default-fallback-icon-theme.patch |  8 +++-----
 .../patches/016_no_offscreen_widgets_grabbing.patch  |  8 +++-----
 .../patches/017_no_offscreen_device_grabbing.patch   |  8 +++-----
 debian/patches/018_gdkenumtypes.c_location.patch     | 12 +++++-------
 .../071_fix-installation-of-HTML-images.patch        | 10 ++++------
 6 files changed, 20 insertions(+), 28 deletions(-)
 mode change 100755 => 100644 debian/patches/015_default-fallback-icon-theme.patch
 mode change 100755 => 100644 debian/patches/016_no_offscreen_widgets_grabbing.patch
 mode change 100755 => 100644 debian/patches/017_no_offscreen_device_grabbing.patch
 mode change 100755 => 100644 debian/patches/071_fix-installation-of-HTML-images.patch

diff --git a/debian/changelog b/debian/changelog
index 358949dabf..558b6da8ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ gtk+3.0 (3.7.10-1) UNRELEASED; urgency=low
   * New upstream release.
     + debian/control.in:
       - Update build dependencies.
+    + debian/patches:
+      - Refreshed.
 
  -- Emilio Pozuelo Monfort <pochu@debian.org>  Fri, 22 Feb 2013 18:43:04 +0100
 
diff --git a/debian/patches/015_default-fallback-icon-theme.patch b/debian/patches/015_default-fallback-icon-theme.patch
old mode 100755
new mode 100644
index 9c11e275fb..df32f95836
--- a/debian/patches/015_default-fallback-icon-theme.patch
+++ b/debian/patches/015_default-fallback-icon-theme.patch
@@ -1,8 +1,6 @@
-Index: gtk+-3.6.3/gtk/gtksettings.c
-===================================================================
---- gtk+-3.6.3.orig/gtk/gtksettings.c	2013-01-04 21:43:23.372362757 +0100
-+++ gtk+-3.6.3/gtk/gtksettings.c	2013-01-04 21:43:23.372362757 +0100
-@@ -450,7 +450,7 @@
+--- a/gtk/gtksettings.c
++++ b/gtk/gtksettings.c
+@@ -445,7 +445,7 @@
                                               g_param_spec_string ("gtk-fallback-icon-theme",
                                                                    P_("Fallback Icon Theme Name"),
                                                                    P_("Name of a icon theme to fall back to"),
diff --git a/debian/patches/016_no_offscreen_widgets_grabbing.patch b/debian/patches/016_no_offscreen_widgets_grabbing.patch
old mode 100755
new mode 100644
index 859ad0793e..d7e772978e
--- a/debian/patches/016_no_offscreen_widgets_grabbing.patch
+++ b/debian/patches/016_no_offscreen_widgets_grabbing.patch
@@ -3,11 +3,9 @@ Author: Cody Russell <bratsche@gnome.org>
 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=607668
 Bug-Ubuntu: https://bugs.launchpad.net/bugs/512427
 
-Index: gtk+-3.6.3/gtk/gtkmain.c
-===================================================================
---- gtk+-3.6.3.orig/gtk/gtkmain.c	2013-01-04 21:43:29.888428374 +0100
-+++ gtk+-3.6.3/gtk/gtkmain.c	2013-01-04 21:43:29.884428334 +0100
-@@ -2043,9 +2043,14 @@
+--- a/gtk/gtkmain.c
++++ b/gtk/gtkmain.c
+@@ -2039,9 +2039,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
old mode 100755
new mode 100644
index fab1433aac..d53976c9d7
--- a/debian/patches/017_no_offscreen_device_grabbing.patch
+++ b/debian/patches/017_no_offscreen_device_grabbing.patch
@@ -3,11 +3,9 @@ Author: Robert Carr <racarr@canonical.com>
 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=658563
 Bug-Ubuntu: https://launchpad.net/bugs/804009
 
-Index: gtk+-3.6.3/gtk/gtkmain.c
-===================================================================
---- gtk+-3.6.3.orig/gtk/gtkmain.c	2013-01-04 21:43:32.392453591 +0100
-+++ gtk+-3.6.3/gtk/gtkmain.c	2013-01-04 21:43:32.388453550 +0100
-@@ -2136,9 +2136,14 @@
+--- a/gtk/gtkmain.c
++++ b/gtk/gtkmain.c
+@@ -2132,9 +2132,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 a028161acf..8e89ba84b1 100644
--- a/debian/patches/018_gdkenumtypes.c_location.patch
+++ b/debian/patches/018_gdkenumtypes.c_location.patch
@@ -18,11 +18,9 @@ Bug-Ubuntu: https://launchpad.net/bugs/769256
  gdk/Makefile.am |   17 +++++++----------
  1 files changed, 7 insertions(+), 10 deletions(-)
 
-Index: gtk+-3.5.4/gdk/Makefile.am
-===================================================================
---- gtk+-3.5.4.orig/gdk/Makefile.am	2012-06-05 16:59:15.892579046 +1200
-+++ gtk+-3.5.4/gdk/Makefile.am	2012-06-05 16:59:22.904578803 +1200
-@@ -189,8 +189,8 @@
+--- a/gdk/Makefile.am
++++ b/gdk/Makefile.am
+@@ -196,8 +196,8 @@
  introspection_files = 		\
  	$(filter-out gdkkeysyms-compat.h, $(gdk_public_h_sources))	\
  	$(gdk_c_sources)	\
@@ -33,7 +31,7 @@ Index: gtk+-3.5.4/gdk/Makefile.am
  
  Gdk-3.0.gir: libgdk-3.la Makefile
  Gdk_3_0_gir_SCANNERFLAGS = 	\
-@@ -305,7 +305,7 @@
+@@ -311,7 +311,7 @@
  
  lib_LTLIBRARIES = libgdk-3.la
  
@@ -42,7 +40,7 @@ Index: gtk+-3.5.4/gdk/Makefile.am
  EXTRA_DIST += \
  	$(gdk_built_sources)	\
  	fallback-c89.c
-@@ -319,18 +319,15 @@
+@@ -325,18 +325,15 @@
  	$(gdk_built_sources)			\
  	gdkconfig.h
  
diff --git a/debian/patches/071_fix-installation-of-HTML-images.patch b/debian/patches/071_fix-installation-of-HTML-images.patch
old mode 100755
new mode 100644
index d2ca6b3e6e..29a6ed81b0
--- a/debian/patches/071_fix-installation-of-HTML-images.patch
+++ b/debian/patches/071_fix-installation-of-HTML-images.patch
@@ -11,11 +11,9 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=656803
  gtk-doc.make |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-Index: gtk+-3.6.3/gtk-doc.make
-===================================================================
---- gtk+-3.6.3.orig/gtk-doc.make	2013-01-04 21:43:41.152541801 +0100
-+++ gtk+-3.6.3/gtk-doc.make	2013-01-04 21:43:41.148541763 +0100
-@@ -173,8 +173,8 @@
+--- a/gtk-doc.make
++++ b/gtk-doc.make
+@@ -155,8 +155,8 @@
  	  if test -f $(abs_srcdir)/$$file ; then \
  	    cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
  	  fi; \
@@ -25,4 +23,4 @@ Index: gtk+-3.6.3/gtk-doc.make
 +	    cp $$file $(abs_builddir)/html; \
  	  fi; \
  	done;
- 	$(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+ 	@echo '  DOC   Fixing cross-references'

From f93e26b4adf40a58490f8323d5f2f130f2dbe844 Mon Sep 17 00:00:00 2001
From: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Sat, 23 Feb 2013 15:38:43 +0000
Subject: [PATCH 17/38]   + debian/libgtk-3-0.symbols:     - Updated for the
 new symbols.

---
 debian/changelog          |   2 +
 debian/libgtk-3-0.symbols | 109 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 111 insertions(+)
 mode change 100755 => 100644 debian/libgtk-3-0.symbols

diff --git a/debian/changelog b/debian/changelog
index 558b6da8ac..2e26529842 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ gtk+3.0 (3.7.10-1) UNRELEASED; urgency=low
       - Update build dependencies.
     + debian/patches:
       - Refreshed.
+    + debian/libgtk-3-0.symbols:
+      - Updated for the new symbols.
 
  -- Emilio Pozuelo Monfort <pochu@debian.org>  Fri, 22 Feb 2013 18:43:04 +0100
 
diff --git a/debian/libgtk-3-0.symbols b/debian/libgtk-3-0.symbols
old mode 100755
new mode 100644
index bbb68e21b1..7c934e6743
--- a/debian/libgtk-3-0.symbols
+++ b/debian/libgtk-3-0.symbols
@@ -187,6 +187,28 @@ libgdk-3.so.0 libgtk-3-0 #MINVER#
  gdk_events_pending@Base 3.0.0
  gdk_filter_return_get_type@Base 3.0.0
  gdk_flush@Base 3.0.0
+ gdk_frame_clock_begin_updating@Base 3.7.10
+ gdk_frame_clock_end_updating@Base 3.7.10
+ gdk_frame_clock_get_current_timings@Base 3.7.10
+ gdk_frame_clock_get_frame_counter@Base 3.7.10
+ gdk_frame_clock_get_frame_time@Base 3.7.10
+ gdk_frame_clock_get_history_start@Base 3.7.10
+ gdk_frame_clock_get_refresh_info@Base 3.7.10
+ gdk_frame_clock_get_timings@Base 3.7.10
+ gdk_frame_clock_get_type@Base 3.7.10
+ gdk_frame_clock_idle_get_type@Base 3.7.10
+ gdk_frame_clock_phase_get_type@Base 3.7.10
+ gdk_frame_clock_request_phase@Base 3.7.10
+ gdk_frame_timings_get_complete@Base 3.7.10
+ gdk_frame_timings_get_frame_counter@Base 3.7.10
+ gdk_frame_timings_get_frame_time@Base 3.7.10
+ gdk_frame_timings_get_predicted_presentation_time@Base 3.7.10
+ gdk_frame_timings_get_presentation_time@Base 3.7.10
+ gdk_frame_timings_get_refresh_interval@Base 3.7.10
+ gdk_frame_timings_get_type@Base 3.7.10
+ gdk_frame_timings_ref@Base 3.7.10
+ gdk_frame_timings_unref@Base 3.7.10
+ gdk_fullscreen_mode_get_type@Base 3.7.10
  gdk_get_default_root_window@Base 3.0.0
  gdk_get_display@Base 3.0.0
  gdk_get_display_arg_name@Base 3.0.0
@@ -393,7 +415,9 @@ libgdk-3.so.0 libgtk-3-0 #MINVER#
  gdk_window_get_effective_toplevel@Base 3.0.0
  gdk_window_get_events@Base 3.0.0
  gdk_window_get_focus_on_map@Base 3.0.0
+ gdk_window_get_frame_clock@Base 3.7.10
  gdk_window_get_frame_extents@Base 3.0.0
+ gdk_window_get_fullscreen_mode@Base 3.7.10
  gdk_window_get_geometry@Base 3.0.0
  gdk_window_get_group@Base 3.0.0
  gdk_window_get_height@Base 3.0.0
@@ -464,6 +488,7 @@ libgdk-3.so.0 libgtk-3-0 #MINVER#
  gdk_window_set_device_events@Base 3.0.0
  gdk_window_set_events@Base 3.0.0
  gdk_window_set_focus_on_map@Base 3.0.0
+ gdk_window_set_fullscreen_mode@Base 3.7.10
  gdk_window_set_functions@Base 3.0.0
  gdk_window_set_geometry_hints@Base 3.0.0
  gdk_window_set_group@Base 3.0.0
@@ -819,6 +844,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_application_window_get_type@Base 3.3.16
  gtk_application_window_new@Base 3.3.16
  gtk_application_window_set_show_menubar@Base 3.3.16
+ gtk_arrow_accessible_get_type@Base 3.7.10
  gtk_arrow_get_type@Base 3.0.0
  gtk_arrow_new@Base 3.0.0
  gtk_arrow_placement_get_type@Base 3.0.0
@@ -870,6 +896,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_binding_set_new@Base 3.0.0
  gtk_bindings_activate@Base 3.0.0
  gtk_bindings_activate_event@Base 3.0.0
+ gtk_boolean_cell_accessible_get_type@Base 3.7.10
  gtk_border_copy@Base 3.0.0
  gtk_border_free@Base 3.0.0
  gtk_border_get_type@Base 3.0.0
@@ -907,6 +934,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_builder_connect_signals_full@Base 3.0.0
  gtk_builder_error_get_type@Base 3.0.0
  gtk_builder_error_quark@Base 3.0.0
+ gtk_builder_expose_object@Base 3.7.10
  gtk_builder_get_object@Base 3.0.0
  gtk_builder_get_objects@Base 3.0.0
  gtk_builder_get_translation_domain@Base 3.0.0
@@ -916,6 +944,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_builder_set_translation_domain@Base 3.0.0
  gtk_builder_value_from_string@Base 3.0.0
  gtk_builder_value_from_string_type@Base 3.0.0
+ gtk_button_accessible_get_type@Base 3.7.10
  gtk_button_box_get_child_non_homogeneous@Base 3.1.4
  gtk_button_box_get_child_secondary@Base 3.0.0
  gtk_button_box_get_layout@Base 3.0.0
@@ -974,6 +1003,16 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_calendar_set_detail_width_chars@Base 3.0.0
  gtk_calendar_set_display_options@Base 3.0.0
  gtk_calendar_unmark_day@Base 3.0.0
+ gtk_cell_accessible_get_type@Base 3.7.10
+ gtk_cell_accessible_parent_activate@Base 3.7.10
+ gtk_cell_accessible_parent_edit@Base 3.7.10
+ gtk_cell_accessible_parent_expand_collapse@Base 3.7.10
+ gtk_cell_accessible_parent_get_cell_area@Base 3.7.10
+ gtk_cell_accessible_parent_get_cell_extents@Base 3.7.10
+ gtk_cell_accessible_parent_get_child_index@Base 3.7.10
+ gtk_cell_accessible_parent_get_renderer_state@Base 3.7.10
+ gtk_cell_accessible_parent_get_type@Base 3.7.10
+ gtk_cell_accessible_parent_grab_focus@Base 3.7.10
  gtk_cell_area_activate@Base 3.0.0
  gtk_cell_area_activate_cell@Base 3.0.0
  gtk_cell_area_add@Base 3.0.0
@@ -1125,6 +1164,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_check_button_new@Base 3.0.0
  gtk_check_button_new_with_label@Base 3.0.0
  gtk_check_button_new_with_mnemonic@Base 3.0.0
+ gtk_check_menu_item_accessible_get_type@Base 3.7.10
  gtk_check_menu_item_get_active@Base 3.0.0
  gtk_check_menu_item_get_draw_as_radio@Base 3.0.0
  gtk_check_menu_item_get_inconsistent@Base 3.0.0
@@ -1215,6 +1255,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_color_selection_set_previous_alpha@Base 3.0.0
  gtk_color_selection_set_previous_color@Base 3.0.0
  gtk_color_selection_set_previous_rgba@Base 3.0.0
+ gtk_combo_box_accessible_get_type@Base 3.7.10
  gtk_combo_box_get_active@Base 3.0.0
  gtk_combo_box_get_active_id@Base 3.0.0
  gtk_combo_box_get_active_iter@Base 3.0.0
@@ -1269,8 +1310,14 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_combo_box_text_prepend_text@Base 3.0.0
  gtk_combo_box_text_remove@Base 3.0.0
  gtk_combo_box_text_remove_all@Base 3.0.0
+ gtk_container_accessible_get_type@Base 3.7.10
  gtk_container_add@Base 3.0.0
  gtk_container_add_with_properties@Base 3.0.0
+ gtk_container_cell_accessible_add_child@Base 3.7.10
+ gtk_container_cell_accessible_get_children@Base 3.7.10
+ gtk_container_cell_accessible_get_type@Base 3.7.10
+ gtk_container_cell_accessible_new@Base 3.7.10
+ gtk_container_cell_accessible_remove_child@Base 3.7.10
  gtk_container_check_resize@Base 3.0.0
  gtk_container_child_get@Base 3.0.0
  gtk_container_child_get_property@Base 3.0.0
@@ -1408,6 +1455,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_editable_select_region@Base 3.0.0
  gtk_editable_set_editable@Base 3.0.0
  gtk_editable_set_position@Base 3.0.0
+ gtk_entry_accessible_get_type@Base 3.7.10
  gtk_entry_buffer_delete_text@Base 3.0.0
  gtk_entry_buffer_emit_deleted_text@Base 3.0.0
  gtk_entry_buffer_emit_inserted_text@Base 3.0.0
@@ -1484,6 +1532,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_entry_get_type@Base 3.0.0
  gtk_entry_get_visibility@Base 3.0.0
  gtk_entry_get_width_chars@Base 3.0.0
+ gtk_entry_icon_accessible_get_type@Base 3.7.10
  gtk_entry_icon_position_get_type@Base 3.0.0
  gtk_entry_im_context_filter_keypress@Base 3.0.0
  gtk_entry_layout_index_to_text_index@Base 3.0.0
@@ -1529,6 +1578,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_event_box_set_above_child@Base 3.0.0
  gtk_event_box_set_visible_window@Base 3.0.0
  gtk_events_pending@Base 3.0.0
+ gtk_expander_accessible_get_type@Base 3.7.10
  gtk_expander_get_expanded@Base 3.0.0
  gtk_expander_get_label@Base 3.0.0
  gtk_expander_get_label_fill@Base 3.0.0
@@ -1696,6 +1746,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_font_selection_new@Base 3.0.0
  gtk_font_selection_set_font_name@Base 3.0.0
  gtk_font_selection_set_preview_text@Base 3.0.0
+ gtk_frame_accessible_get_type@Base 3.7.10
  gtk_frame_get_label@Base 3.0.0
  gtk_frame_get_label_align@Base 3.0.0
  gtk_frame_get_label_widget@Base 3.0.0
@@ -1794,8 +1845,14 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_icon_info_get_filename@Base 3.0.0
  gtk_icon_info_get_type@Base 3.0.0
  gtk_icon_info_load_icon@Base 3.0.0
+ gtk_icon_info_load_icon_async@Base 3.7.10
+ gtk_icon_info_load_icon_finish@Base 3.7.10
  gtk_icon_info_load_symbolic@Base 3.0.0
+ gtk_icon_info_load_symbolic_async@Base 3.7.10
+ gtk_icon_info_load_symbolic_finish@Base 3.7.10
  gtk_icon_info_load_symbolic_for_context@Base 3.0.0
+ gtk_icon_info_load_symbolic_for_context_async@Base 3.7.10
+ gtk_icon_info_load_symbolic_for_context_finish@Base 3.7.10
  gtk_icon_info_load_symbolic_for_style@Base 3.0.0
  gtk_icon_info_new_for_pixbuf@Base 3.0.0
  gtk_icon_info_set_raw_coordinates@Base 3.0.0
@@ -1862,11 +1919,13 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_icon_theme_set_custom_theme@Base 3.0.0
  gtk_icon_theme_set_screen@Base 3.0.0
  gtk_icon_theme_set_search_path@Base 3.0.0
+ gtk_icon_view_accessible_get_type@Base 3.7.10
  gtk_icon_view_convert_widget_to_bin_window_coords@Base 3.0.0
  gtk_icon_view_create_drag_icon@Base 3.0.0
  gtk_icon_view_drop_position_get_type@Base 3.0.0
  gtk_icon_view_enable_model_drag_dest@Base 3.0.0
  gtk_icon_view_enable_model_drag_source@Base 3.0.0
+ gtk_icon_view_get_activate_on_single_click@Base 3.7.10
  gtk_icon_view_get_cell_rect@Base 3.5.6
  gtk_icon_view_get_column_spacing@Base 3.0.0
  gtk_icon_view_get_columns@Base 3.0.0
@@ -1903,6 +1962,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_icon_view_select_all@Base 3.0.0
  gtk_icon_view_select_path@Base 3.0.0
  gtk_icon_view_selected_foreach@Base 3.0.0
+ gtk_icon_view_set_activate_on_single_click@Base 3.7.10
  gtk_icon_view_set_column_spacing@Base 3.0.0
  gtk_icon_view_set_columns@Base 3.0.0
  gtk_icon_view_set_cursor@Base 3.0.0
@@ -1949,6 +2009,8 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_im_multicontext_set_context_id@Base 3.0.0
  gtk_im_preedit_style_get_type@Base 3.0.0
  gtk_im_status_style_get_type@Base 3.0.0
+ gtk_image_accessible_get_type@Base 3.7.10
+ gtk_image_cell_accessible_get_type@Base 3.7.10
  gtk_image_clear@Base 3.0.0
  gtk_image_get_animation@Base 3.0.0
  gtk_image_get_gicon@Base 3.0.0
@@ -2017,6 +2079,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_justification_get_type@Base 3.0.0
  gtk_key_snooper_install@Base 3.0.0
  gtk_key_snooper_remove@Base 3.0.0
+ gtk_label_accessible_get_type@Base 3.7.10
  gtk_label_get_angle@Base 3.0.0
  gtk_label_get_attributes@Base 3.0.0
  gtk_label_get_current_uri@Base 3.0.0
@@ -2073,7 +2136,9 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_layout_set_hadjustment@Base 3.0.0
  gtk_layout_set_size@Base 3.0.0
  gtk_layout_set_vadjustment@Base 3.0.0
+ gtk_level_bar_accessible_get_type@Base 3.7.10
  gtk_level_bar_add_offset_value@Base 3.5.8
+ gtk_level_bar_get_inverted@Base 3.7.10
  gtk_level_bar_get_max_value@Base 3.5.8
  gtk_level_bar_get_min_value@Base 3.5.8
  gtk_level_bar_get_mode@Base 3.5.8
@@ -2084,11 +2149,13 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_level_bar_new@Base 3.5.8
  gtk_level_bar_new_for_interval@Base 3.5.8
  gtk_level_bar_remove_offset_value@Base 3.5.8
+ gtk_level_bar_set_inverted@Base 3.7.10
  gtk_level_bar_set_max_value@Base 3.5.8
  gtk_level_bar_set_min_value@Base 3.5.8
  gtk_level_bar_set_mode@Base 3.5.8
  gtk_level_bar_set_value@Base 3.5.8
  gtk_license_get_type@Base 3.0.0
+ gtk_link_button_accessible_get_type@Base 3.7.10
  gtk_link_button_get_type@Base 3.0.0
  gtk_link_button_get_uri@Base 3.0.0
  gtk_link_button_get_visited@Base 3.0.0
@@ -2118,6 +2185,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_list_store_set_value@Base 3.0.0
  gtk_list_store_set_valuesv@Base 3.0.0
  gtk_list_store_swap@Base 3.0.0
+ gtk_lock_button_accessible_get_type@Base 3.7.10
  gtk_lock_button_get_permission@Base 3.1.4
  gtk_lock_button_get_type@Base 3.1.4
  gtk_lock_button_new@Base 3.1.4
@@ -2128,6 +2196,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_main_iteration_do@Base 3.0.0
  gtk_main_level@Base 3.0.0
  gtk_main_quit@Base 3.0.0
+ gtk_menu_accessible_get_type@Base 3.7.10
  gtk_menu_attach@Base 3.0.0
  gtk_menu_attach_to_widget@Base 3.0.0
  gtk_menu_bar_get_child_pack_direction@Base 3.0.0
@@ -2159,6 +2228,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_menu_get_tearoff_state@Base 3.0.0
  gtk_menu_get_title@Base 3.0.0
  gtk_menu_get_type@Base 3.0.0
+ gtk_menu_item_accessible_get_type@Base 3.7.10
  gtk_menu_item_activate@Base 3.0.0
  gtk_menu_item_deselect@Base 3.0.0
  gtk_menu_item_get_accel_path@Base 3.0.0
@@ -2195,6 +2265,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_menu_set_screen@Base 3.0.0
  gtk_menu_set_tearoff_state@Base 3.0.0
  gtk_menu_set_title@Base 3.0.0
+ gtk_menu_shell_accessible_get_type@Base 3.7.10
  gtk_menu_shell_activate_item@Base 3.0.0
  gtk_menu_shell_append@Base 3.0.0
  gtk_menu_shell_bind_model@Base 3.5.18
@@ -2240,6 +2311,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_mount_operation_set_parent@Base 3.0.0
  gtk_mount_operation_set_screen@Base 3.0.0
  gtk_movement_step_get_type@Base 3.0.0
+ gtk_notebook_accessible_get_type@Base 3.7.10
  gtk_notebook_append_page@Base 3.0.0
  gtk_notebook_append_page_menu@Base 3.0.0
  gtk_notebook_get_action_widget@Base 3.0.0
@@ -2264,6 +2336,9 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_notebook_insert_page_menu@Base 3.0.0
  gtk_notebook_new@Base 3.0.0
  gtk_notebook_next_page@Base 3.0.0
+ gtk_notebook_page_accessible_get_type@Base 3.7.10
+ gtk_notebook_page_accessible_invalidate@Base 3.7.10
+ gtk_notebook_page_accessible_new@Base 3.7.10
  gtk_notebook_page_num@Base 3.0.0
  gtk_notebook_popup_disable@Base 3.0.0
  gtk_notebook_popup_enable@Base 3.0.0
@@ -2367,6 +2442,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_paned_accessible_get_type@Base 3.7.10
  gtk_paned_add1@Base 3.0.0
  gtk_paned_add2@Base 3.0.0
  gtk_paned_get_child1@Base 3.0.0
@@ -2673,6 +2749,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_printer_set_job_count@Base 3.0.0
  gtk_printer_set_location@Base 3.0.0
  gtk_printer_set_state_message@Base 3.0.0
+ gtk_progress_bar_accessible_get_type@Base 3.7.10
  gtk_progress_bar_get_ellipsize@Base 3.0.0
  gtk_progress_bar_get_fraction@Base 3.0.0
  gtk_progress_bar_get_inverted@Base 3.0.0
@@ -2696,6 +2773,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_radio_action_new@Base 3.0.0
  gtk_radio_action_set_current_value@Base 3.0.0
  gtk_radio_action_set_group@Base 3.0.0
+ gtk_radio_button_accessible_get_type@Base 3.7.10
  gtk_radio_button_get_group@Base 3.0.0
  gtk_radio_button_get_type@Base 3.0.0
  gtk_radio_button_join_group@Base 3.0.0
@@ -2706,6 +2784,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_radio_button_new_with_mnemonic@Base 3.0.0
  gtk_radio_button_new_with_mnemonic_from_widget@Base 3.0.0
  gtk_radio_button_set_group@Base 3.0.0
+ gtk_radio_menu_item_accessible_get_type@Base 3.7.10
  gtk_radio_menu_item_get_group@Base 3.0.0
  gtk_radio_menu_item_get_type@Base 3.0.0
  gtk_radio_menu_item_new@Base 3.0.0
@@ -2722,6 +2801,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_radio_tool_button_new_from_widget@Base 3.0.0
  gtk_radio_tool_button_new_with_stock_from_widget@Base 3.0.0
  gtk_radio_tool_button_set_group@Base 3.0.0
+ gtk_range_accessible_get_type@Base 3.7.10
  gtk_range_get_adjustment@Base 3.0.0
  gtk_range_get_fill_level@Base 3.0.0
  gtk_range_get_flippable@Base 3.0.0
@@ -2905,6 +2985,8 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_render_line@Base 3.0.0
  gtk_render_option@Base 3.0.0
  gtk_render_slider@Base 3.0.0
+ gtk_renderer_cell_accessible_get_type@Base 3.7.10
+ gtk_renderer_cell_accessible_new@Base 3.7.10
  gtk_requisition_copy@Base 3.0.0
  gtk_requisition_free@Base 3.0.0
  gtk_requisition_get_type@Base 3.0.0
@@ -2912,7 +2994,9 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_resize_mode_get_type@Base 3.0.0
  gtk_response_type_get_type@Base 3.0.0
  gtk_rgb_to_hsv@Base 3.0.0
+ gtk_scale_accessible_get_type@Base 3.7.10
  gtk_scale_add_mark@Base 3.0.0
+ gtk_scale_button_accessible_get_type@Base 3.7.10
  gtk_scale_button_get_adjustment@Base 3.0.0
  gtk_scale_button_get_minus_button@Base 3.0.0
  gtk_scale_button_get_plus_button@Base 3.0.0
@@ -2951,6 +3035,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_scrollable_set_vscroll_policy@Base 3.0.0
  gtk_scrollbar_get_type@Base 3.0.0
  gtk_scrollbar_new@Base 3.0.0
+ gtk_scrolled_window_accessible_get_type@Base 3.7.10
  gtk_scrolled_window_add_with_viewport@Base 3.0.0
  gtk_scrolled_window_get_capture_button_press@Base 3.3.18
  gtk_scrolled_window_get_hadjustment@Base 3.0.0
@@ -3047,6 +3132,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_socket_get_type@Base 3.0.0
  gtk_socket_new@Base 3.0.0
  gtk_sort_type_get_type@Base 3.0.0
+ gtk_spin_button_accessible_get_type@Base 3.7.10
  gtk_spin_button_configure@Base 3.0.0
  gtk_spin_button_get_adjustment@Base 3.0.0
  gtk_spin_button_get_digits@Base 3.0.0
@@ -3074,6 +3160,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_spin_button_update@Base 3.0.0
  gtk_spin_button_update_policy_get_type@Base 3.0.0
  gtk_spin_type_get_type@Base 3.0.0
+ gtk_spinner_accessible_get_type@Base 3.7.10
  gtk_spinner_get_type@Base 3.0.0
  gtk_spinner_new@Base 3.0.0
  gtk_spinner_start@Base 3.0.0
@@ -3115,6 +3202,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_status_icon_set_tooltip_markup@Base 3.0.0
  gtk_status_icon_set_tooltip_text@Base 3.0.0
  gtk_status_icon_set_visible@Base 3.0.0
+ gtk_statusbar_accessible_get_type@Base 3.7.10
  gtk_statusbar_get_context_id@Base 3.0.0
  gtk_statusbar_get_message_area@Base 3.0.0
  gtk_statusbar_get_type@Base 3.0.0
@@ -3144,6 +3232,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_style_context_get_color@Base 3.0.0
  gtk_style_context_get_direction@Base 3.0.0
  gtk_style_context_get_font@Base 3.0.0
+ gtk_style_context_get_frame_clock@Base 3.7.10
  gtk_style_context_get_junction_sides@Base 3.0.0
  gtk_style_context_get_margin@Base 3.0.0
  gtk_style_context_get_padding@Base 3.0.0
@@ -3179,6 +3268,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_style_context_scroll_animations@Base 3.0.0
  gtk_style_context_set_background@Base 3.0.0
  gtk_style_context_set_direction@Base 3.0.0
+ gtk_style_context_set_frame_clock@Base 3.7.10
  gtk_style_context_set_junction_sides@Base 3.0.0
  gtk_style_context_set_parent@Base 3.3.16
  gtk_style_context_set_path@Base 3.0.0
@@ -3216,6 +3306,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_style_provider_get_type@Base 3.0.0
  gtk_style_render_icon@Base 3.0.0
  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_type@Base 3.0.0
  gtk_switch_new@Base 3.0.0
@@ -3371,6 +3462,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_text_buffer_unregister_deserialize_format@Base 3.0.0
  gtk_text_buffer_unregister_serialize_format@Base 3.0.0
  gtk_text_byte_begins_utf8_char@Base 3.0.0
+ gtk_text_cell_accessible_get_type@Base 3.7.10
  gtk_text_child_anchor_get_deleted@Base 3.0.0
  gtk_text_child_anchor_get_type@Base 3.0.0
  gtk_text_child_anchor_get_widgets@Base 3.0.0
@@ -3539,6 +3631,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_text_tag_table_new@Base 3.0.0
  gtk_text_tag_table_remove@Base 3.0.0
  gtk_text_unknown_char_utf8_gtk_tests_only@Base 3.0.0
+ gtk_text_view_accessible_get_type@Base 3.7.10
  gtk_text_view_add_child_at_anchor@Base 3.0.0
  gtk_text_view_add_child_in_window@Base 3.0.0
  gtk_text_view_backward_display_line@Base 3.0.0
@@ -3640,6 +3733,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_toggle_action_set_active@Base 3.0.0
  gtk_toggle_action_set_draw_as_radio@Base 3.0.0
  gtk_toggle_action_toggled@Base 3.0.0
+ gtk_toggle_button_accessible_get_type@Base 3.7.10
  gtk_toggle_button_get_active@Base 3.0.0
  gtk_toggle_button_get_inconsistent@Base 3.0.0
  gtk_toggle_button_get_mode@Base 3.0.0
@@ -3781,6 +3875,8 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_tooltip_set_text@Base 3.0.0
  gtk_tooltip_set_tip_area@Base 3.0.0
  gtk_tooltip_trigger_tooltip_query@Base 3.0.0
+ gtk_toplevel_accessible_get_children@Base 3.7.10
+ gtk_toplevel_accessible_get_type@Base 3.7.10
  gtk_tray_icon_get_type@Base 3.0.0
  gtk_tree_drag_dest_drag_data_received@Base 3.0.0
  gtk_tree_drag_dest_get_type@Base 3.0.0
@@ -3927,6 +4023,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_tree_store_set_value@Base 3.0.0
  gtk_tree_store_set_valuesv@Base 3.0.0
  gtk_tree_store_swap@Base 3.0.0
+ gtk_tree_view_accessible_get_type@Base 3.7.10
  gtk_tree_view_append_column@Base 3.0.0
  gtk_tree_view_collapse_all@Base 3.0.0
  gtk_tree_view_collapse_row@Base 3.0.0
@@ -3999,6 +4096,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_tree_view_expand_all@Base 3.0.0
  gtk_tree_view_expand_row@Base 3.0.0
  gtk_tree_view_expand_to_path@Base 3.0.0
+ gtk_tree_view_get_activate_on_single_click@Base 3.7.10
  gtk_tree_view_get_background_area@Base 3.0.0
  gtk_tree_view_get_bin_window@Base 3.0.0
  gtk_tree_view_get_cell_area@Base 3.0.0
@@ -4052,6 +4150,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_tree_view_row_expanded@Base 3.0.0
  gtk_tree_view_scroll_to_cell@Base 3.0.0
  gtk_tree_view_scroll_to_point@Base 3.0.0
+ gtk_tree_view_set_activate_on_single_click@Base 3.7.10
  gtk_tree_view_set_column_drag_function@Base 3.0.0
  gtk_tree_view_set_cursor@Base 3.0.0
  gtk_tree_view_set_cursor_on_cell@Base 3.0.0
@@ -4131,11 +4230,13 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_vscrollbar_new@Base 3.0.0
  gtk_vseparator_get_type@Base 3.0.0
  gtk_vseparator_new@Base 3.0.0
+ gtk_widget_accessible_get_type@Base 3.7.10
  gtk_widget_activate@Base 3.0.0
  gtk_widget_add_accelerator@Base 3.0.0
  gtk_widget_add_device_events@Base 3.0.0
  gtk_widget_add_events@Base 3.0.0
  gtk_widget_add_mnemonic_label@Base 3.0.0
+ gtk_widget_add_tick_callback@Base 3.7.10
  gtk_widget_can_activate_accel@Base 3.0.0
  gtk_widget_child_focus@Base 3.0.0
  gtk_widget_child_notify@Base 3.0.0
@@ -4177,6 +4278,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_widget_get_display@Base 3.0.0
  gtk_widget_get_double_buffered@Base 3.0.0
  gtk_widget_get_events@Base 3.0.0
+ gtk_widget_get_frame_clock@Base 3.7.10
  gtk_widget_get_halign@Base 3.0.0
  gtk_widget_get_has_tooltip@Base 3.0.0
  gtk_widget_get_has_window@Base 3.0.0
@@ -4191,6 +4293,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_widget_get_modifier_style@Base 3.0.0
  gtk_widget_get_name@Base 3.0.0
  gtk_widget_get_no_show_all@Base 3.0.0
+ gtk_widget_get_opacity@Base 3.7.10
  gtk_widget_get_pango_context@Base 3.0.0
  gtk_widget_get_parent@Base 3.0.0
  gtk_widget_get_parent_window@Base 3.0.0
@@ -4247,6 +4350,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_widget_is_focus@Base 3.0.0
  gtk_widget_is_sensitive@Base 3.0.0
  gtk_widget_is_toplevel@Base 3.0.0
+ gtk_widget_is_visible@Base 3.7.10
  gtk_widget_keynav_failed@Base 3.0.0
  gtk_widget_list_accel_closures@Base 3.0.0
  gtk_widget_list_mnemonic_labels@Base 3.0.0
@@ -4311,8 +4415,10 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_widget_queue_resize_no_redraw@Base 3.0.0
  gtk_widget_realize@Base 3.0.0
  gtk_widget_region_intersect@Base 3.0.0
+ gtk_widget_register_window@Base 3.7.10
  gtk_widget_remove_accelerator@Base 3.0.0
  gtk_widget_remove_mnemonic_label@Base 3.0.0
+ gtk_widget_remove_tick_callback@Base 3.7.10
  gtk_widget_render_icon@Base 3.0.0
  gtk_widget_render_icon_pixbuf@Base 3.0.0
  gtk_widget_reparent@Base 3.0.0
@@ -4345,6 +4451,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_widget_set_margin_top@Base 3.0.0
  gtk_widget_set_name@Base 3.0.0
  gtk_widget_set_no_show_all@Base 3.0.0
+ gtk_widget_set_opacity@Base 3.7.10
  gtk_widget_set_parent@Base 3.0.0
  gtk_widget_set_parent_window@Base 3.0.0
  gtk_widget_set_realized@Base 3.0.0
@@ -4381,7 +4488,9 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_widget_unmap@Base 3.0.0
  gtk_widget_unparent@Base 3.0.0
  gtk_widget_unrealize@Base 3.0.0
+ gtk_widget_unregister_window@Base 3.7.10
  gtk_widget_unset_state_flags@Base 3.0.0
+ gtk_window_accessible_get_type@Base 3.7.10
  gtk_window_activate_default@Base 3.0.0
  gtk_window_activate_focus@Base 3.0.0
  gtk_window_activate_key@Base 3.0.0

From c2de88d9a20f001be3f9aa32f651548853cb05f0 Mon Sep 17 00:00:00 2001
From: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Sat, 23 Feb 2013 15:41:13 +0000
Subject: [PATCH 18/38]   + debian/gtk-3-examples.install:     - Stop
 installing gtk3-demo files, no longer needed.

---
 debian/changelog              | 2 ++
 debian/gtk-3-examples.install | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 2e26529842..9b45f0fe80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ gtk+3.0 (3.7.10-1) UNRELEASED; urgency=low
       - Refreshed.
     + debian/libgtk-3-0.symbols:
       - Updated for the new symbols.
+    + debian/gtk-3-examples.install:
+      - Stop installing gtk3-demo files, no longer needed.
 
  -- Emilio Pozuelo Monfort <pochu@debian.org>  Fri, 22 Feb 2013 18:43:04 +0100
 
diff --git a/debian/gtk-3-examples.install b/debian/gtk-3-examples.install
index a837ee61c0..3ea326b47c 100644
--- a/debian/gtk-3-examples.install
+++ b/debian/gtk-3-examples.install
@@ -1,4 +1,3 @@
 usr/bin/gtk3-demo
 usr/bin/gtk3-widget-factory
-usr/share/gtk-3.0/demo
 usr/share/glib-2.0/schemas/org.gtk.Demo.gschema.xml

From 4a69c13d5026c94469769cdb7b3da766babf99da Mon Sep 17 00:00:00 2001
From: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Sat, 23 Feb 2013 19:37:09 +0000
Subject: [PATCH 19/38]   + debian/patches/030_tests_skip_filechooser.patch:   
  - New patch: skip filechooser tests as they are not designed to       be run
 without gtk+ installed.

---
 debian/changelog                              |  3 +++
 .../patches/030_tests_skip_filechooser.patch  | 19 +++++++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 23 insertions(+)
 create mode 100644 debian/patches/030_tests_skip_filechooser.patch

diff --git a/debian/changelog b/debian/changelog
index 9b45f0fe80..60b86d1ed2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ gtk+3.0 (3.7.10-1) UNRELEASED; urgency=low
       - Updated for the new symbols.
     + debian/gtk-3-examples.install:
       - Stop installing gtk3-demo files, no longer needed.
+    + debian/patches/030_tests_skip_filechooser.patch:
+      - New patch: skip filechooser tests as they are not designed to
+        be run without gtk+ installed.
 
  -- Emilio Pozuelo Monfort <pochu@debian.org>  Fri, 22 Feb 2013 18:43:04 +0100
 
diff --git a/debian/patches/030_tests_skip_filechooser.patch b/debian/patches/030_tests_skip_filechooser.patch
new file mode 100644
index 0000000000..ac584bcdaa
--- /dev/null
+++ b/debian/patches/030_tests_skip_filechooser.patch
@@ -0,0 +1,19 @@
+Description: The filechooser tests are not very chroot-friendly, as they
+ need the gtk schemas to be compiled and installed, so skip them for now.
+Author: Emilio Pozuelo Monfort <pochu@debian.org>
+
+--- a/gtk/tests/Makefile.am
++++ b/gtk/tests/Makefile.am
+@@ -69,9 +69,9 @@
+ #crossingevents_SOURCES		 = crossingevents.c
+ #crossingevents_LDADD		 = $(progs_ldadd)
+ 
+-TEST_PROGS			+= filechooser
+-filechooser_SOURCES		 = filechooser.c
+-filechooser_LDADD		 = $(progs_ldadd)
++#TEST_PROGS			+= filechooser
++#filechooser_SOURCES		 = filechooser.c
++#filechooser_LDADD		 = $(progs_ldadd)
+ 
+ TEST_PROGS			+= builder
+ builder_SOURCES			 = builder.c
diff --git a/debian/patches/series b/debian/patches/series
index d131e2ad02..f80f11561a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,7 @@
 017_no_offscreen_device_grabbing.patch
 018_gdkenumtypes.c_location.patch
 022_disable-viqr-im-for-vi-locale.patch
+030_tests_skip_filechooser.patch
 #042_treeview_single-focus.patch
 #043_notebook_scroll.patch
 044_tracker_fts.patch

From fd818a2d906da3cfa8529860c8aef9eeb8dc421f Mon Sep 17 00:00:00 2001
From: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Sat, 23 Feb 2013 19:38:28 +0000
Subject: [PATCH 20/38] release to experimental

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 60b86d1ed2..76a769a757 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-gtk+3.0 (3.7.10-1) UNRELEASED; urgency=low
+gtk+3.0 (3.7.10-1) experimental; urgency=low
 
   * New upstream release.
     + debian/control.in:
@@ -13,7 +13,7 @@ gtk+3.0 (3.7.10-1) UNRELEASED; urgency=low
       - New patch: skip filechooser tests as they are not designed to
         be run without gtk+ installed.
 
- -- Emilio Pozuelo Monfort <pochu@debian.org>  Fri, 22 Feb 2013 18:43:04 +0100
+ -- Emilio Pozuelo Monfort <pochu@debian.org>  Sat, 23 Feb 2013 20:37:27 +0100
 
 gtk+3.0 (3.6.4-1) experimental; urgency=low
 

From 42ddab18611eb7fade307d5e85b4e7c58ec71e85 Mon Sep 17 00:00:00 2001
From: Sjoerd Simons <sjoerd@debian.org>
Date: Mon, 4 Mar 2013 21:34:14 +0000
Subject: [PATCH 21/38] * debian/patches/80_Fix-DND-with-frame-sync.patch:   +
 Added. Temporary fix for DND when using mutter with the frame sync   protocol
 (from upstream git, bgo#694217).

---
 debian/changelog                              |  8 +++++
 .../patches/80_Fix-DND-with-frame-sync.patch  | 30 +++++++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 39 insertions(+)
 create mode 100644 debian/patches/80_Fix-DND-with-frame-sync.patch

diff --git a/debian/changelog b/debian/changelog
index 76a769a757..e42ea145c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gtk+3.0 (3.7.10-2) UNRELEASED; urgency=low
+
+  * debian/patches/80_Fix-DND-with-frame-sync.patch:
+    + Added. Temporary fix for DND when using mutter with the frame sync
+    protocol (from upstream git, bgo#694217).
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Mon, 04 Mar 2013 22:07:12 +0100
+
 gtk+3.0 (3.7.10-1) experimental; urgency=low
 
   * New upstream release.
diff --git a/debian/patches/80_Fix-DND-with-frame-sync.patch b/debian/patches/80_Fix-DND-with-frame-sync.patch
new file mode 100644
index 0000000000..07d1ab3d98
--- /dev/null
+++ b/debian/patches/80_Fix-DND-with-frame-sync.patch
@@ -0,0 +1,30 @@
+From 02e915273845b21af223e7e5e2425569afcf1b83 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Thu, 28 Feb 2013 07:44:00 -0500
+Subject: [PATCH] Fix DND with frame sync
+
+Mutter magically ignores override-redirect windows with geometry
+-100-100+1+1, and this breaks the frame synchronization between
+gtk+ and mutter. For now, we avoid the issue by simply giving
+the window a different geometry.
+https://bugzilla.gnome.org/show_bug.cgi?id=694217
+---
+ gtk/gtkdnd.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
+index 42f7221..4b974a5 100644
+--- a/gtk/gtkdnd.c
++++ b/gtk/gtkdnd.c
+@@ -360,7 +360,7 @@ gtk_drag_get_ipc_widget_for_screen (GdkScreen *screen)
+       result = gtk_window_new (GTK_WINDOW_POPUP);
+       gtk_window_set_screen (GTK_WINDOW (result), screen);
+       gtk_window_resize (GTK_WINDOW (result), 1, 1);
+-      gtk_window_move (GTK_WINDOW (result), -100, -100);
++      gtk_window_move (GTK_WINDOW (result), -99, -99);
+       gtk_widget_show (result);
+     }  
+ 
+-- 
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
index f80f11561a..295a2b80bc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@
 060_ignore-random-icons.patch
 061_multiarch_module_fallback.patch
 071_fix-installation-of-HTML-images.patch
+80_Fix-DND-with-frame-sync.patch

From 21146bfc5e77d691b2ae8844cbc6fffa1cee2ac6 Mon Sep 17 00:00:00 2001
From: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Wed, 6 Mar 2013 10:25:44 +0000
Subject: [PATCH 22/38] New upstream release.

---
 debian/changelog | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e42ea145c4..8654f8f8ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
-gtk+3.0 (3.7.10-2) UNRELEASED; urgency=low
+gtk+3.0 (3.7.12-1) UNRELEASED; urgency=low
 
+  [ Sjoerd Simons ]
   * debian/patches/80_Fix-DND-with-frame-sync.patch:
     + Added. Temporary fix for DND when using mutter with the frame sync
     protocol (from upstream git, bgo#694217).
 
+  [ Emilio Pozuelo Monfort ]
+  * New upstream release.
+
  -- Sjoerd Simons <sjoerd@debian.org>  Mon, 04 Mar 2013 22:07:12 +0100
 
 gtk+3.0 (3.7.10-1) experimental; urgency=low

From 06484add5ead8b3aa335a234f90d06eea98cb018 Mon Sep 17 00:00:00 2001
From: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Wed, 6 Mar 2013 10:27:02 +0000
Subject: [PATCH 23/38]   + debian/patches/*:     - Refreshed.

---
 debian/changelog                                         | 2 ++
 debian/patches/018_gdkenumtypes.c_location.patch         | 4 ++--
 debian/patches/060_ignore-random-icons.patch             | 8 +++-----
 debian/patches/071_fix-installation-of-HTML-images.patch | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8654f8f8ac..dea82749ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ gtk+3.0 (3.7.12-1) UNRELEASED; urgency=low
 
   [ Emilio Pozuelo Monfort ]
   * New upstream release.
+    + debian/patches/*:
+      - Refreshed.
 
  -- Sjoerd Simons <sjoerd@debian.org>  Mon, 04 Mar 2013 22:07:12 +0100
 
diff --git a/debian/patches/018_gdkenumtypes.c_location.patch b/debian/patches/018_gdkenumtypes.c_location.patch
index 8e89ba84b1..ddb95e1a85 100644
--- a/debian/patches/018_gdkenumtypes.c_location.patch
+++ b/debian/patches/018_gdkenumtypes.c_location.patch
@@ -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 @@
+@@ -310,7 +310,7 @@
  
  lib_LTLIBRARIES = libgdk-3.la
  
@@ -40,7 +40,7 @@ Bug-Ubuntu: https://launchpad.net/bugs/769256
  EXTRA_DIST += \
  	$(gdk_built_sources)	\
  	fallback-c89.c
-@@ -325,18 +325,15 @@
+@@ -324,18 +324,15 @@
  	$(gdk_built_sources)			\
  	gdkconfig.h
  
diff --git a/debian/patches/060_ignore-random-icons.patch b/debian/patches/060_ignore-random-icons.patch
index c31acbafd5..31f2c6e6fb 100644
--- a/debian/patches/060_ignore-random-icons.patch
+++ b/debian/patches/060_ignore-random-icons.patch
@@ -1,8 +1,6 @@
-Index: gtk+-3.3.20/gtk/updateiconcache.c
-===================================================================
---- gtk+-3.3.20.orig/gtk/updateiconcache.c	2012-03-21 00:38:00.442485584 +0100
-+++ gtk+-3.3.20/gtk/updateiconcache.c	2012-03-21 00:38:26.866484650 +0100
-@@ -658,7 +658,7 @@
+--- a/gtk/updateiconcache.c
++++ b/gtk/updateiconcache.c
+@@ -676,7 +676,7 @@
  		      directories = g_list_append (directories, g_strdup (subdir));
  		    }
  		  else
diff --git a/debian/patches/071_fix-installation-of-HTML-images.patch b/debian/patches/071_fix-installation-of-HTML-images.patch
index 29a6ed81b0..ac2203c711 100644
--- a/debian/patches/071_fix-installation-of-HTML-images.patch
+++ b/debian/patches/071_fix-installation-of-HTML-images.patch
@@ -13,7 +13,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=656803
 
 --- a/gtk-doc.make
 +++ b/gtk-doc.make
-@@ -155,8 +155,8 @@
+@@ -173,8 +173,8 @@
  	  if test -f $(abs_srcdir)/$$file ; then \
  	    cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
  	  fi; \
@@ -23,4 +23,4 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=656803
 +	    cp $$file $(abs_builddir)/html; \
  	  fi; \
  	done;
- 	@echo '  DOC   Fixing cross-references'
+ 	$(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)

From a955d1578f76828ab62128b89369e74681442b3e Mon Sep 17 00:00:00 2001
From: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Wed, 6 Mar 2013 10:27:45 +0000
Subject: [PATCH 24/38]   + debian/libgtk-3-0.symbols:     - Updated for new
 symbols.

---
 debian/changelog          | 2 ++
 debian/libgtk-3-0.symbols | 1 +
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index dea82749ba..5d6b9e44c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ gtk+3.0 (3.7.12-1) UNRELEASED; urgency=low
   * New upstream release.
     + debian/patches/*:
       - Refreshed.
+    + debian/libgtk-3-0.symbols:
+      - Updated for new symbols.
 
  -- Sjoerd Simons <sjoerd@debian.org>  Mon, 04 Mar 2013 22:07:12 +0100
 
diff --git a/debian/libgtk-3-0.symbols b/debian/libgtk-3-0.symbols
index 7c934e6743..aed21296c4 100644
--- a/debian/libgtk-3-0.symbols
+++ b/debian/libgtk-3-0.symbols
@@ -1096,6 +1096,7 @@ libgtk-3.so.0 libgtk-3-0 #MINVER#
  gtk_cell_renderer_accel_mode_get_type@Base 3.0.0
  gtk_cell_renderer_accel_new@Base 3.0.0
  gtk_cell_renderer_activate@Base 3.0.0
+ gtk_cell_renderer_class_set_accessible_type@Base 3.7.12
  gtk_cell_renderer_combo_get_type@Base 3.0.0
  gtk_cell_renderer_combo_new@Base 3.0.0
  gtk_cell_renderer_get_aligned_area@Base 3.0.0

From a7385ce2a8c8b52a06f5b8f8874f4b947950f6d8 Mon Sep 17 00:00:00 2001
From: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Wed, 6 Mar 2013 10:30:01 +0000
Subject: [PATCH 25/38]   + debian/patches/80_Fix-DND-with-frame-sync.patch:   
  - Removed, included upstream.

---
 debian/changelog                              |  2 ++
 .../patches/80_Fix-DND-with-frame-sync.patch  | 30 -------------------
 debian/patches/series                         |  1 -
 3 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100644 debian/patches/80_Fix-DND-with-frame-sync.patch

diff --git a/debian/changelog b/debian/changelog
index 5d6b9e44c9..3411704f32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ gtk+3.0 (3.7.12-1) UNRELEASED; urgency=low
   * New upstream release.
     + debian/patches/*:
       - Refreshed.
+    + debian/patches/80_Fix-DND-with-frame-sync.patch:
+      - Removed, included upstream.
     + debian/libgtk-3-0.symbols:
       - Updated for new symbols.
 
diff --git a/debian/patches/80_Fix-DND-with-frame-sync.patch b/debian/patches/80_Fix-DND-with-frame-sync.patch
deleted file mode 100644
index 07d1ab3d98..0000000000
--- a/debian/patches/80_Fix-DND-with-frame-sync.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 02e915273845b21af223e7e5e2425569afcf1b83 Mon Sep 17 00:00:00 2001
-From: Matthias Clasen <mclasen@redhat.com>
-Date: Thu, 28 Feb 2013 07:44:00 -0500
-Subject: [PATCH] Fix DND with frame sync
-
-Mutter magically ignores override-redirect windows with geometry
--100-100+1+1, and this breaks the frame synchronization between
-gtk+ and mutter. For now, we avoid the issue by simply giving
-the window a different geometry.
-https://bugzilla.gnome.org/show_bug.cgi?id=694217
----
- gtk/gtkdnd.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
-index 42f7221..4b974a5 100644
---- a/gtk/gtkdnd.c
-+++ b/gtk/gtkdnd.c
-@@ -360,7 +360,7 @@ gtk_drag_get_ipc_widget_for_screen (GdkScreen *screen)
-       result = gtk_window_new (GTK_WINDOW_POPUP);
-       gtk_window_set_screen (GTK_WINDOW (result), screen);
-       gtk_window_resize (GTK_WINDOW (result), 1, 1);
--      gtk_window_move (GTK_WINDOW (result), -100, -100);
-+      gtk_window_move (GTK_WINDOW (result), -99, -99);
-       gtk_widget_show (result);
-     }  
- 
--- 
-1.7.10.4
-
diff --git a/debian/patches/series b/debian/patches/series
index 295a2b80bc..f80f11561a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,4 +10,3 @@
 060_ignore-random-icons.patch
 061_multiarch_module_fallback.patch
 071_fix-installation-of-HTML-images.patch
-80_Fix-DND-with-frame-sync.patch

From 5dc3216661b3e207f355b800f3e25554b6dedb9d Mon Sep 17 00:00:00 2001
From: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Wed, 6 Mar 2013 12:44:18 +0000
Subject: [PATCH 26/38] release to experimental

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3411704f32..c3e0d6ef17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-gtk+3.0 (3.7.12-1) UNRELEASED; urgency=low
+gtk+3.0 (3.7.12-1) experimental; urgency=low
 
   [ Sjoerd Simons ]
   * debian/patches/80_Fix-DND-with-frame-sync.patch:
@@ -14,7 +14,7 @@ gtk+3.0 (3.7.12-1) UNRELEASED; urgency=low
     + debian/libgtk-3-0.symbols:
       - Updated for new symbols.
 
- -- Sjoerd Simons <sjoerd@debian.org>  Mon, 04 Mar 2013 22:07:12 +0100
+ -- Emilio Pozuelo Monfort <pochu@debian.org>  Wed, 06 Mar 2013 13:43:48 +0100
 
 gtk+3.0 (3.7.10-1) experimental; urgency=low
 

From cda89ecdb4390c9f731fb47ba6a3d878084987a3 Mon Sep 17 00:00:00 2001
From: Sjoerd Simons <sjoerd@debian.org>
Date: Mon, 11 Mar 2013 20:42:33 +0000
Subject: [PATCH 27/38] *
 d/p/090-GtkTextView-don-t-popdown-a-bubble-if-we-don-t-have-.patch:   +
 Added. Fix segv when popping down non-existing bubblees (From upstream    
 git, bgo #695304)

---
 debian/changelog                              |  8 +++++
 ...t-popdown-a-bubble-if-we-don-t-have-.patch | 29 +++++++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 38 insertions(+)
 create mode 100644 debian/patches/090-GtkTextView-don-t-popdown-a-bubble-if-we-don-t-have-.patch

diff --git a/debian/changelog b/debian/changelog
index c3e0d6ef17..08f127323b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gtk+3.0 (3.7.12-2) UNRELEASED; urgency=low
+
+  * d/p/090-GtkTextView-don-t-popdown-a-bubble-if-we-don-t-have-.patch:
+    + Added. Fix segv when popping down non-existing bubblees (From upstream
+      git, bgo #695304)
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Mon, 11 Mar 2013 21:15:28 +0100
+
 gtk+3.0 (3.7.12-1) experimental; urgency=low
 
   [ Sjoerd Simons ]
diff --git a/debian/patches/090-GtkTextView-don-t-popdown-a-bubble-if-we-don-t-have-.patch b/debian/patches/090-GtkTextView-don-t-popdown-a-bubble-if-we-don-t-have-.patch
new file mode 100644
index 0000000000..044b3313b7
--- /dev/null
+++ b/debian/patches/090-GtkTextView-don-t-popdown-a-bubble-if-we-don-t-have-.patch
@@ -0,0 +1,29 @@
+From ca2368dba958d6fecf2fce417307bb9cbbe6eb6b Mon Sep 17 00:00:00 2001
+From: Giovanni Campagna <gcampagna@src.gnome.org>
+Date: Wed, 6 Mar 2013 17:04:23 +0100
+Subject: [PATCH] GtkTextView: don't popdown a bubble if we don't have one
+
+This causes a segfault.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=695304
+---
+ gtk/gtktextview.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
+index 1a0b560..2de8a1e 100644
+--- a/gtk/gtktextview.c
++++ b/gtk/gtktextview.c
+@@ -9101,7 +9101,8 @@ text_window_scroll        (GtkTextWindow *win,
+ 
+   if (dx != 0 || dy != 0)
+     {
+-      _gtk_bubble_window_popdown (GTK_BUBBLE_WINDOW (priv->selection_bubble));
++      if (priv->selection_bubble)
++        _gtk_bubble_window_popdown (GTK_BUBBLE_WINDOW (priv->selection_bubble));
+       gdk_window_scroll (win->bin_window, dx, dy);
+     }
+ }
+-- 
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
index f80f11561a..5174b70d0f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,3 +10,4 @@
 060_ignore-random-icons.patch
 061_multiarch_module_fallback.patch
 071_fix-installation-of-HTML-images.patch
+090-GtkTextView-don-t-popdown-a-bubble-if-we-don-t-have-.patch

From d711cef703c7c24393908db25e0a19f91283ec99 Mon Sep 17 00:00:00 2001
From: Sjoerd Simons <sjoerd@debian.org>
Date: Mon, 11 Mar 2013 20:42:48 +0000
Subject: [PATCH 28/38] Target experimental

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 08f127323b..d4fcbb738b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-gtk+3.0 (3.7.12-2) UNRELEASED; urgency=low
+gtk+3.0 (3.7.12-2) experimental; urgency=low
 
   * d/p/090-GtkTextView-don-t-popdown-a-bubble-if-we-don-t-have-.patch:
     + Added. Fix segv when popping down non-existing bubblees (From upstream
       git, bgo #695304)
 
- -- Sjoerd Simons <sjoerd@debian.org>  Mon, 11 Mar 2013 21:15:28 +0100
+ -- Sjoerd Simons <sjoerd@debian.org>  Mon, 11 Mar 2013 21:42:39 +0100
 
 gtk+3.0 (3.7.12-1) experimental; urgency=low
 

From 18a1aa8bfaccafee10e06407930e57a9409755bb Mon Sep 17 00:00:00 2001
From: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Tue, 19 Mar 2013 10:35:39 +0000
Subject: [PATCH 29/38] New upstream release.

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d4fcbb738b..3c695f5d65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gtk+3.0 (3.7.14-1) UNRELEASED; urgency=low
+
+  * New upstream release.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org>  Tue, 19 Mar 2013 11:34:28 +0100
+
 gtk+3.0 (3.7.12-2) experimental; urgency=low
 
   * d/p/090-GtkTextView-don-t-popdown-a-bubble-if-we-don-t-have-.patch:

From f20201dffd075b3c5ad7d14607d13e0f3d7b28ec Mon Sep 17 00:00:00 2001
From: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Tue, 19 Mar 2013 10:37:38 +0000
Subject: [PATCH 30/38]   +
 d/p/090-GtkTextView-don-t-popdown-a-bubble-if-we-don-t-have-.patch:     -
 Removed, included upstream.

---
 debian/changelog                              |  2 ++
 ...t-popdown-a-bubble-if-we-don-t-have-.patch | 29 -------------------
 debian/patches/series                         |  1 -
 3 files changed, 2 insertions(+), 30 deletions(-)
 delete mode 100644 debian/patches/090-GtkTextView-don-t-popdown-a-bubble-if-we-don-t-have-.patch

diff --git a/debian/changelog b/debian/changelog
index 3c695f5d65..e8d8f435cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 gtk+3.0 (3.7.14-1) UNRELEASED; urgency=low
 
   * New upstream release.
+    + d/p/090-GtkTextView-don-t-popdown-a-bubble-if-we-don-t-have-.patch:
+      - Removed, included upstream.
 
  -- Emilio Pozuelo Monfort <pochu@debian.org>  Tue, 19 Mar 2013 11:34:28 +0100
 
diff --git a/debian/patches/090-GtkTextView-don-t-popdown-a-bubble-if-we-don-t-have-.patch b/debian/patches/090-GtkTextView-don-t-popdown-a-bubble-if-we-don-t-have-.patch
deleted file mode 100644
index 044b3313b7..0000000000
--- a/debian/patches/090-GtkTextView-don-t-popdown-a-bubble-if-we-don-t-have-.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From ca2368dba958d6fecf2fce417307bb9cbbe6eb6b Mon Sep 17 00:00:00 2001
-From: Giovanni Campagna <gcampagna@src.gnome.org>
-Date: Wed, 6 Mar 2013 17:04:23 +0100
-Subject: [PATCH] GtkTextView: don't popdown a bubble if we don't have one
-
-This causes a segfault.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=695304
----
- gtk/gtktextview.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
-index 1a0b560..2de8a1e 100644
---- a/gtk/gtktextview.c
-+++ b/gtk/gtktextview.c
-@@ -9101,7 +9101,8 @@ text_window_scroll        (GtkTextWindow *win,
- 
-   if (dx != 0 || dy != 0)
-     {
--      _gtk_bubble_window_popdown (GTK_BUBBLE_WINDOW (priv->selection_bubble));
-+      if (priv->selection_bubble)
-+        _gtk_bubble_window_popdown (GTK_BUBBLE_WINDOW (priv->selection_bubble));
-       gdk_window_scroll (win->bin_window, dx, dy);
-     }
- }
--- 
-1.7.10.4
-
diff --git a/debian/patches/series b/debian/patches/series
index 5174b70d0f..f80f11561a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,4 +10,3 @@
 060_ignore-random-icons.patch
 061_multiarch_module_fallback.patch
 071_fix-installation-of-HTML-images.patch
-090-GtkTextView-don-t-popdown-a-bubble-if-we-don-t-have-.patch

From a46e750ee2a514d2c43d764ebe5075455ac3d5cb Mon Sep 17 00:00:00 2001
From: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Tue, 19 Mar 2013 11:06:34 +0000
Subject: [PATCH 31/38] * debian/rules:   + Set HOME rather than G_HOME, as
 GLib now honors the former and     G_HOME is a Debian-specific thing.

---
 debian/changelog | 3 +++
 debian/rules     | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e8d8f435cb..12c377f35d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ gtk+3.0 (3.7.14-1) UNRELEASED; urgency=low
   * New upstream release.
     + d/p/090-GtkTextView-don-t-popdown-a-bubble-if-we-don-t-have-.patch:
       - Removed, included upstream.
+  * debian/rules:
+    + Set HOME rather than G_HOME, as GLib now honors the former and
+      G_HOME is a Debian-specific thing.
 
  -- Emilio Pozuelo Monfort <pochu@debian.org>  Tue, 19 Mar 2013 11:34:28 +0100
 
diff --git a/debian/rules b/debian/rules
index 05a57692fa..00c7660244 100644
--- a/debian/rules
+++ b/debian/rules
@@ -77,7 +77,7 @@ DEB_CONFIGURE_FLAGS_shared_udeb = \
 			--disable-xrandr
 
 # Avoid test failures on buildd environments
-export G_HOME=$(CURDIR)/debian/build
+export HOME=$(CURDIR)/debian/build
 
 DEB_MAKE_CHECK_TARGET = -k check
 DEB_INSTALL_DOCS_ALL = AUTHORS

From 79830e7b54f4491cc97fb30873a897bc866f68e3 Mon Sep 17 00:00:00 2001
From: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Tue, 19 Mar 2013 12:36:54 +0000
Subject: [PATCH 32/38] release to experimental

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 12c377f35d..86d99ab129 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-gtk+3.0 (3.7.14-1) UNRELEASED; urgency=low
+gtk+3.0 (3.7.14-1) experimental; urgency=low
 
   * New upstream release.
     + d/p/090-GtkTextView-don-t-popdown-a-bubble-if-we-don-t-have-.patch:
@@ -7,7 +7,7 @@ gtk+3.0 (3.7.14-1) UNRELEASED; urgency=low
     + Set HOME rather than G_HOME, as GLib now honors the former and
       G_HOME is a Debian-specific thing.
 
- -- Emilio Pozuelo Monfort <pochu@debian.org>  Tue, 19 Mar 2013 11:34:28 +0100
+ -- Emilio Pozuelo Monfort <pochu@debian.org>  Tue, 19 Mar 2013 12:06:40 +0100
 
 gtk+3.0 (3.7.12-2) experimental; urgency=low
 

From aa7575dc344982ce7e71b6bda60db3bf0a1ee202 Mon Sep 17 00:00:00 2001
From: Rico Tzschichholz <ricotz@t-online.de>
Date: Sun, 24 Mar 2013 08:34:03 +0000
Subject: [PATCH 33/38] Install usr/bin/gtk3-demo-application

---
 debian/changelog              | 7 +++++++
 debian/gtk-3-examples.install | 1 +
 2 files changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 86d99ab129..1981b8388e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gtk+3.0 (3.7.14-2) UNRELEASED; urgency=low
+
+  * debian/gtk-3-examples.install:
+    - Install usr/bin/gtk3-demo-application
+
+ -- Rico Tzschichholz <ricotz@ubuntu.com>  Sun, 24 Mar 2013 09:31:41 +0100
+
 gtk+3.0 (3.7.14-1) experimental; urgency=low
 
   * New upstream release.
diff --git a/debian/gtk-3-examples.install b/debian/gtk-3-examples.install
index 3ea326b47c..6c5d713484 100644
--- a/debian/gtk-3-examples.install
+++ b/debian/gtk-3-examples.install
@@ -1,3 +1,4 @@
 usr/bin/gtk3-demo
+usr/bin/gtk3-demo-application
 usr/bin/gtk3-widget-factory
 usr/share/glib-2.0/schemas/org.gtk.Demo.gschema.xml

From fc43439d6649898ecef6482e9b15bb3403bbb1a7 Mon Sep 17 00:00:00 2001
From: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Mon, 25 Mar 2013 23:21:48 +0000
Subject: [PATCH 34/38] New upstream release.

---
 debian/changelog | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1981b8388e..bc5f048e7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-gtk+3.0 (3.7.14-2) UNRELEASED; urgency=low
+gtk+3.0 (3.8.0-1) UNRELEASED; urgency=low
 
+  [ Rico Tzschichholz ]
   * debian/gtk-3-examples.install:
     - Install usr/bin/gtk3-demo-application
 
+  [ Emilio Pozuelo Monfort ]
+  * New upstream release.
+
  -- Rico Tzschichholz <ricotz@ubuntu.com>  Sun, 24 Mar 2013 09:31:41 +0100
 
 gtk+3.0 (3.7.14-1) experimental; urgency=low

From bae842f8b29de42a54a5571dc7379ed35671469f Mon Sep 17 00:00:00 2001
From: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Tue, 26 Mar 2013 10:21:17 +0000
Subject: [PATCH 35/38]   +
 debian/patches/071_fix-installation-of-HTML-images.patch:     - Refreshed.

---
 debian/changelog                                         | 2 ++
 debian/patches/071_fix-installation-of-HTML-images.patch | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bc5f048e7f..cbd20319e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ gtk+3.0 (3.8.0-1) UNRELEASED; urgency=low
 
   [ Emilio Pozuelo Monfort ]
   * New upstream release.
+    + debian/patches/071_fix-installation-of-HTML-images.patch:
+      - Refreshed.
 
  -- Rico Tzschichholz <ricotz@ubuntu.com>  Sun, 24 Mar 2013 09:31:41 +0100
 
diff --git a/debian/patches/071_fix-installation-of-HTML-images.patch b/debian/patches/071_fix-installation-of-HTML-images.patch
index ac2203c711..29a6ed81b0 100644
--- a/debian/patches/071_fix-installation-of-HTML-images.patch
+++ b/debian/patches/071_fix-installation-of-HTML-images.patch
@@ -13,7 +13,7 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=656803
 
 --- a/gtk-doc.make
 +++ b/gtk-doc.make
-@@ -173,8 +173,8 @@
+@@ -155,8 +155,8 @@
  	  if test -f $(abs_srcdir)/$$file ; then \
  	    cp $(abs_srcdir)/$$file $(abs_builddir)/html; \
  	  fi; \
@@ -23,4 +23,4 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=656803
 +	    cp $$file $(abs_builddir)/html; \
  	  fi; \
  	done;
- 	$(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
+ 	@echo '  DOC   Fixing cross-references'

From ac7fc861b5d26d052052cda41a68e341fc4f4527 Mon Sep 17 00:00:00 2001
From: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Tue, 26 Mar 2013 12:28:49 +0000
Subject: [PATCH 36/38] release to experimental

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cbd20319e9..e8250cf666 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-gtk+3.0 (3.8.0-1) UNRELEASED; urgency=low
+gtk+3.0 (3.8.0-1) experimental; urgency=low
 
   [ Rico Tzschichholz ]
   * debian/gtk-3-examples.install:
@@ -9,7 +9,7 @@ gtk+3.0 (3.8.0-1) UNRELEASED; urgency=low
     + debian/patches/071_fix-installation-of-HTML-images.patch:
       - Refreshed.
 
- -- Rico Tzschichholz <ricotz@ubuntu.com>  Sun, 24 Mar 2013 09:31:41 +0100
+ -- Emilio Pozuelo Monfort <pochu@debian.org>  Tue, 26 Mar 2013 11:21:30 +0100
 
 gtk+3.0 (3.7.14-1) experimental; urgency=low
 

From 8434c6e5d328d650437c37a2f5c71f3a58513cd8 Mon Sep 17 00:00:00 2001
From: Josselin Mouette <joss@debian.org>
Date: Wed, 8 May 2013 08:52:30 +0000
Subject: [PATCH 37/38] Switch to interest-noawait for triggers. They only
 affect IM modules, so this is not likely to cause upgrade problems.

---
 debian/changelog              | 7 +++++++
 debian/libgtk-3-0.triggers.in | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e8250cf666..dc8695edc9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gtk+3.0 (3.8.0-2) UNRELEASED; urgency=low
+
+  * Switch to interest-noawait for triggers. They only affect IM 
+    modules, so this is not likely to cause upgrade problems.
+
+ -- Josselin Mouette <joss@debian.org>  Wed, 08 May 2013 10:52:16 +0200
+
 gtk+3.0 (3.8.0-1) experimental; urgency=low
 
   [ Rico Tzschichholz ]
diff --git a/debian/libgtk-3-0.triggers.in b/debian/libgtk-3-0.triggers.in
index b40d2cc6e0..85a23ca097 100644
--- a/debian/libgtk-3-0.triggers.in
+++ b/debian/libgtk-3-0.triggers.in
@@ -1,2 +1,2 @@
-interest /@MODULES_BASE_PATH@/immodules
-interest /@OLD_MODULES_BASE_PATH@/immodules
+interest-noawait /@MODULES_BASE_PATH@/immodules
+interest-noawait /@OLD_MODULES_BASE_PATH@/immodules

From 5181b3ce76b68396c04e1b84c0705cf7d4c83a79 Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Thu, 23 May 2013 13:17:03 +0000
Subject: [PATCH 38/38] Merge changelog entries from unstable branch.

All other changes were patches cherry-picked from upstream.
---
 debian/changelog | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index dc8695edc9..975a6a470a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -127,6 +127,29 @@ gtk+3.0 (3.6.0-1) experimental; urgency=low
 
  -- Sjoerd Simons <sjoerd@debian.org>  Wed, 03 Oct 2012 09:07:16 +0200
 
+gtk+3.0 (3.4.2-6) unstable; urgency=low
+
+  * Team upload.
+  * debian/patches/076_check_wm_supports_hint.patch: This patch fixes the
+    size and placement of popup menus with some window managers, such as
+    Awesome and XMonad. Closes: #681974
+
+ -- Sébastien Villemot <sebastien@debian.org>  Thu, 31 Jan 2013 18:09:43 +0100
+
+gtk+3.0 (3.4.2-5) unstable; urgency=low
+
+  * debian/patches/075_gtkplug-fix-handling-of-key-events-for-layouts.patch:
+    This patch fixes handling of key events for different layouts in
+    GtkPlug. In particular, it fixes the keyboard layout switching from
+    gnome-screensaver when the screen is locked. Closes: #692235
+  * debian/libgtk-3-0.symbols: add gdk_x11_keymap_get_group_for_state and
+    gdk_x11_keymap_key_is_modifier which are introduced by the above patch
+    (actually backported from the 3.5.2 API).
+  * debian/rules: call dh_makeshlibs with -V 'libgtk-3-0 (>= 3.4.2-5~)',
+    since we introduced new public symbols in this Debian revision.
+
+ -- Sébastien Villemot <sebastien@debian.org>  Wed, 09 Jan 2013 11:00:22 +0100
+
 gtk+3.0 (3.4.2-4) unstable; urgency=low
 
   * debian/patches/074_try-harder-to-discriminate-Shift-F10-and-F10.patch: