r32702 - in /desktop/experimental/glib2.0/debian: ./ patches/
kov at users.alioth.debian.org
kov at users.alioth.debian.org
Fri Mar 2 03:43:56 UTC 2012
Author: kov
Date: Fri Mar 2 03:43:56 2012
New Revision: 32702
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=32702
Log:
glib2.0 (2.31.8-1) UNRELEASED; urgency=low
* New development release
* debian/patches/*:
- refreshed;
* debian/patches/95-gmain-get-rid-of-poll_waiting.patch,
debian/patches/96-fix-one-bit-mutex-test-on-some-platforms.patch,
debian/patches/97-silence-compiler-warnings.patch,
debian/patches/98-disable-two-more-GDBus-tests-using-fork.patch:
- removed; applied upstream
Removed:
desktop/experimental/glib2.0/debian/patches/95-gmain-get-rid-of-poll_waiting.patch
desktop/experimental/glib2.0/debian/patches/96-fix-one-bit-mutex-test-on-some-platforms.patch
desktop/experimental/glib2.0/debian/patches/97-silence-compiler-warnings.patch
desktop/experimental/glib2.0/debian/patches/98-disable-two-more-GDBus-tests-using-fork.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/04_homedir_env.patch
desktop/experimental/glib2.0/debian/patches/90-gio-modules-multiarch-compat.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=32702&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Fri Mar 2 03:43:56 2012
@@ -1,3 +1,16 @@
+glib2.0 (2.31.8-1) UNRELEASED; urgency=low
+
+ * New development release
+ * debian/patches/*:
+ - refreshed;
+ * debian/patches/95-gmain-get-rid-of-poll_waiting.patch,
+ debian/patches/96-fix-one-bit-mutex-test-on-some-platforms.patch,
+ debian/patches/97-silence-compiler-warnings.patch,
+ debian/patches/98-disable-two-more-GDBus-tests-using-fork.patch:
+ - removed; applied upstream
+
+ -- Gustavo Noronha Silva <kov at debian.org> Fri, 02 Mar 2012 00:34:30 -0300
+
glib2.0 (2.30.2-7) UNRELEASED; urgency=low
* libglib2.0-0.postinst.in:
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=32702&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 Mar 2 03:43:56 2012
@@ -1,19 +1,22 @@
# Description: If a .desktop file does not have inline translations, fall back to calling gettext.
+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL
# Ubuntu: https://launchpad.net/bugs/3935
# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=569829
-Index: glib2.0-2.30.0/glib/gkeyfile.c
+Index: glib2.0/glib/gkeyfile.c
===================================================================
---- glib2.0-2.30.0.orig/glib/gkeyfile.c 2011-09-26 22:54:50.000000000 +0200
-+++ glib2.0-2.30.0/glib/gkeyfile.c 2011-10-20 11:30:05.798960213 +0200
-@@ -88,6 +88,7 @@
+--- glib2.0.orig/glib/gkeyfile.c 2012-01-03 14:44:55.000000000 -0200
++++ glib2.0/glib/gkeyfile.c 2012-03-02 00:37:37.822554746 -0300
+@@ -446,6 +446,7 @@
GKeyFileFlags flags;
gchar **locales;
+ gchar *gettext_domain;
+
+ volatile gint ref_count;
};
-
- typedef struct _GKeyFileKeyValuePair GKeyFileKeyValuePair;
-@@ -217,6 +218,7 @@
+@@ -577,6 +578,7 @@
key_file->list_separator = ';';
key_file->flags = 0;
key_file->locales = g_strdupv ((gchar **)g_get_language_names ());
@@ -21,7 +24,7 @@
}
static void
-@@ -236,6 +238,12 @@
+@@ -596,6 +598,12 @@
key_file->parse_buffer = NULL;
}
@@ -34,7 +37,7 @@
tmp = key_file->groups;
while (tmp != NULL)
{
-@@ -455,6 +463,11 @@
+@@ -811,6 +819,11 @@
return FALSE;
}
@@ -46,7 +49,7 @@
return TRUE;
}
-@@ -561,6 +574,11 @@
+@@ -917,6 +930,11 @@
return FALSE;
}
@@ -58,7 +61,7 @@
return TRUE;
}
-@@ -1698,6 +1716,8 @@
+@@ -2098,6 +2116,8 @@
GError *key_file_error;
gchar **languages;
gboolean free_languages = FALSE;
@@ -67,7 +70,7 @@
gint i;
g_return_val_if_fail (key_file != NULL, NULL);
-@@ -1719,6 +1739,24 @@
+@@ -2119,6 +2139,24 @@
free_languages = FALSE;
}
@@ -92,7 +95,7 @@
for (i = 0; languages[i]; i++)
{
candidate_key = g_strdup_printf ("%s[%s]", key, languages[i]);
-@@ -1735,6 +1773,39 @@
+@@ -2135,6 +2173,39 @@
translated_value = NULL;
}
@@ -132,11 +135,11 @@
/* Fallback to untranslated key
*/
if (!translated_value)
-Index: glib2.0-2.30.0/glib/gkeyfile.h
+Index: glib2.0/glib/gkeyfile.h
===================================================================
---- glib2.0-2.30.0.orig/glib/gkeyfile.h 2011-09-09 21:58:10.000000000 +0200
-+++ glib2.0-2.30.0/glib/gkeyfile.h 2011-10-20 11:29:55.350960690 +0200
-@@ -256,6 +256,9 @@
+--- glib2.0.orig/glib/gkeyfile.h 2011-11-28 22:40:42.000000000 -0200
++++ glib2.0/glib/gkeyfile.h 2012-03-02 00:37:20.834470518 -0300
+@@ -258,6 +258,9 @@
#define G_KEY_FILE_DESKTOP_KEY_STARTUP_NOTIFY "StartupNotify"
#define G_KEY_FILE_DESKTOP_KEY_STARTUP_WM_CLASS "StartupWMClass"
#define G_KEY_FILE_DESKTOP_KEY_URL "URL"
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=32702&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 Mar 2 03:43:56 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: glib-2.30.0/glib/gkeyfile.c
+Index: glib2.0/glib/gkeyfile.c
===================================================================
---- glib-2.30.0.orig/glib/gkeyfile.c 2011-10-06 03:28:09.442777108 +0200
-+++ glib-2.30.0/glib/gkeyfile.c 2011-10-06 03:28:36.222440443 +0200
-@@ -467,6 +467,16 @@
+--- glib2.0.orig/glib/gkeyfile.c 2012-03-02 00:37:37.822554746 -0300
++++ glib2.0/glib/gkeyfile.c 2012-03-02 00:37:54.486637406 -0300
+@@ -823,6 +823,16 @@
G_KEY_FILE_DESKTOP_GROUP,
G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN,
NULL);
@@ -21,7 +21,7 @@
return TRUE;
}
-@@ -578,6 +588,16 @@
+@@ -934,6 +944,16 @@
G_KEY_FILE_DESKTOP_GROUP,
G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN,
NULL);
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=32702&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 Mar 2 03:43:56 2012
@@ -4,11 +4,11 @@
Author: Josselin Mouette <joss at debian.org>
Origin: vendor
-Index: glib-2.30.0/docs/reference/glib/running.sgml
+Index: glib2.0/docs/reference/glib/running.sgml
===================================================================
---- glib-2.30.0.orig/docs/reference/glib/running.sgml 2011-09-09 21:58:10.000000000 +0200
-+++ glib-2.30.0/docs/reference/glib/running.sgml 2011-10-06 03:28:39.730396342 +0200
-@@ -213,6 +213,22 @@
+--- glib2.0.orig/docs/reference/glib/running.sgml 2011-11-28 22:40:42.000000000 -0200
++++ glib2.0/docs/reference/glib/running.sgml 2012-03-02 00:38:00.230665860 -0300
+@@ -244,6 +244,22 @@
</para>
</formalpara>
@@ -31,11 +31,11 @@
</refsect2>
<refsect2 id="setlocale">
-Index: glib-2.30.0/glib/gutils.c
+Index: glib2.0/glib/gutils.c
===================================================================
---- glib-2.30.0.orig/glib/gutils.c 2011-09-26 22:54:50.000000000 +0200
-+++ glib-2.30.0/glib/gutils.c 2011-10-06 03:28:39.734396292 +0200
-@@ -1725,11 +1725,14 @@
+--- glib2.0.orig/glib/gutils.c 2012-01-03 14:44:55.000000000 -0200
++++ glib2.0/glib/gutils.c 2012-03-02 00:38:00.230665860 -0300
+@@ -686,11 +686,14 @@
}
#endif /* !G_OS_WIN32 */
@@ -51,7 +51,7 @@
/* Only believe HOME if it is an absolute path and exists */
if (g_home_dir)
-@@ -2025,6 +2028,11 @@
+@@ -986,6 +989,11 @@
* homedir = g_get_home_dir (<!-- -->);
* ]|
*
Modified: desktop/experimental/glib2.0/debian/patches/90-gio-modules-multiarch-compat.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/90-gio-modules-multiarch-compat.patch?rev=32702&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/90-gio-modules-multiarch-compat.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/90-gio-modules-multiarch-compat.patch [utf-8] Fri Mar 2 03:43:56 2012
@@ -1,8 +1,8 @@
-Index: glib2.0-2.29.18/gio/giomodule.c
+Index: glib2.0/gio/giomodule.c
===================================================================
---- glib2.0-2.29.18.orig/gio/giomodule.c 2011-08-30 06:09:51.000000000 +0200
-+++ glib2.0-2.29.18/gio/giomodule.c 2011-09-02 08:25:45.715970977 +0200
-@@ -765,6 +765,8 @@
+--- glib2.0.orig/gio/giomodule.c 2012-01-03 14:44:55.000000000 -0200
++++ glib2.0/gio/giomodule.c 2012-03-02 00:38:06.442696696 -0300
+@@ -897,6 +897,8 @@
/* Then load the compiled in path */
g_io_modules_scan_all_in_directory_with_scope (GIO_MODULE_DIR, scope);
Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=32702&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series [utf-8] Fri Mar 2 03:43:56 2012
@@ -4,7 +4,3 @@
04_homedir_env.patch
61_glib-compile-schemas-path.patch
90-gio-modules-multiarch-compat.patch
-95-gmain-get-rid-of-poll_waiting.patch
-96-fix-one-bit-mutex-test-on-some-platforms.patch
-97-silence-compiler-warnings.patch
-98-disable-two-more-GDBus-tests-using-fork.patch
More information about the pkg-gnome-commits
mailing list