r40629 - in /desktop/experimental/glib2.0/debian: changelog patches/04_homedir_env.patch

[ah at users.alioth.debian.org]

Author: ah
Date: Tue Feb 18 18:51:09 2014
New Revision: 40629

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40629
Log:
Fix fuzz to make debian/patches/04_homedir_env.patch apply again.

Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/patches/04_homedir_env.patch

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=40629&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog	[utf-8] Tue Feb 18 18:51:09 2014
@@ -4,6 +4,7 @@
   * Drop patches now included in upstream release:
     - 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.
 
  -- Andreas Henriksson <andreas at fatal.se>  Tue, 18 Feb 2014 19:36:34 +0100
 

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=40629&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] Tue Feb 18 18:51:09 2014
@@ -33,9 +33,9 @@
  <refsect2 id="setlocale">
 --- a/glib/gutils.c
 +++ b/glib/gutils.c
-@@ -809,6 +809,12 @@
-  * should either directly check the <envar>HOME</envar> environment
-  * variable yourself or unset it before calling any functions in GLib.
+@@ -806,6 +806,12 @@
+  * should either directly check the `HOME` environment variable yourself
+  * or unset it before calling any functions in GLib.
   *
 + * When the pre-2.36 behaviour was in effect, Debian provided the
 + * <envar>G_HOME</envar> environment variable for testing and development
@@ -46,7 +46,7 @@
   * Returns: the current user's home directory
   */
  const gchar *
-@@ -821,7 +827,9 @@
+@@ -818,7 +824,9 @@
        gchar *tmp;
  
        /* We first check HOME and use it if it is set */