r35792 - in /desktop/experimental/gtk+3.0/debian: ./ patches/ tests/
sjoerd at users.alioth.debian.org
sjoerd at users.alioth.debian.org
Sun Sep 23 21:06:40 UTC 2012
Author: sjoerd
Date: Sun Sep 23 21:06:40 2012
New Revision: 35792
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35792
Log:
* 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
Added:
desktop/experimental/gtk+3.0/debian/tests/
desktop/experimental/gtk+3.0/debian/tests/build (with props)
desktop/experimental/gtk+3.0/debian/tests/control
desktop/experimental/gtk+3.0/debian/tests/python3-gi (with props)
Removed:
desktop/experimental/gtk+3.0/debian/patches/072_statusicon_icon_size.patch
desktop/experimental/gtk+3.0/debian/patches/073_transparent_colors.patch
desktop/experimental/gtk+3.0/debian/patches/074_try-harder-to-discriminate-Shift-F10-and-F10.patch
Modified:
desktop/experimental/gtk+3.0/debian/changelog
desktop/experimental/gtk+3.0/debian/control
desktop/experimental/gtk+3.0/debian/control.in
desktop/experimental/gtk+3.0/debian/libgtk-3-0.symbols
desktop/experimental/gtk+3.0/debian/libgtk-3-bin.install
desktop/experimental/gtk+3.0/debian/patches/016_no_offscreen_widgets_grabbing.patch
desktop/experimental/gtk+3.0/debian/patches/017_no_offscreen_device_grabbing.patch
desktop/experimental/gtk+3.0/debian/patches/018_gdkenumtypes.c_location.patch
desktop/experimental/gtk+3.0/debian/patches/022_disable-viqr-im-for-vi-locale.patch
desktop/experimental/gtk+3.0/debian/patches/042_treeview_single-focus.patch
desktop/experimental/gtk+3.0/debian/patches/043_notebook_scroll.patch
desktop/experimental/gtk+3.0/debian/patches/044_tracker_fts.patch
desktop/experimental/gtk+3.0/debian/patches/061_multiarch_module_fallback.patch
desktop/experimental/gtk+3.0/debian/patches/series
desktop/experimental/gtk+3.0/debian/rules
Modified: desktop/experimental/gtk+3.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/changelog?rev=35792&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/changelog [utf-8] Sun Sep 23 21:06:40 2012
@@ -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 at 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:
Modified: desktop/experimental/gtk+3.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/control?rev=35792&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/control [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/control [utf-8] Sun Sep 23 21:06:40 2012
@@ -2,7 +2,7 @@
Section: libs
Priority: optional
Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Michael Biebl <biebl at debian.org>
+Uploaders: Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
Build-Depends: debhelper (>= 8.1.3),
cdbs (>= 0.4.93),
gnome-pkg-tools (>= 0.11),
@@ -12,10 +12,11 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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
Modified: desktop/experimental/gtk+3.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/control.in?rev=35792&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/control.in [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/control.in [utf-8] Sun Sep 23 21:06:40 2012
@@ -12,10 +12,11 @@
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 @@
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 @@
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 @@
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 @@
@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 @@
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 @@
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
Modified: desktop/experimental/gtk+3.0/debian/libgtk-3-0.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/libgtk-3-0.symbols?rev=35792&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/libgtk-3-0.symbols [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/libgtk-3-0.symbols [utf-8] Sun Sep 23 21:06:40 2012
@@ -542,7 +542,9 @@
gdk_x11_get_xatom_name at Base 3.0.0
gdk_x11_get_xatom_name_for_display at Base 3.0.0
gdk_x11_grab_server at Base 3.0.0
+ gdk_x11_keymap_get_group_for_state at Base 3.5.2
gdk_x11_keymap_get_type at Base 3.0.0
+ gdk_x11_keymap_key_is_modifier at Base 3.5.2
gdk_x11_lookup_xdisplay at Base 3.0.0
gdk_x11_register_standard_event_type at Base 3.0.0
gdk_x11_screen_get_monitor_output at Base 3.0.0
@@ -623,6 +625,7 @@
gtk_accel_label_get_type at Base 3.0.0
gtk_accel_label_new at Base 3.0.0
gtk_accel_label_refetch at Base 3.0.0
+ gtk_accel_label_set_accel at Base 3.5.18
gtk_accel_label_set_accel_closure at Base 3.0.0
gtk_accel_label_set_accel_widget at Base 3.0.0
gtk_accel_map_add_entry at Base 3.0.0
@@ -686,6 +689,7 @@
gtk_action_group_add_radio_actions_full at Base 3.0.0
gtk_action_group_add_toggle_actions at Base 3.0.0
gtk_action_group_add_toggle_actions_full at Base 3.0.0
+ gtk_action_group_get_accel_group at Base 3.5.18
gtk_action_group_get_action at Base 3.0.0
gtk_action_group_get_name at Base 3.0.0
gtk_action_group_get_sensitive at Base 3.0.0
@@ -694,6 +698,7 @@
gtk_action_group_list_actions at Base 3.0.0
gtk_action_group_new at Base 3.0.0
gtk_action_group_remove_action at Base 3.0.0
+ gtk_action_group_set_accel_group at Base 3.5.18
gtk_action_group_set_sensitive at Base 3.0.0
gtk_action_group_set_translate_func at Base 3.0.0
gtk_action_group_set_translation_domain at Base 3.0.0
@@ -794,9 +799,11 @@
gtk_app_chooser_widget_set_show_recommended at Base 3.0.0
gtk_application_add_accelerator at Base 3.3.16
gtk_application_add_window at Base 3.0.0
+ gtk_application_get_active_window at Base 3.5.12
gtk_application_get_app_menu at Base 3.3.16
gtk_application_get_menubar at Base 3.3.16
gtk_application_get_type at Base 3.0.0
+ gtk_application_get_window_by_id at Base 3.5.4
gtk_application_get_windows at Base 3.0.0
gtk_application_inhibit at Base 3.3.16
gtk_application_inhibit_flags_get_type at Base 3.3.16
@@ -807,6 +814,7 @@
gtk_application_set_app_menu at Base 3.3.16
gtk_application_set_menubar at Base 3.3.16
gtk_application_uninhibit at Base 3.3.16
+ gtk_application_window_get_id at Base 3.5.4
gtk_application_window_get_show_menubar at Base 3.3.16
gtk_application_window_get_type at Base 3.3.16
gtk_application_window_new at Base 3.3.16
@@ -920,6 +928,7 @@
gtk_button_clicked at Base 3.0.0
gtk_button_enter at Base 3.0.0
gtk_button_get_alignment at Base 3.0.0
+ gtk_button_get_always_show_image at Base 3.5.4
gtk_button_get_event_window at Base 3.0.0
gtk_button_get_focus_on_click at Base 3.0.0
gtk_button_get_image at Base 3.0.0
@@ -937,6 +946,7 @@
gtk_button_pressed at Base 3.0.0
gtk_button_released at Base 3.0.0
gtk_button_set_alignment at Base 3.0.0
+ gtk_button_set_always_show_image at Base 3.5.4
gtk_button_set_focus_on_click at Base 3.0.0
gtk_button_set_image at Base 3.0.0
gtk_button_set_image_position at Base 3.0.0
@@ -1441,6 +1451,7 @@
gtk_entry_completion_set_text_column at Base 3.0.0
gtk_entry_get_activates_default at Base 3.0.0
gtk_entry_get_alignment at Base 3.0.0
+ gtk_entry_get_attributes at Base 3.5.14
gtk_entry_get_buffer at Base 3.0.0
gtk_entry_get_completion at Base 3.0.0
gtk_entry_get_current_icon_drag_source at Base 3.0.0
@@ -1458,6 +1469,8 @@
gtk_entry_get_icon_tooltip_markup at Base 3.0.0
gtk_entry_get_icon_tooltip_text at Base 3.0.0
gtk_entry_get_inner_border at Base 3.0.0
+ gtk_entry_get_input_hints at Base 3.5.12
+ gtk_entry_get_input_purpose at Base 3.5.12
gtk_entry_get_invisible_char at Base 3.0.0
gtk_entry_get_layout at Base 3.0.0
gtk_entry_get_layout_offsets at Base 3.0.0
@@ -1481,6 +1494,7 @@
gtk_entry_reset_im_context at Base 3.0.0
gtk_entry_set_activates_default at Base 3.0.0
gtk_entry_set_alignment at Base 3.0.0
+ gtk_entry_set_attributes at Base 3.5.14
gtk_entry_set_buffer at Base 3.0.0
gtk_entry_set_completion at Base 3.0.0
gtk_entry_set_cursor_hadjustment at Base 3.0.0
@@ -1495,6 +1509,8 @@
gtk_entry_set_icon_tooltip_markup at Base 3.0.0
gtk_entry_set_icon_tooltip_text at Base 3.0.0
gtk_entry_set_inner_border at Base 3.0.0
+ gtk_entry_set_input_hints at Base 3.5.12
+ gtk_entry_set_input_purpose at Base 3.5.12
gtk_entry_set_invisible_char at Base 3.0.0
gtk_entry_set_max_length at Base 3.0.0
gtk_entry_set_overwrite_mode at Base 3.0.0
@@ -1852,6 +1868,7 @@
gtk_icon_view_drop_position_get_type at Base 3.0.0
gtk_icon_view_enable_model_drag_dest at Base 3.0.0
gtk_icon_view_enable_model_drag_source at Base 3.0.0
+ gtk_icon_view_get_cell_rect at Base 3.5.6
gtk_icon_view_get_column_spacing at Base 3.0.0
gtk_icon_view_get_columns at Base 3.0.0
gtk_icon_view_get_cursor at Base 3.0.0
@@ -1990,6 +2007,8 @@
gtk_init at Base 3.0.0
gtk_init_check at Base 3.0.0
gtk_init_with_args at Base 3.0.0
+ gtk_input_hints_get_type at Base 3.5.12
+ gtk_input_purpose_get_type at Base 3.5.12
gtk_invisible_get_screen at Base 3.0.0
gtk_invisible_get_type at Base 3.0.0
gtk_invisible_new at Base 3.0.0
@@ -2055,6 +2074,21 @@
gtk_layout_set_hadjustment at Base 3.0.0
gtk_layout_set_size at Base 3.0.0
gtk_layout_set_vadjustment at Base 3.0.0
+ gtk_level_bar_add_offset_value at Base 3.5.8
+ gtk_level_bar_get_max_value at Base 3.5.8
+ gtk_level_bar_get_min_value at Base 3.5.8
+ gtk_level_bar_get_mode at Base 3.5.8
+ gtk_level_bar_get_offset_value at Base 3.5.8
+ gtk_level_bar_get_type at Base 3.5.8
+ gtk_level_bar_get_value at Base 3.5.8
+ gtk_level_bar_mode_get_type at Base 3.5.8
+ gtk_level_bar_new at Base 3.5.8
+ gtk_level_bar_new_for_interval at Base 3.5.8
+ gtk_level_bar_remove_offset_value at Base 3.5.8
+ gtk_level_bar_set_max_value at Base 3.5.8
+ gtk_level_bar_set_min_value at Base 3.5.8
+ gtk_level_bar_set_mode at Base 3.5.8
+ gtk_level_bar_set_value at Base 3.5.8
gtk_license_get_type at Base 3.0.0
gtk_link_button_get_type at Base 3.0.0
gtk_link_button_get_uri at Base 3.0.0
@@ -2104,6 +2138,18 @@
gtk_menu_bar_new_from_model at Base 3.3.16
gtk_menu_bar_set_child_pack_direction at Base 3.0.0
gtk_menu_bar_set_pack_direction at Base 3.0.0
+ gtk_menu_button_get_align_widget at Base 3.5.6
+ gtk_menu_button_get_direction at Base 3.5.6
+ gtk_menu_button_get_menu at Base 3.5.6
+ gtk_menu_button_get_menu_model at Base 3.5.6
+ gtk_menu_button_get_popup at Base 3.5.12
+ gtk_menu_button_get_type at Base 3.5.6
+ gtk_menu_button_new at Base 3.5.6
+ gtk_menu_button_set_align_widget at Base 3.5.6
+ gtk_menu_button_set_direction at Base 3.5.6
+ gtk_menu_button_set_menu at Base 3.5.6
+ gtk_menu_button_set_menu_model at Base 3.5.6
+ gtk_menu_button_set_popup at Base 3.5.12
gtk_menu_detach at Base 3.0.0
gtk_menu_direction_type_get_type at Base 3.0.0
gtk_menu_get_accel_group at Base 3.0.0
@@ -2154,6 +2200,7 @@
gtk_menu_set_title at Base 3.0.0
gtk_menu_shell_activate_item at Base 3.0.0
gtk_menu_shell_append at Base 3.0.0
+ gtk_menu_shell_bind_model at Base 3.5.18
gtk_menu_shell_cancel at Base 3.0.0
gtk_menu_shell_deactivate at Base 3.0.0
gtk_menu_shell_deselect at Base 3.0.0
@@ -2931,6 +2978,8 @@
gtk_scrolled_window_set_shadow_type at Base 3.0.0
gtk_scrolled_window_set_vadjustment at Base 3.0.0
gtk_scrolled_window_unset_placement at Base 3.0.0
+ gtk_search_entry_get_type at Base 3.5.6
+ gtk_search_entry_new at Base 3.5.6
gtk_selection_add_target at Base 3.0.0
gtk_selection_add_targets at Base 3.0.0
gtk_selection_clear_targets at Base 3.0.0
@@ -3510,6 +3559,8 @@
gtk_text_view_get_editable at Base 3.0.0
gtk_text_view_get_hadjustment at Base 3.0.0
gtk_text_view_get_indent at Base 3.0.0
+ gtk_text_view_get_input_hints at Base 3.5.12
+ gtk_text_view_get_input_purpose at Base 3.5.12
gtk_text_view_get_iter_at_location at Base 3.0.0
gtk_text_view_get_iter_at_position at Base 3.0.0
gtk_text_view_get_iter_location at Base 3.0.0
@@ -3546,6 +3597,8 @@
gtk_text_view_set_cursor_visible at Base 3.0.0
gtk_text_view_set_editable at Base 3.0.0
gtk_text_view_set_indent at Base 3.0.0
+ gtk_text_view_set_input_hints at Base 3.5.12
+ gtk_text_view_set_input_purpose at Base 3.5.12
gtk_text_view_set_justification at Base 3.0.0
gtk_text_view_set_left_margin at Base 3.0.0
gtk_text_view_set_overwrite at Base 3.0.0
@@ -4190,6 +4243,7 @@
gtk_widget_hide_on_delete at Base 3.0.0
gtk_widget_in_destruction at Base 3.0.0
gtk_widget_input_shape_combine_region at Base 3.0.0
+ gtk_widget_insert_action_group at Base 3.5.12
gtk_widget_intersect at Base 3.0.0
gtk_widget_is_ancestor at Base 3.0.0
gtk_widget_is_composited at Base 3.0.0
Modified: desktop/experimental/gtk+3.0/debian/libgtk-3-bin.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/libgtk-3-bin.install?rev=35792&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/libgtk-3-bin.install [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/libgtk-3-bin.install [utf-8] Sun Sep 23 21:06:40 2012
@@ -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
Modified: desktop/experimental/gtk+3.0/debian/patches/016_no_offscreen_widgets_grabbing.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/016_no_offscreen_widgets_grabbing.patch?rev=35792&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/016_no_offscreen_widgets_grabbing.patch [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/016_no_offscreen_widgets_grabbing.patch [utf-8] Sun Sep 23 21:06:40 2012
@@ -3,11 +3,11 @@
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;
Modified: desktop/experimental/gtk+3.0/debian/patches/017_no_offscreen_device_grabbing.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/017_no_offscreen_device_grabbing.patch?rev=35792&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/017_no_offscreen_device_grabbing.patch [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/017_no_offscreen_device_grabbing.patch [utf-8] Sun Sep 23 21:06:40 2012
@@ -3,11 +3,11 @@
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;
Modified: desktop/experimental/gtk+3.0/debian/patches/018_gdkenumtypes.c_location.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/018_gdkenumtypes.c_location.patch?rev=35792&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/018_gdkenumtypes.c_location.patch [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/018_gdkenumtypes.c_location.patch [utf-8] Sun Sep 23 21:06:40 2012
@@ -18,10 +18,10 @@
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 @@
-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
Modified: desktop/experimental/gtk+3.0/debian/patches/022_disable-viqr-im-for-vi-locale.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/022_disable-viqr-im-for-vi-locale.patch?rev=35792&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/022_disable-viqr-im-for-vi-locale.patch [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/022_disable-viqr-im-for-vi-locale.patch [utf-8] Sun Sep 23 21:06:40 2012
@@ -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 */
Modified: desktop/experimental/gtk+3.0/debian/patches/042_treeview_single-focus.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/042_treeview_single-focus.patch?rev=35792&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/042_treeview_single-focus.patch [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/042_treeview_single-focus.patch [utf-8] Sun Sep 23 21:06:40 2012
@@ -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)
{
Modified: desktop/experimental/gtk+3.0/debian/patches/043_notebook_scroll.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/043_notebook_scroll.patch?rev=35792&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/043_notebook_scroll.patch [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/043_notebook_scroll.patch [utf-8] Sun Sep 23 21:06:40 2012
@@ -4,11 +4,11 @@
* works from the whole area
See GNOME #630226 and #145244
-Index: gtk+-3.3.16/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 @@
+Index: gtk+-3.2.2/gtk/gtkcalendar.c
+===================================================================
+--- 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 @@
if (event->direction == GDK_SCROLL_UP)
{
if (!gtk_widget_has_focus (widget))
-Index: gtk+-3.3.16/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 @@
+Index: gtk+-3.2.2/gtk/gtkcombobox.c
+===================================================================
+--- 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 @@
if (!gtk_combo_box_get_active_iter (combo_box, &iter))
return TRUE;
-Index: gtk+-3.3.16/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 @@
+Index: gtk+-3.2.2/gtk/gtkmenu.c
+===================================================================
+--- 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 @@
switch (event->direction)
{
case GDK_SCROLL_RIGHT:
-Index: gtk+-3.3.16/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 @@
+Index: gtk+-3.2.2/gtk/gtknotebook.c
+===================================================================
+--- 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 @@
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 @@
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 @@
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 @@
static GList*
get_tab_at_pos (GtkNotebook *notebook, gint x, gint y)
{
-Index: gtk+-3.3.16/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 @@
+Index: gtk+-3.2.2/gtk/gtkpathbar.c
+===================================================================
+--- 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 @@
switch (event->direction)
{
case GDK_SCROLL_RIGHT:
-Index: gtk+-3.3.16/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 @@
+Index: gtk+-3.2.2/gtk/gtkrange.c
+===================================================================
+--- 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 @@
if (gtk_widget_get_realized (widget))
{
gdouble delta;
-Index: gtk+-3.3.16/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
+Index: gtk+-3.2.2/gtk/gtkscalebutton.c
+===================================================================
+--- 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 @@
d = gtk_scale_button_get_value (button);
if (event->direction == GDK_SCROLL_UP)
{
-Index: gtk+-3.3.16/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 @@
+Index: gtk+-3.2.2/gtk/gtkscrolledwindow.c
+===================================================================
+--- 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 @@
if (event->direction == GDK_SCROLL_UP || event->direction == GDK_SCROLL_DOWN)
range = priv->vscrollbar;
else
-Index: gtk+-3.3.16/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 @@
+Index: gtk+-3.2.2/gtk/gtkspinbutton.c
+===================================================================
+--- 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 @@
if (event->direction == GDK_SCROLL_UP)
{
if (!gtk_widget_has_focus (widget))
-Index: gtk+-3.3.16/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 @@
+Index: gtk+-3.2.2/gtk/gtktreeview.c
+===================================================================
+--- 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;
Modified: desktop/experimental/gtk+3.0/debian/patches/044_tracker_fts.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/044_tracker_fts.patch?rev=35792&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/044_tracker_fts.patch [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/044_tracker_fts.patch [utf-8] Sun Sep 23 21:06:40 2012
@@ -3,10 +3,10 @@
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.
Modified: desktop/experimental/gtk+3.0/debian/patches/061_multiarch_module_fallback.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/061_multiarch_module_fallback.patch?rev=35792&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/061_multiarch_module_fallback.patch [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/061_multiarch_module_fallback.patch [utf-8] Sun Sep 23 21:06:40 2012
@@ -5,19 +5,19 @@
Author: Steve Langasek <steve.langasek at 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 @@
+ 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);
+
Modified: desktop/experimental/gtk+3.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/patches/series?rev=35792&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/patches/series [utf-8] Sun Sep 23 21:06:40 2012
@@ -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
Modified: desktop/experimental/gtk+3.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/rules?rev=35792&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/rules [utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/rules [utf-8] Sun Sep 23 21:06:40 2012
@@ -76,7 +76,10 @@
--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
Added: desktop/experimental/gtk+3.0/debian/tests/build
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/tests/build?rev=35792&op=file
==============================================================================
--- desktop/experimental/gtk+3.0/debian/tests/build (added)
+++ desktop/experimental/gtk+3.0/debian/tests/build [utf-8] Sun Sep 23 21:06:40 2012
@@ -1,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 at 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"
Propchange: desktop/experimental/gtk+3.0/debian/tests/build
------------------------------------------------------------------------------
svn:executable = *
Added: desktop/experimental/gtk+3.0/debian/tests/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/tests/control?rev=35792&op=file
==============================================================================
--- desktop/experimental/gtk+3.0/debian/tests/control (added)
+++ desktop/experimental/gtk+3.0/debian/tests/control [utf-8] Sun Sep 23 21:06:40 2012
@@ -1,0 +1,2 @@
+Tests: build python3-gi
+Depends: libgtk-3-dev, build-essential, xvfb, python3-gi, gir1.2-gtk-3.0
Added: desktop/experimental/gtk+3.0/debian/tests/python3-gi
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/tests/python3-gi?rev=35792&op=file
==============================================================================
--- desktop/experimental/gtk+3.0/debian/tests/python3-gi (added)
+++ desktop/experimental/gtk+3.0/debian/tests/python3-gi [utf-8] Sun Sep 23 21:06:40 2012
@@ -1,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
+
Propchange: desktop/experimental/gtk+3.0/debian/tests/python3-gi
------------------------------------------------------------------------------
svn:executable = *
More information about the pkg-gnome-commits
mailing list