r40630 - in /desktop/experimental/glib2.0/debian: ./ patches/
ah at users.alioth.debian.org
ah at users.alioth.debian.org
Tue Feb 18 18:51:36 UTC 2014
Author: ah
Date: Tue Feb 18 18:51:36 2014
New Revision: 40630
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40630
Log:
Use quilt to refresh remaining patches.
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/10_kfreebsd_issetugid_prototype.patch
desktop/experimental/glib2.0/debian/patches/61_glib-compile-binaries-path.patch
desktop/experimental/glib2.0/debian/patches/Don-t-use-a-parallel-build-for-the-documentation.patch
Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=40630&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Tue Feb 18 18:51:36 2014
@@ -5,6 +5,7 @@
- 0001-glib-tests-collate.c-run-to-completion-when-skipping.patch
- 0002-g_test_run-return-0-if-all-tests-are-skipped-in-TAP-.patch
* Fix fuzz to make debian/patches/04_homedir_env.patch apply again.
+ * Use quilt to refresh remaining patches.
-- Andreas Henriksson <andreas at fatal.se> Tue, 18 Feb 2014 19:36:34 +0100
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=40630&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 Feb 18 18:51:36 2014
@@ -6,7 +6,7 @@
# Upstream: http://bugzilla.gnome.org/show_bug.cgi?id=569829
--- a/glib/gkeyfile.c
+++ b/glib/gkeyfile.c
-@@ -445,6 +445,7 @@
+@@ -442,6 +442,7 @@
GKeyFileFlags flags;
gchar **locales;
@@ -14,7 +14,7 @@
volatile gint ref_count;
};
-@@ -569,6 +570,7 @@
+@@ -566,6 +567,7 @@
key_file->list_separator = ';';
key_file->flags = 0;
key_file->locales = g_strdupv ((gchar **)g_get_language_names ());
@@ -22,7 +22,7 @@
}
static void
-@@ -588,6 +590,12 @@
+@@ -585,6 +587,12 @@
key_file->parse_buffer = NULL;
}
@@ -35,7 +35,7 @@
tmp = key_file->groups;
while (tmp != NULL)
{
-@@ -803,6 +811,11 @@
+@@ -800,6 +808,11 @@
return FALSE;
}
@@ -47,7 +47,7 @@
return TRUE;
}
-@@ -908,6 +921,11 @@
+@@ -905,6 +918,11 @@
return FALSE;
}
@@ -59,7 +59,7 @@
return TRUE;
}
-@@ -2083,6 +2101,8 @@
+@@ -2080,6 +2098,8 @@
GError *key_file_error;
gchar **languages;
gboolean free_languages = FALSE;
@@ -68,7 +68,7 @@
gint i;
g_return_val_if_fail (key_file != NULL, NULL);
-@@ -2104,6 +2124,24 @@
+@@ -2101,6 +2121,24 @@
free_languages = FALSE;
}
@@ -93,7 +93,7 @@
for (i = 0; languages[i]; i++)
{
candidate_key = g_strdup_printf ("%s[%s]", key, languages[i]);
-@@ -2120,6 +2158,39 @@
+@@ -2117,6 +2155,39 @@
translated_value = NULL;
}
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=40630&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 Feb 18 18:51:36 2014
@@ -2,7 +2,7 @@
# UbuntuSpecific: 01_gettext-desktopfiles.patch was changed to use X-GNOME-, so this is necessary until all our .desktop files are converted
--- a/glib/gkeyfile.c
+++ b/glib/gkeyfile.c
-@@ -815,6 +815,16 @@
+@@ -812,6 +812,16 @@
G_KEY_FILE_DESKTOP_GROUP,
G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN,
NULL);
@@ -19,7 +19,7 @@
return TRUE;
}
-@@ -925,6 +935,16 @@
+@@ -922,6 +932,16 @@
G_KEY_FILE_DESKTOP_GROUP,
G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN,
NULL);
Modified: desktop/experimental/glib2.0/debian/patches/10_kfreebsd_issetugid_prototype.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/10_kfreebsd_issetugid_prototype.patch?rev=40630&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/10_kfreebsd_issetugid_prototype.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/10_kfreebsd_issetugid_prototype.patch [utf-8] Tue Feb 18 18:51:36 2014
@@ -1,6 +1,6 @@
--- a/glib/gutils.c
+++ b/glib/gutils.c
-@@ -2315,6 +2315,12 @@
+@@ -2322,6 +2322,12 @@
#endif
Modified: desktop/experimental/glib2.0/debian/patches/61_glib-compile-binaries-path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/61_glib-compile-binaries-path.patch?rev=40630&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/61_glib-compile-binaries-path.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/61_glib-compile-binaries-path.patch [utf-8] Tue Feb 18 18:51:36 2014
@@ -4,10 +4,8 @@
Author: Sebastian Dröge <slomo at debian.org>
Origin: vendor
-Index: glib2.0-2.32.1/gio-2.0.pc.in
-===================================================================
---- glib2.0-2.32.1.orig/gio-2.0.pc.in 2012-04-16 08:36:01.973345422 +0200
-+++ glib2.0-2.32.1/gio-2.0.pc.in 2012-04-16 08:36:11.005345860 +0200
+--- a/gio-2.0.pc.in
++++ b/gio-2.0.pc.in
@@ -4,8 +4,8 @@
includedir=@includedir@
Modified: desktop/experimental/glib2.0/debian/patches/Don-t-use-a-parallel-build-for-the-documentation.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/Don-t-use-a-parallel-build-for-the-documentation.patch?rev=40630&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/Don-t-use-a-parallel-build-for-the-documentation.patch [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/Don-t-use-a-parallel-build-for-the-documentation.patch [utf-8] Tue Feb 18 18:51:36 2014
@@ -15,8 +15,6 @@
docs/reference/gobject/Makefile.am | 3 +++
4 files changed, 12 insertions(+)
-diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
-index 112626b..ace4f29 100644
--- a/docs/reference/gio/Makefile.am
+++ b/docs/reference/gio/Makefile.am
@@ -1,3 +1,6 @@
@@ -26,8 +24,6 @@
NULL =
SUBDIRS = gdbus-object-manager-example
-diff --git a/docs/reference/gio/gdbus-object-manager-example/Makefile.am b/docs/reference/gio/gdbus-object-manager-example/Makefile.am
-index 50b0f19..4053128 100644
--- a/docs/reference/gio/gdbus-object-manager-example/Makefile.am
+++ b/docs/reference/gio/gdbus-object-manager-example/Makefile.am
@@ -1,3 +1,6 @@
@@ -37,8 +33,6 @@
NULL =
# The name of the module.
-diff --git a/docs/reference/glib/Makefile.am b/docs/reference/glib/Makefile.am
-index 2879607..002fb41 100644
--- a/docs/reference/glib/Makefile.am
+++ b/docs/reference/glib/Makefile.am
@@ -1,3 +1,6 @@
@@ -48,8 +42,6 @@
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = 1.6
-diff --git a/docs/reference/gobject/Makefile.am b/docs/reference/gobject/Makefile.am
-index b3423f3..ce89a22 100644
--- a/docs/reference/gobject/Makefile.am
+++ b/docs/reference/gobject/Makefile.am
@@ -1,3 +1,6 @@
More information about the pkg-gnome-commits
mailing list