r26495 - in /desktop/unstable/glib2.0/debian: changelog patches/01_gettext-desktopfiles.patch patches/02_gettext-desktopfiles-ubuntu.patch patches/04_homedir_env.patch patches/61_glib-compile-schemas-path.patch rules
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Tue Feb 8 22:25:08 UTC 2011
Author: pochu
Date: Tue Feb 8 22:25:04 2011
New Revision: 26495
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26495
Log:
* New upstream stable release.
+ debian/patches/01_gettext-desktopfiles.patch,
debian/patches/02_gettext-desktopfiles-ubuntu.patch,
debian/patches/04_homedir_env.patch,
debian/patches/61_glib-compile-schemas-path.patch:
- Refreshed.
Modified:
desktop/unstable/glib2.0/debian/changelog
desktop/unstable/glib2.0/debian/patches/01_gettext-desktopfiles.patch
desktop/unstable/glib2.0/debian/patches/02_gettext-desktopfiles-ubuntu.patch
desktop/unstable/glib2.0/debian/patches/04_homedir_env.patch
desktop/unstable/glib2.0/debian/patches/61_glib-compile-schemas-path.patch
desktop/unstable/glib2.0/debian/rules
Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=26495&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/changelog [utf-8] Tue Feb 8 22:25:04 2011
@@ -1,11 +1,16 @@
-glib2.0 (2.27.92-1) UNRELEASED; urgency=low
+glib2.0 (2.28.0-1) UNRELEASED; urgency=low
* debian/control.in:
+ Drop obsolete conflicts/replaces with libglib1.3.
+ Don't suggest libgtk2.0-doc in the doc package.
- * New upstream release.
+ * New upstream stable release.
+ debian/control.in:
- Bump the libpcre3-dev build dependency.
+ + debian/patches/01_gettext-desktopfiles.patch,
+ debian/patches/02_gettext-desktopfiles-ubuntu.patch,
+ debian/patches/04_homedir_env.patch,
+ debian/patches/61_glib-compile-schemas-path.patch:
+ - Refreshed.
-- Emilio Pozuelo Monfort <pochu at debian.org> Sat, 22 Jan 2011 15:17:51 +0000
Modified: desktop/unstable/glib2.0/debian/patches/01_gettext-desktopfiles.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/01_gettext-desktopfiles.patch?rev=26495&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/01_gettext-desktopfiles.patch [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/01_gettext-desktopfiles.patch [utf-8] Tue Feb 8 22:25:04 2011
@@ -1,11 +1,9 @@
# 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.27.2/glib/gkeyfile.c
-===================================================================
---- glib2.0-2.27.2.orig/glib/gkeyfile.c 2010-07-08 04:03:01.000000000 +0200
-+++ glib2.0-2.27.2/glib/gkeyfile.c 2010-11-01 10:55:54.368605345 +0100
-@@ -87,6 +87,7 @@
+--- a/glib/gkeyfile.c
++++ b/glib/gkeyfile.c
+@@ -88,6 +88,7 @@
GKeyFileFlags flags;
gchar **locales;
@@ -13,7 +11,7 @@
};
typedef struct _GKeyFileKeyValuePair GKeyFileKeyValuePair;
-@@ -213,6 +214,7 @@
+@@ -214,6 +215,7 @@
key_file->list_separator = ';';
key_file->flags = 0;
key_file->locales = g_strdupv ((gchar **)g_get_language_names ());
@@ -21,7 +19,7 @@
}
static void
-@@ -232,6 +234,12 @@
+@@ -233,6 +235,12 @@
key_file->parse_buffer = NULL;
}
@@ -34,7 +32,7 @@
tmp = key_file->groups;
while (tmp != NULL)
{
-@@ -451,6 +459,11 @@
+@@ -452,6 +460,11 @@
return FALSE;
}
@@ -46,7 +44,7 @@
return TRUE;
}
-@@ -557,6 +570,11 @@
+@@ -558,6 +571,11 @@
return FALSE;
}
@@ -58,7 +56,7 @@
return TRUE;
}
-@@ -1665,6 +1683,8 @@
+@@ -1666,6 +1684,8 @@
GError *key_file_error;
gchar **languages;
gboolean free_languages = FALSE;
@@ -67,7 +65,7 @@
gint i;
g_return_val_if_fail (key_file != NULL, NULL);
-@@ -1695,6 +1715,23 @@
+@@ -1687,6 +1707,23 @@
free_languages = FALSE;
}
@@ -91,7 +89,7 @@
for (i = 0; languages[i]; i++)
{
candidate_key = g_strdup_printf ("%s[%s]", key, languages[i]);
-@@ -1711,6 +1748,39 @@
+@@ -1703,6 +1740,39 @@
translated_value = NULL;
}
@@ -131,10 +129,8 @@
/* Fallback to untranslated key
*/
if (!translated_value)
-Index: glib2.0-2.27.2/glib/gkeyfile.h
-===================================================================
---- glib2.0-2.27.2.orig/glib/gkeyfile.h 2010-05-14 04:21:51.000000000 +0200
-+++ glib2.0-2.27.2/glib/gkeyfile.h 2010-11-01 10:55:54.368605345 +0100
+--- a/glib/gkeyfile.h
++++ b/glib/gkeyfile.h
@@ -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/unstable/glib2.0/debian/patches/02_gettext-desktopfiles-ubuntu.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/02_gettext-desktopfiles-ubuntu.patch?rev=26495&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/02_gettext-desktopfiles-ubuntu.patch [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/02_gettext-desktopfiles-ubuntu.patch [utf-8] Tue Feb 8 22:25:04 2011
@@ -1,10 +1,8 @@
# 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.27.2/glib/gkeyfile.c
-===================================================================
---- glib2.0-2.27.2.orig/glib/gkeyfile.c 2010-11-01 10:55:54.368605345 +0100
-+++ glib2.0-2.27.2/glib/gkeyfile.c 2010-11-01 10:55:55.120609440 +0100
-@@ -463,6 +463,16 @@
+--- a/glib/gkeyfile.c
++++ b/glib/gkeyfile.c
+@@ -464,6 +464,16 @@
G_KEY_FILE_DESKTOP_GROUP,
G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN,
NULL);
@@ -21,7 +19,7 @@
return TRUE;
}
-@@ -574,6 +584,16 @@
+@@ -575,6 +585,16 @@
G_KEY_FILE_DESKTOP_GROUP,
G_KEY_FILE_DESKTOP_KEY_GETTEXT_DOMAIN,
NULL);
Modified: desktop/unstable/glib2.0/debian/patches/04_homedir_env.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/04_homedir_env.patch?rev=26495&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/04_homedir_env.patch [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/04_homedir_env.patch [utf-8] Tue Feb 8 22:25:04 2011
@@ -1,7 +1,5 @@
-Index: glib2.0-2.27.2/docs/reference/glib/running.sgml
-===================================================================
---- glib2.0-2.27.2.orig/docs/reference/glib/running.sgml 2010-08-25 17:15:23.000000000 +0200
-+++ glib2.0-2.27.2/docs/reference/glib/running.sgml 2010-11-01 10:55:56.413609682 +0100
+--- a/docs/reference/glib/running.sgml
++++ b/docs/reference/glib/running.sgml
@@ -213,6 +213,22 @@
</para>
</formalpara>
@@ -25,11 +23,9 @@
</refsect2>
<refsect2 id="setlocale">
-Index: glib2.0-2.27.2/glib/gutils.c
-===================================================================
---- glib2.0-2.27.2.orig/glib/gutils.c 2010-10-30 04:36:52.000000000 +0200
-+++ glib2.0-2.27.2/glib/gutils.c 2010-11-01 10:55:56.417612286 +0100
-@@ -1604,11 +1604,14 @@
+--- a/glib/gutils.c
++++ b/glib/gutils.c
+@@ -1626,11 +1626,14 @@
}
#endif /* !G_OS_WIN32 */
@@ -45,7 +41,7 @@
/* Only believe HOME if it is an absolute path and exists */
if (g_home_dir)
-@@ -1904,6 +1907,11 @@
+@@ -1926,6 +1929,11 @@
* homedir = g_get_home_dir (<!-- -->);
* ]|
*
Modified: desktop/unstable/glib2.0/debian/patches/61_glib-compile-schemas-path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/patches/61_glib-compile-schemas-path.patch?rev=26495&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/patches/61_glib-compile-schemas-path.patch [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/patches/61_glib-compile-schemas-path.patch [utf-8] Tue Feb 8 22:25:04 2011
@@ -1,13 +1,11 @@
-Index: glib2.0-2.27.2/gio-2.0.pc.in
-===================================================================
---- glib2.0-2.27.2.orig/gio-2.0.pc.in 2010-05-03 04:24:51.000000000 +0200
-+++ glib2.0-2.27.2/gio-2.0.pc.in 2010-11-01 10:55:59.816601729 +0100
+--- a/gio-2.0.pc.in
++++ b/gio-2.0.pc.in
@@ -4,7 +4,7 @@
includedir=@includedir@
giomoduledir=@GIO_MODULE_DIR@
--glib_compile_schemas=@bindir@/glib-compile-schemas
-+glib_compile_schemas=@libdir@/glib-2.0/glib-compile-schemas
+-glib_compile_schemas=@bindir@/glib-compile-schemas at EXEEXT@
++glib_compile_schemas=@libdir@/glib-2.0/glib-compile-schemas at EXEEXT@
Name: GIO
Description: glib I/O library
Modified: desktop/unstable/glib2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/rules?rev=26495&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/rules [utf-8] (original)
+++ desktop/unstable/glib2.0/debian/rules [utf-8] Tue Feb 8 22:25:04 2011
@@ -9,7 +9,6 @@
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
GNOME_MODULE := glib
More information about the pkg-gnome-commits
mailing list