r25451 - in /desktop/experimental/glib2.0/debian: ./ patches/
slomo at users.alioth.debian.org
slomo at users.alioth.debian.org
Fri Oct 29 09:24:43 UTC 2010
Author: slomo
Date: Fri Oct 29 09:24:39 2010
New Revision: 25451
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=25451
Log:
* New upstream development release:
+ debian/patches/70_fix-header-cleaup-fallout.patch:
- Dropped, merged upstream.
+ debian/patches/*:
- Refreshed.
* debian/libglib2.0-0.symbols
+ Updated
Removed:
desktop/experimental/glib2.0/debian/patches/70_fix-header-cleaup-fallout.patch
Modified:
desktop/experimental/glib2.0/debian/changelog
desktop/experimental/glib2.0/debian/control
desktop/experimental/glib2.0/debian/libglib2.0-0.symbols
desktop/experimental/glib2.0/debian/patches/01_gettext-desktopfiles.patch
desktop/experimental/glib2.0/debian/patches/02_gettext-desktopfiles-ubuntu.patch
desktop/experimental/glib2.0/debian/patches/03_blacklist-directories.patch
desktop/experimental/glib2.0/debian/patches/04_homedir_env.patch
desktop/experimental/glib2.0/debian/patches/60_wait-longer-for-threads-to-die.patch
desktop/experimental/glib2.0/debian/patches/61_glib-compile-schemas-path.patch
desktop/experimental/glib2.0/debian/patches/series
desktop/experimental/glib2.0/debian/rules
Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=25451&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Fri Oct 29 09:24:39 2010
@@ -1,9 +1,19 @@
-glib2.0 (2.27.0-2) UNRELEASED; urgency=low
-
+glib2.0 (2.27.1-1) experimental; urgency=low
+
+ [ Josselin Mouette ]
* Drop lynx dependency in the -doc package. Suggest devhelp instead.
Closes: #599743.
- -- Josselin Mouette <joss at debian.org> Tue, 19 Oct 2010 09:09:00 +0200
+ [ Sebastian Dröge ]
+ * New upstream development release:
+ + debian/patches/70_fix-header-cleaup-fallout.patch:
+ - Dropped, merged upstream.
+ + debian/patches/*:
+ - Refreshed.
+ * debian/libglib2.0-0.symbols
+ + Updated
+
+ -- Sebastian Dröge <slomo at debian.org> Fri, 29 Oct 2010 11:08:10 +0200
glib2.0 (2.27.0-1) experimental; urgency=low
Modified: desktop/experimental/glib2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/control?rev=25451&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/control [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/control [utf-8] Fri Oct 29 09:24:39 2010
@@ -2,7 +2,7 @@
Section: libs
Priority: optional
Maintainer: Loic Minier <lool at dooz.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Sebastian Dröge <slomo at debian.org>
Build-Depends: debhelper (>> 5.0.22),
pkg-config (>= 0.16.0),
gettext,
Modified: desktop/experimental/glib2.0/debian/libglib2.0-0.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/libglib2.0-0.symbols?rev=25451&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/libglib2.0-0.symbols [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/libglib2.0-0.symbols [utf-8] Fri Oct 29 09:24:39 2010
@@ -1,28 +1,28 @@
libgio-2.0.so.0 libglib2.0-0 #MINVER#
* Build-Depends-Package: libglib2.0-dev
- g_action_activate at Base 2.27.0
- g_action_get_enabled at Base 2.27.0
- g_action_get_name at Base 2.27.0
- g_action_get_parameter_type at Base 2.27.0
- g_action_get_state at Base 2.27.0
- g_action_get_state_hint at Base 2.27.0
- g_action_get_state_type at Base 2.27.0
- g_action_get_type at Base 2.27.0
- g_action_group_action_added at Base 2.27.0
- g_action_group_action_enabled_changed at Base 2.27.0
- g_action_group_action_removed at Base 2.27.0
- g_action_group_action_state_changed at Base 2.27.0
- g_action_group_activate at Base 2.27.0
- g_action_group_get_enabled at Base 2.27.0
- g_action_group_get_parameter_type at Base 2.27.0
- g_action_group_get_state at Base 2.27.0
- g_action_group_get_state_hint at Base 2.27.0
- g_action_group_get_state_type at Base 2.27.0
- g_action_group_get_type at Base 2.27.0
- g_action_group_has_action at Base 2.27.0
- g_action_group_list_actions at Base 2.27.0
- g_action_group_set_state at Base 2.27.0
- g_action_set_state at Base 2.27.0
+ g_action_activate at Base 2.27.1
+ g_action_get_enabled at Base 2.27.1
+ g_action_get_name at Base 2.27.1
+ g_action_get_parameter_type at Base 2.27.1
+ g_action_get_state at Base 2.27.1
+ g_action_get_state_hint at Base 2.27.1
+ g_action_get_state_type at Base 2.27.1
+ g_action_get_type at Base 2.27.1
+ g_action_group_action_added at Base 2.27.1
+ g_action_group_action_enabled_changed at Base 2.27.1
+ g_action_group_action_removed at Base 2.27.1
+ g_action_group_action_state_changed at Base 2.27.1
+ g_action_group_activate_action at Base 2.27.1
+ g_action_group_change_action_state at Base 2.27.1
+ g_action_group_get_action_enabled at Base 2.27.1
+ g_action_group_get_action_parameter_type at Base 2.27.1
+ g_action_group_get_action_state at Base 2.27.1
+ g_action_group_get_action_state_hint at Base 2.27.1
+ g_action_group_get_action_state_type at Base 2.27.1
+ g_action_group_get_type at Base 2.27.1
+ g_action_group_has_action at Base 2.27.1
+ g_action_group_list_actions at Base 2.27.1
+ g_action_set_state at Base 2.27.1
g_app_info_add_supports_type at Base 2.16.0
g_app_info_can_delete at Base 2.20.0
g_app_info_can_remove_supports_type at Base 2.16.0
@@ -58,23 +58,34 @@
g_app_launch_context_get_type at Base 2.16.0
g_app_launch_context_launch_failed at Base 2.16.0
g_app_launch_context_new at Base 2.16.0
- g_application_add_action at Base 2.27.0
- g_application_get_action_description at Base 2.27.0
- g_application_get_action_enabled at Base 2.27.0
- g_application_get_id at Base 2.27.0
- g_application_get_instance at Base 2.27.0
- g_application_get_type at Base 2.27.0
- g_application_invoke_action at Base 2.27.0
- g_application_is_remote at Base 2.27.0
- g_application_list_actions at Base 2.27.0
- g_application_new at Base 2.27.0
- g_application_quit_with_data at Base 2.27.0
- g_application_register at Base 2.27.0
- g_application_remove_action at Base 2.27.0
- g_application_run at Base 2.27.0
- g_application_set_action_enabled at Base 2.27.0
- g_application_try_new at Base 2.27.0
- g_application_unregistered_try_new at Base 2.27.0
+ g_application_activate at Base 2.27.1
+ g_application_command_line_get_arguments at Base 2.27.1
+ g_application_command_line_get_cwd at Base 2.27.1
+ g_application_command_line_get_exit_status at Base 2.27.1
+ g_application_command_line_get_is_remote at Base 2.27.1
+ g_application_command_line_get_platform_data at Base 2.27.1
+ g_application_command_line_get_type at Base 2.27.1
+ g_application_command_line_print at Base 2.27.1
+ g_application_command_line_printerr at Base 2.27.1
+ g_application_command_line_set_exit_status at Base 2.27.1
+ g_application_flags_get_type at Base 2.27.1
+ g_application_get_application_id at Base 2.27.1
+ g_application_get_flags at Base 2.27.1
+ g_application_get_inactivity_timeout at Base 2.27.1
+ g_application_get_is_registered at Base 2.27.1
+ g_application_get_is_remote at Base 2.27.1
+ g_application_get_type at Base 2.27.1
+ g_application_hold at Base 2.27.1
+ g_application_id_is_valid at Base 2.27.1
+ g_application_new at Base 2.27.1
+ g_application_open at Base 2.27.1
+ g_application_register at Base 2.27.1
+ g_application_release at Base 2.27.1
+ g_application_run at Base 2.27.1
+ g_application_set_action_group at Base 2.27.1
+ g_application_set_application_id at Base 2.27.1
+ g_application_set_flags at Base 2.27.1
+ g_application_set_inactivity_timeout at Base 2.27.1
g_ask_password_flags_get_type at Base 2.16.0
g_async_initable_get_type at Base 2.22.0
g_async_initable_init_async at Base 2.22.0
@@ -414,8 +425,6 @@
g_desktop_app_info_get_filename at Base 2.24.0
g_desktop_app_info_get_is_hidden at Base 2.16.0
g_desktop_app_info_get_type at Base 2.16.0
- g_desktop_app_info_lookup_get_default_for_uri_scheme at Base 2.16.0
- g_desktop_app_info_lookup_get_type at Base 2.16.0
g_desktop_app_info_new at Base 2.16.0
g_desktop_app_info_new_from_filename at Base 2.16.0
g_desktop_app_info_new_from_keyfile at Base 2.18.0
@@ -883,6 +892,15 @@
g_output_stream_write_async at Base 2.16.0
g_output_stream_write_finish at Base 2.16.0
g_password_save_get_type at Base 2.16.0
+ g_periodic_add at Base 2.27.1
+ g_periodic_block at Base 2.27.1
+ g_periodic_damaged at Base 2.27.1
+ g_periodic_get_hz at Base 2.27.1
+ g_periodic_get_priority at Base 2.27.1
+ g_periodic_get_type at Base 2.27.1
+ g_periodic_new at Base 2.27.1
+ g_periodic_remove at Base 2.27.1
+ g_periodic_unblock at Base 2.27.1
g_permission_acquire at Base 2.26.0
g_permission_acquire_async at Base 2.26.0
g_permission_acquire_finish at Base 2.26.0
@@ -959,6 +977,7 @@
g_settings_get_has_unapplied at Base 2.26.0
g_settings_get_int at Base 2.26.0
g_settings_get_mapped at Base 2.26.0
+ g_settings_get_range at Base 2.27.1
g_settings_get_string at Base 2.26.0
g_settings_get_strv at Base 2.26.0
g_settings_get_type at Base 2.26.0
@@ -967,10 +986,12 @@
g_settings_list_children at Base 2.26.0
g_settings_list_schemas at Base 2.26.0
g_settings_list_keys at Base 2.26.0
+ g_settings_list_relocatable_schemas at Base 2.27.1
g_settings_new at Base 2.26.0
g_settings_new_with_backend at Base 2.26.0
g_settings_new_with_backend_and_path at Base 2.26.0
g_settings_new_with_path at Base 2.26.0
+ g_settings_range_check at Base 2.27.1
g_settings_reset at Base 2.26.0
g_settings_revert at Base 2.26.0
g_settings_set at Base 2.26.0
@@ -984,16 +1005,16 @@
g_settings_set_value at Base 2.26.0
g_settings_sync at Base 2.26.0
g_settings_unbind at Base 2.26.0
- g_simple_action_get_parameter_type at Base 2.27.0
- g_simple_action_get_type at Base 2.27.0
- g_simple_action_group_get_type at Base 2.27.0
- g_simple_action_group_insert at Base 2.27.0
- g_simple_action_group_lookup at Base 2.27.0
- g_simple_action_group_new at Base 2.27.0
- g_simple_action_group_remove at Base 2.27.0
- g_simple_action_new at Base 2.27.0
- g_simple_action_new_stateful at Base 2.27.0
- g_simple_action_set_enabled at Base 2.27.0
+ g_simple_action_get_parameter_type at Base 2.27.1
+ g_simple_action_get_type at Base 2.27.1
+ g_simple_action_group_get_type at Base 2.27.1
+ g_simple_action_group_insert at Base 2.27.1
+ g_simple_action_group_lookup at Base 2.27.1
+ g_simple_action_group_new at Base 2.27.1
+ g_simple_action_group_remove at Base 2.27.1
+ g_simple_action_new at Base 2.27.1
+ g_simple_action_new_stateful at Base 2.27.1
+ g_simple_action_set_enabled at Base 2.27.1
g_simple_async_report_error_in_idle at Base 2.16.0
g_simple_async_report_gerror_in_idle at Base 2.16.0
g_simple_async_result_complete at Base 2.16.0
@@ -1528,7 +1549,7 @@
g_date_time_get_seconds at Base 2.26.0
g_date_time_get_timezone_abbreviation at Base 2.26.0
g_date_time_get_utc_offset at Base 2.26.0
-#MISSING: 2.27.0# g_date_time_get_week_numbering_year at Base 2.26.0
+ g_date_time_get_week_numbering_year at Base 2.27.1
g_date_time_get_week_of_year at Base 2.26.0
g_date_time_get_year at Base 2.26.0
g_date_time_get_ymd at Base 2.26.0
@@ -1821,6 +1842,8 @@
g_main_context_find_source_by_user_data at Base 2.12.0
g_main_context_get_poll_func at Base 2.12.0
g_main_context_get_thread_default at Base 2.22.0
+ g_main_context_invoke at Base 2.27.1
+ g_main_context_invoke_full at Base 2.27.1
g_main_context_is_owner at Base 2.12.0
g_main_context_iteration at Base 2.12.0
g_main_context_new at Base 2.12.0
@@ -2168,7 +2191,7 @@
g_slice_alloc0 at Base 2.12.0
g_slice_alloc at Base 2.12.0
g_slice_copy at Base 2.14.0
- g_slice_debug_tree_statistics at Base 2.27.0
+ g_slice_debug_tree_statistics at Base 2.27.1
g_slice_free1 at Base 2.12.0
g_slice_free_chain_with_offset at Base 2.12.0
g_slice_get_config at Base 2.12.0
@@ -2405,11 +2428,11 @@
g_time_val_add at Base 2.12.0
g_time_val_from_iso8601 at Base 2.12.0
g_time_val_to_iso8601 at Base 2.12.0
- g_time_zone_adjust_time at Base 2.27.0
- g_time_zone_find_interval at Base 2.27.0
- g_time_zone_get_abbreviation at Base 2.27.0
- g_time_zone_get_offset at Base 2.27.0
- g_time_zone_is_dst at Base 2.27.0
+ g_time_zone_adjust_time at Base 2.27.1
+ g_time_zone_find_interval at Base 2.27.1
+ g_time_zone_get_abbreviation at Base 2.27.1
+ g_time_zone_get_offset at Base 2.27.1
+ g_time_zone_is_dst at Base 2.27.1
g_time_zone_new at Base 2.26.0
g_time_zone_new_local at Base 2.26.0
g_time_zone_new_utc at Base 2.26.0
@@ -2872,6 +2895,7 @@
g_pointer_type_register_static at Base 2.12.0
g_ptr_array_get_type at Base 2.22.0
g_regex_get_type at Base 2.14.0
+ g_signal_accumulator_first_wins at Base 2.27.1
g_signal_accumulator_true_handled at Base 2.12.0
g_signal_add_emission_hook at Base 2.12.0
g_signal_chain_from_overridden at Base 2.12.0
Modified: desktop/experimental/glib2.0/debian/patches/01_gettext-desktopfiles.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/01_gettext-desktopfiles.patch?rev=25451&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/01_gettext-desktopfiles.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/01_gettext-desktopfiles.patch [utf-8] Fri Oct 29 09:24:39 2010
@@ -1,11 +1,11 @@
# Description: If a .desktop file does not have inline translations, fall back to calling gettext.
# Ubuntu: https://launchpad.net/bugs/3935
# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=569829
-Index: glib2.0-2.25.10/glib/gkeyfile.c
+Index: glib2.0-2.27.1/glib/gkeyfile.c
===================================================================
---- glib2.0-2.25.10.orig/glib/gkeyfile.c 2010-05-14 00:39:17.000000000 +0200
-+++ glib2.0-2.25.10/glib/gkeyfile.c 2010-06-24 20:01:19.717054931 +0200
-@@ -88,6 +88,7 @@
+--- glib2.0-2.27.1.orig/glib/gkeyfile.c 2010-10-29 11:10:23.128015726 +0200
++++ glib2.0-2.27.1/glib/gkeyfile.c 2010-10-29 11:10:33.728025481 +0200
+@@ -87,6 +87,7 @@
GKeyFileFlags flags;
gchar **locales;
@@ -13,7 +13,7 @@
};
typedef struct _GKeyFileKeyValuePair GKeyFileKeyValuePair;
-@@ -214,6 +215,7 @@
+@@ -213,6 +214,7 @@
key_file->list_separator = ';';
key_file->flags = 0;
key_file->locales = g_strdupv ((gchar **)g_get_language_names ());
@@ -21,7 +21,7 @@
}
static void
-@@ -233,6 +235,12 @@
+@@ -232,6 +234,12 @@
key_file->parse_buffer = NULL;
}
@@ -34,7 +34,7 @@
tmp = key_file->groups;
while (tmp != NULL)
{
-@@ -452,6 +460,11 @@
+@@ -451,6 +459,11 @@
return FALSE;
}
@@ -46,7 +46,7 @@
return TRUE;
}
-@@ -558,6 +571,11 @@
+@@ -557,6 +570,11 @@
return FALSE;
}
@@ -58,7 +58,7 @@
return TRUE;
}
-@@ -1666,6 +1684,8 @@
+@@ -1665,6 +1683,8 @@
GError *key_file_error;
gchar **languages;
gboolean free_languages = FALSE;
@@ -67,7 +67,7 @@
gint i;
g_return_val_if_fail (key_file != NULL, NULL);
-@@ -1696,6 +1716,23 @@
+@@ -1695,6 +1715,23 @@
free_languages = FALSE;
}
@@ -91,7 +91,7 @@
for (i = 0; languages[i]; i++)
{
candidate_key = g_strdup_printf ("%s[%s]", key, languages[i]);
-@@ -1712,6 +1749,39 @@
+@@ -1711,6 +1748,39 @@
translated_value = NULL;
}
@@ -131,10 +131,10 @@
/* Fallback to untranslated key
*/
if (!translated_value)
-Index: glib2.0-2.25.10/glib/gkeyfile.h
+Index: glib2.0-2.27.1/glib/gkeyfile.h
===================================================================
---- glib2.0-2.25.10.orig/glib/gkeyfile.h 2010-05-14 00:39:17.000000000 +0200
-+++ glib2.0-2.25.10/glib/gkeyfile.h 2010-06-24 20:01:19.717054931 +0200
+--- glib2.0-2.27.1.orig/glib/gkeyfile.h 2010-10-29 11:10:23.148047043 +0200
++++ glib2.0-2.27.1/glib/gkeyfile.h 2010-10-29 11:10:33.728025481 +0200
@@ -256,6 +256,7 @@
#define G_KEY_FILE_DESKTOP_KEY_STARTUP_NOTIFY "StartupNotify"
#define G_KEY_FILE_DESKTOP_KEY_STARTUP_WM_CLASS "StartupWMClass"
Modified: desktop/experimental/glib2.0/debian/patches/02_gettext-desktopfiles-ubuntu.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/02_gettext-desktopfiles-ubuntu.patch?rev=25451&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/02_gettext-desktopfiles-ubuntu.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/02_gettext-desktopfiles-ubuntu.patch [utf-8] Fri Oct 29 09:24:39 2010
@@ -1,10 +1,10 @@
# Description: Provide backwards compatibility for 01_gettext-desktopfiles.patch for X-{Debian,Ubuntu}-Gettext-Domain
# UbuntuSpecific: 01_gettext-desktopfiles.patch was changed to use X-GNOME-, so this is necessary until all our .desktop files are converted
-Index: glib2.0-2.25.10/glib/gkeyfile.c
+Index: glib2.0-2.27.1/glib/gkeyfile.c
===================================================================
---- glib2.0-2.25.10.orig/glib/gkeyfile.c 2010-06-24 20:01:19.717054931 +0200
-+++ glib2.0-2.25.10/glib/gkeyfile.c 2010-06-24 20:01:22.033914262 +0200
-@@ -464,6 +464,16 @@
+--- glib2.0-2.27.1.orig/glib/gkeyfile.c 2010-10-29 11:10:33.728025481 +0200
++++ glib2.0-2.27.1/glib/gkeyfile.c 2010-10-29 11:10:35.448015302 +0200
+@@ -463,6 +463,16 @@
G_KEY_FILE_DESKTOP_GROUP,
G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN,
NULL);
@@ -21,7 +21,7 @@
return TRUE;
}
-@@ -575,6 +585,16 @@
+@@ -574,6 +584,16 @@
G_KEY_FILE_DESKTOP_GROUP,
G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN,
NULL);
Modified: desktop/experimental/glib2.0/debian/patches/03_blacklist-directories.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/03_blacklist-directories.patch?rev=25451&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/03_blacklist-directories.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/03_blacklist-directories.patch [utf-8] Fri Oct 29 09:24:39 2010
@@ -1,8 +1,8 @@
-Index: glib2.0-2.25.10/gio/gunixmounts.c
+Index: glib2.0-2.27.1/gio/gunixmounts.c
===================================================================
---- glib2.0-2.25.10.orig/gio/gunixmounts.c 2010-06-20 19:59:40.000000000 +0200
-+++ glib2.0-2.25.10/gio/gunixmounts.c 2010-06-24 20:01:24.869942012 +0200
-@@ -228,6 +228,8 @@
+--- glib2.0-2.27.1.orig/gio/gunixmounts.c 2010-10-29 11:10:22.908025740 +0200
++++ glib2.0-2.27.1/gio/gunixmounts.c 2010-10-29 11:10:36.637026690 +0200
+@@ -227,6 +227,8 @@
"/home",
"/lib",
"/lib64",
@@ -11,7 +11,7 @@
"/media",
"/mnt",
"/opt",
-@@ -238,7 +240,12 @@
+@@ -237,7 +239,12 @@
"/usr",
"/usr/local",
"/var",
Modified: desktop/experimental/glib2.0/debian/patches/04_homedir_env.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/04_homedir_env.patch?rev=25451&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/04_homedir_env.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/04_homedir_env.patch [utf-8] Fri Oct 29 09:24:39 2010
@@ -1,10 +1,10 @@
-Index: glib2.0-2.25.10/docs/reference/glib/running.sgml
+Index: glib2.0-2.27.1/docs/reference/glib/running.sgml
===================================================================
---- glib2.0-2.25.10.orig/docs/reference/glib/running.sgml 2010-06-12 20:04:32.000000000 +0200
-+++ glib2.0-2.25.10/docs/reference/glib/running.sgml 2010-06-24 20:01:26.150959575 +0200
-@@ -202,6 +202,22 @@
+--- glib2.0-2.27.1.orig/docs/reference/glib/running.sgml 2010-10-29 11:10:22.844016204 +0200
++++ glib2.0-2.27.1/docs/reference/glib/running.sgml 2010-10-29 11:10:37.680025596 +0200
+@@ -213,6 +213,22 @@
</para>
- </formalpara>
+ </formalpara>
+<formalpara id="G_HOME">
+ <title><envar>G_HOME</envar></title>
@@ -25,11 +25,11 @@
</refsect2>
<refsect2 id="setlocale">
-Index: glib2.0-2.25.10/glib/gutils.c
+Index: glib2.0-2.27.1/glib/gutils.c
===================================================================
---- glib2.0-2.25.10.orig/glib/gutils.c 2010-06-12 20:04:33.000000000 +0200
-+++ glib2.0-2.25.10/glib/gutils.c 2010-06-24 20:01:26.152917925 +0200
-@@ -1552,11 +1552,14 @@
+--- glib2.0-2.27.1.orig/glib/gutils.c 2010-10-29 11:10:22.820046747 +0200
++++ glib2.0-2.27.1/glib/gutils.c 2010-10-29 11:10:37.684013883 +0200
+@@ -1565,11 +1565,14 @@
}
#endif /* !G_OS_WIN32 */
@@ -45,7 +45,7 @@
/* Only believe HOME if it is an absolute path and exists */
if (g_home_dir)
-@@ -1852,6 +1855,11 @@
+@@ -1865,6 +1868,11 @@
* homedir = g_get_home_dir (<!-- -->);
* ]|
*
Modified: desktop/experimental/glib2.0/debian/patches/60_wait-longer-for-threads-to-die.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/60_wait-longer-for-threads-to-die.patch?rev=25451&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/60_wait-longer-for-threads-to-die.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/60_wait-longer-for-threads-to-die.patch [utf-8] Fri Oct 29 09:24:39 2010
@@ -1,7 +1,7 @@
-Index: glib2.0-2.25.10/tests/threadpool-test.c
+Index: glib2.0-2.27.1/tests/threadpool-test.c
===================================================================
---- glib2.0-2.25.10.orig/tests/threadpool-test.c 2010-04-08 08:10:50.000000000 +0200
-+++ glib2.0-2.25.10/tests/threadpool-test.c 2010-06-24 20:01:27.297087713 +0200
+--- glib2.0-2.27.1.orig/tests/threadpool-test.c 2010-10-29 11:10:22.752016315 +0200
++++ glib2.0-2.27.1/tests/threadpool-test.c 2010-10-29 11:10:38.769022868 +0200
@@ -5,8 +5,8 @@
#include <glib.h>
Modified: desktop/experimental/glib2.0/debian/patches/61_glib-compile-schemas-path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/61_glib-compile-schemas-path.patch?rev=25451&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/61_glib-compile-schemas-path.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/61_glib-compile-schemas-path.patch [utf-8] Fri Oct 29 09:24:39 2010
@@ -1,5 +1,7 @@
---- glib2.0-2.25.11/gio-2.0.pc.in.old 2010-07-13 14:03:37.614340022 +0200
-+++ glib2.0-2.25.11/gio-2.0.pc.in 2010-07-13 14:04:49.323833657 +0200
+Index: glib2.0-2.27.1/gio-2.0.pc.in
+===================================================================
+--- glib2.0-2.27.1.orig/gio-2.0.pc.in 2010-10-29 11:10:22.684015913 +0200
++++ glib2.0-2.27.1/gio-2.0.pc.in 2010-10-29 11:10:40.136014067 +0200
@@ -4,7 +4,7 @@
includedir=@includedir@
Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=25451&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series [utf-8] Fri Oct 29 09:24:39 2010
@@ -4,4 +4,3 @@
04_homedir_env.patch
60_wait-longer-for-threads-to-die.patch
61_glib-compile-schemas-path.patch
-70_fix-header-cleaup-fallout.patch
Modified: desktop/experimental/glib2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/rules?rev=25451&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/rules [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/rules [utf-8] Fri Oct 29 09:24:39 2010
@@ -43,7 +43,7 @@
APIVER := 2.0
SONAME := 0
-SHVER := 2.27.0
+SHVER := 2.27.1
# package names
SHARED_PKG := libglib$(APIVER)-$(SONAME)
More information about the pkg-gnome-commits
mailing list