r35666 - in /desktop/experimental/glib2.0/debian: ./ patches/
mpitt at users.alioth.debian.org
mpitt at users.alioth.debian.org
Tue Sep 4 11:58:03 UTC 2012
Author: mpitt
Date: Tue Sep 4 11:58:02 2012
New Revision: 35666
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35666
Log:
new upstream release 2.33.12
Removed:
desktop/experimental/glib2.0/debian/patches/07_test_method_calls_on_proxy_bump_max_time.patch
Modified:
desktop/experimental/glib2.0/debian/changelog
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/05_run-gio-tests-with-a-dbus-session.patch
desktop/experimental/glib2.0/debian/patches/91_revert_pcre_8.31_test.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=35666&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Tue Sep 4 11:58:02 2012
@@ -1,4 +1,4 @@
-glib2.0 (2.33.10-1) UNRELEASED; urgency=low
+glib2.0 (2.33.12-1) UNRELEASED; urgency=low
[ Sebastien Bacher ]
* New upstream version
@@ -22,6 +22,11 @@
more resilient to this.
* Add 08_disable_gapplication_basic_test.patch: Disable /gapplication/basic
test. It's full of race conditions and keeps breaking builds.
+
+ [ Robert Ancell ]
+ * New upstream bugfix release (LP: #1045608)
+ * Drop 07_test_method_calls_on_proxy_bump_max_time.patch:
+ - Applied upstream
-- Sebastien Bacher <seb128 at ubuntu.com> Tue, 21 Aug 2012 13:10:43 +0200
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=35666&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] Tue Sep 4 11:58:02 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: b/glib/gkeyfile.c
+Index: glib-2.33.12/glib/gkeyfile.c
===================================================================
---- a/glib/gkeyfile.c
-+++ b/glib/gkeyfile.c
+--- glib-2.33.12.orig/glib/gkeyfile.c 2012-08-29 13:27:51.000000000 +1200
++++ glib-2.33.12/glib/gkeyfile.c 2012-09-04 14:42:46.956116941 +1200
@@ -443,6 +443,7 @@
GKeyFileFlags flags;
@@ -16,7 +16,7 @@
volatile gint ref_count;
};
-@@ -572,6 +573,7 @@
+@@ -567,6 +568,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
-@@ -591,6 +593,12 @@
+@@ -586,6 +588,12 @@
key_file->parse_buffer = NULL;
}
@@ -37,7 +37,7 @@
tmp = key_file->groups;
while (tmp != NULL)
{
-@@ -806,6 +814,11 @@
+@@ -801,6 +809,11 @@
return FALSE;
}
@@ -49,7 +49,7 @@
return TRUE;
}
-@@ -911,6 +924,11 @@
+@@ -906,6 +919,11 @@
return FALSE;
}
@@ -61,7 +61,7 @@
return TRUE;
}
-@@ -2086,6 +2104,8 @@
+@@ -2081,6 +2099,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);
-@@ -2107,6 +2127,24 @@
+@@ -2102,6 +2122,24 @@
free_languages = FALSE;
}
@@ -95,7 +95,7 @@
for (i = 0; languages[i]; i++)
{
candidate_key = g_strdup_printf ("%s[%s]", key, languages[i]);
-@@ -2123,6 +2161,39 @@
+@@ -2118,6 +2156,39 @@
translated_value = NULL;
}
@@ -135,10 +135,10 @@
/* Fallback to untranslated key
*/
if (!translated_value)
-Index: b/glib/gkeyfile.h
+Index: glib-2.33.12/glib/gkeyfile.h
===================================================================
---- a/glib/gkeyfile.h
-+++ b/glib/gkeyfile.h
+--- glib-2.33.12.orig/glib/gkeyfile.h 2012-03-12 13:42:41.000000000 +1300
++++ glib-2.33.12/glib/gkeyfile.h 2012-09-04 14:42:46.956116941 +1200
@@ -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=35666&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] Tue Sep 4 11:58:02 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: b/glib/gkeyfile.c
+Index: glib-2.33.12/glib/gkeyfile.c
===================================================================
---- a/glib/gkeyfile.c
-+++ b/glib/gkeyfile.c
-@@ -818,6 +818,16 @@
+--- glib-2.33.12.orig/glib/gkeyfile.c 2012-09-04 14:42:46.956116941 +1200
++++ glib-2.33.12/glib/gkeyfile.c 2012-09-04 14:42:50.160116830 +1200
+@@ -813,6 +813,16 @@
G_KEY_FILE_DESKTOP_GROUP,
G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN,
NULL);
@@ -21,7 +21,7 @@
return TRUE;
}
-@@ -928,6 +938,16 @@
+@@ -923,6 +933,16 @@
G_KEY_FILE_DESKTOP_GROUP,
G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN,
NULL);
Modified: desktop/experimental/glib2.0/debian/patches/05_run-gio-tests-with-a-dbus-session.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/05_run-gio-tests-with-a-dbus-session.patch?rev=35666&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/05_run-gio-tests-with-a-dbus-session.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/05_run-gio-tests-with-a-dbus-session.patch [utf-8] Tue Sep 4 11:58:02 2012
@@ -11,10 +11,10 @@
gio/tests/Makefile.am | 3 +++
2 files changed, 4 insertions(+), 1 deletions(-)
-Index: glib-2.30.0/Makefile.decl
+Index: glib-2.33.12/Makefile.decl
===================================================================
---- glib-2.30.0.orig/Makefile.decl 2011-09-15 02:01:00.000000000 +0200
-+++ glib-2.30.0/Makefile.decl 2011-10-06 03:28:05.378828199 +0200
+--- glib-2.33.12.orig/Makefile.decl 2012-08-25 13:14:10.000000000 +1200
++++ glib-2.33.12/Makefile.decl 2012-09-04 14:42:52.872116736 +1200
@@ -1,7 +1,7 @@
# GLIB - Library of useful C routines
@@ -24,10 +24,10 @@
GTESTER_REPORT = $(top_builddir)/glib/gtester-report # for the GLIB package
# initialize variables for unconditional += appending
-Index: glib-2.30.0/gio/tests/Makefile.am
+Index: glib-2.33.12/gio/tests/Makefile.am
===================================================================
---- glib-2.30.0.orig/gio/tests/Makefile.am 2011-09-26 22:54:58.000000000 +0200
-+++ glib-2.30.0/gio/tests/Makefile.am 2011-10-06 03:28:05.382828149 +0200
+--- glib-2.33.12.orig/gio/tests/Makefile.am 2012-09-04 02:24:05.000000000 +1200
++++ glib-2.33.12/gio/tests/Makefile.am 2012-09-04 14:42:52.872116736 +1200
@@ -6,6 +6,9 @@
SUBDIRS = gdbus-object-manager-example
@@ -36,5 +36,5 @@
+GTESTER_ENV = dbus-launch
+
INCLUDES = \
- -g \
+ -DG_LOG_DOMAIN=\"GLib-GIO\" \
$(gio_INCLUDES) \
Modified: desktop/experimental/glib2.0/debian/patches/91_revert_pcre_8.31_test.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/91_revert_pcre_8.31_test.patch?rev=35666&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/91_revert_pcre_8.31_test.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/91_revert_pcre_8.31_test.patch [utf-8] Tue Sep 4 11:58:02 2012
@@ -1,11 +1,11 @@
Description: Revert new regex test from 2.33.4 which depends on pcre 8.31. In Debian we still have 8.30, and we are building against the system library instead of the bundled one.
Author: Martin Pitt <martin.pitt at ubuntu.com>
-Index: glib2.0-exp/glib/tests/regex.c
+Index: glib-2.33.12/glib/tests/regex.c
===================================================================
---- glib2.0-exp.orig/glib/tests/regex.c 2012-07-15 03:11:28.000000000 +0200
-+++ glib2.0-exp/glib/tests/regex.c 2012-07-18 14:39:35.631520519 +0200
-@@ -2165,8 +2165,10 @@
+--- glib-2.33.12.orig/glib/tests/regex.c 2012-08-28 16:08:02.000000000 +1200
++++ glib-2.33.12/glib/tests/regex.c 2012-09-04 14:43:42.108115030 +1200
+@@ -2201,8 +2201,10 @@
TEST_NEW_FAIL ("^\\c€", 0, G_REGEX_ERROR_INVALID_CONTROL_CHAR);
TEST_NEW_FAIL ("\\k", 0, G_REGEX_ERROR_MISSING_NAME);
TEST_NEW_FAIL ("a[\\NB]c", 0, G_REGEX_ERROR_NOT_SUPPORTED_IN_CLASS);
Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=35666&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series [utf-8] Tue Sep 4 11:58:02 2012
@@ -3,7 +3,6 @@
04_homedir_env.patch
05_run-gio-tests-with-a-dbus-session.patch
06_thread_test_ignore_prctl_fail.patch
-07_test_method_calls_on_proxy_bump_max_time.patch
08_disable_gapplication_basic_test.patch
10_increase_gapplication_test_delay.patch
61_glib-compile-binaries-path.patch
More information about the pkg-gnome-commits
mailing list