r35541 - in /desktop/experimental/glib2.0/debian: ./ patches/
laney at users.alioth.debian.org
laney at users.alioth.debian.org
Mon Jul 16 14:57:35 UTC 2012
Author: laney
Date: Mon Jul 16 14:57:32 2012
New Revision: 35541
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35541
Log:
releasing version 2.33.4-1
Removed:
desktop/experimental/glib2.0/debian/patches/00git_socket_test_timespan_jitter.patch
desktop/experimental/glib2.0/debian/patches/07_contenttype_test_fix_overflow.patch
desktop/experimental/glib2.0/debian/patches/08_contenttype_known_test_failure.patch
desktop/experimental/glib2.0/debian/patches/09_valuetransform_ulong_bool.patch
desktop/experimental/glib2.0/debian/patches/11_timeout_test_reduce_race.patch
Modified:
desktop/experimental/glib2.0/debian/changelog
desktop/experimental/glib2.0/debian/control
desktop/experimental/glib2.0/debian/control.in
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/series
Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=35541&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Mon Jul 16 14:57:32 2012
@@ -1,8 +1,15 @@
-glib2.0 (2.33.3-3) UNRELEASED; urgency=low
-
+glib2.0 (2.33.4-1) experimental; urgency=low
+
+ [ Martin Pitt ]
* debian/rules: Make tests always fatal on Ubuntu.
- -- Martin Pitt <mpitt at debian.org> Thu, 28 Jun 2012 07:18:26 +0200
+ [ Iain Lane ]
+ * New upstream release 2.33.4.
+ * Refresh patches to apply cleanly and remove those applied upstream.
+ * Bump version on libpcre-dev BD in line with upstream.
+ * debian/libglib2.0-0.symbols: Add new symbols in this release.
+
+ -- Iain Lane <laney at debian.org> Mon, 16 Jul 2012 11:55:30 +0100
glib2.0 (2.33.3-2) 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=35541&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/control [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/control [utf-8] Mon Jul 16 14:57:32 2012
@@ -12,7 +12,7 @@
gnome-pkg-tools (>= 0.11),
dpkg-dev (>= 1.16.0),
libelf-dev,
- libpcre3-dev (>= 8.11),
+ libpcre3-dev (>= 8.13),
desktop-file-utils,
gtk-doc-tools (>= 1.15),
libselinux1-dev [linux-any],
Modified: desktop/experimental/glib2.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/control.in?rev=35541&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/control.in [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/control.in [utf-8] Mon Jul 16 14:57:32 2012
@@ -12,7 +12,7 @@
gnome-pkg-tools (>= 0.11),
dpkg-dev (>= 1.16.0),
libelf-dev,
- libpcre3-dev (>= 8.11),
+ libpcre3-dev (>= 8.13),
desktop-file-utils,
gtk-doc-tools (>= 1.15),
libselinux1-dev [linux-any],
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=35541&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] Mon Jul 16 14:57:32 2012
@@ -117,6 +117,8 @@
g_async_result_get_source_object at Base 2.16.0
g_async_result_get_type at Base 2.16.0
g_async_result_get_user_data at Base 2.16.0
+ g_async_result_is_tagged at Base 2.33.4
+ g_async_result_legacy_propagate_error at Base 2.33.4
g_buffered_input_stream_fill at Base 2.16.0
g_buffered_input_stream_fill_async at Base 2.16.0
g_buffered_input_stream_fill_finish at Base 2.16.0
@@ -2578,6 +2580,7 @@
g_regex_escape_string at Base 2.14.0
g_regex_get_capture_count at Base 2.14.0
g_regex_get_compile_flags at Base 2.26.0
+ g_regex_get_has_cr_or_lf at Base 2.33.4
g_regex_get_match_flags at Base 2.26.0
g_regex_get_max_backref at Base 2.14.0
g_regex_get_pattern at Base 2.14.0
@@ -2758,10 +2761,12 @@
g_spaced_primes_closest at Base 2.12.0
g_spawn_async at Base 2.12.0
g_spawn_async_with_pipes at Base 2.12.0
+ g_spawn_check_exit_status at Base 2.33.4
g_spawn_close_pid at Base 2.12.0
g_spawn_command_line_async at Base 2.12.0
g_spawn_command_line_sync at Base 2.12.0
g_spawn_error_quark at Base 2.12.0
+ g_spawn_exit_error_quark at Base 2.33.4
g_spawn_sync at Base 2.12.0
g_sprintf at Base 2.12.0
g_stat at Base 2.12.0
@@ -2828,6 +2833,7 @@
g_string_equal at Base 2.12.0
g_string_erase at Base 2.12.0
g_string_free at Base 2.12.0
+ g_string_free_to_bytes at Base 2.33.4
g_string_hash at Base 2.12.0
g_string_insert at Base 2.12.0
g_string_insert_c 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=35541&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] Mon Jul 16 14:57:32 2012
@@ -4,10 +4,10 @@
## Bug: bug URL
# Ubuntu: https://launchpad.net/bugs/3935
# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=569829
-Index: glib2.0/glib/gkeyfile.c
+Index: b/glib/gkeyfile.c
===================================================================
---- glib2.0.orig/glib/gkeyfile.c 2012-02-20 22:10:54.000000000 -0200
-+++ glib2.0/glib/gkeyfile.c 2012-03-02 19:33:42.972567490 -0300
+--- a/glib/gkeyfile.c
++++ b/glib/gkeyfile.c
@@ -443,6 +443,7 @@
GKeyFileFlags flags;
@@ -16,7 +16,7 @@
volatile gint ref_count;
};
-@@ -573,6 +574,7 @@
+@@ -572,6 +573,7 @@
key_file->list_separator = ';';
key_file->flags = 0;
key_file->locales = g_strdupv ((gchar **)g_get_language_names ());
@@ -24,7 +24,7 @@
}
static void
-@@ -592,6 +594,12 @@
+@@ -591,6 +593,12 @@
key_file->parse_buffer = NULL;
}
@@ -37,7 +37,7 @@
tmp = key_file->groups;
while (tmp != NULL)
{
-@@ -807,6 +815,11 @@
+@@ -806,6 +814,11 @@
return FALSE;
}
@@ -49,7 +49,7 @@
return TRUE;
}
-@@ -912,6 +925,11 @@
+@@ -911,6 +924,11 @@
return FALSE;
}
@@ -61,7 +61,7 @@
return TRUE;
}
-@@ -2091,6 +2109,8 @@
+@@ -2086,6 +2104,8 @@
GError *key_file_error;
gchar **languages;
gboolean free_languages = FALSE;
@@ -70,7 +70,7 @@
gint i;
g_return_val_if_fail (key_file != NULL, NULL);
-@@ -2112,6 +2132,24 @@
+@@ -2107,6 +2127,24 @@
free_languages = FALSE;
}
@@ -95,7 +95,7 @@
for (i = 0; languages[i]; i++)
{
candidate_key = g_strdup_printf ("%s[%s]", key, languages[i]);
-@@ -2128,6 +2166,39 @@
+@@ -2123,6 +2161,39 @@
translated_value = NULL;
}
@@ -135,10 +135,10 @@
/* Fallback to untranslated key
*/
if (!translated_value)
-Index: glib2.0/glib/gkeyfile.h
+Index: b/glib/gkeyfile.h
===================================================================
---- glib2.0.orig/glib/gkeyfile.h 2012-02-20 18:23:17.000000000 -0200
-+++ glib2.0/glib/gkeyfile.h 2012-03-02 19:33:42.972567490 -0300
+--- a/glib/gkeyfile.h
++++ b/glib/gkeyfile.h
@@ -258,6 +258,9 @@
#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=35541&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] Mon Jul 16 14:57:32 2012
@@ -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/glib/gkeyfile.c
+Index: b/glib/gkeyfile.c
===================================================================
---- glib2.0.orig/glib/gkeyfile.c 2012-03-02 19:33:42.972567490 -0300
-+++ glib2.0/glib/gkeyfile.c 2012-03-02 19:33:48.168593255 -0300
-@@ -819,6 +819,16 @@
+--- a/glib/gkeyfile.c
++++ b/glib/gkeyfile.c
+@@ -818,6 +818,16 @@
G_KEY_FILE_DESKTOP_GROUP,
G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN,
NULL);
@@ -21,7 +21,7 @@
return TRUE;
}
-@@ -929,6 +939,16 @@
+@@ -928,6 +938,16 @@
G_KEY_FILE_DESKTOP_GROUP,
G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN,
NULL);
Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=35541&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series [utf-8] Mon Jul 16 14:57:32 2012
@@ -1,14 +1,9 @@
-00git_socket_test_timespan_jitter.patch
01_gettext-desktopfiles.patch
02_gettext-desktopfiles-ubuntu.patch
04_homedir_env.patch
05_run-gio-tests-with-a-dbus-session.patch
06_thread_test_ignore_prctl_fail.patch
-07_contenttype_test_fix_overflow.patch
-08_contenttype_known_test_failure.patch
-09_valuetransform_ulong_bool.patch
10_increase_gapplication_test_delay.patch
-11_timeout_test_reduce_race.patch
61_glib-compile-binaries-path.patch
90_gio-modules-multiarch-compat.patch
91_revert_schema_path_warning.patch
More information about the pkg-gnome-commits
mailing list