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

[pochu at users.alioth.debian.org]

Author: pochu
Date: Tue Mar 19 11:35:31 2013
New Revision: 37053

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=37053
Log:
  + debian/patches/04_homedir_env.patch:
    - Updated to apply again.

Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/control
    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=37053&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Tue Mar 19 11:35:31 2013
@@ -3,6 +3,8 @@
   * debian/control.in:
     + Break python-gi (<< 3.7.2). Closes: #702603.
   * New upstream release.
+    + debian/patches/04_homedir_env.patch:
+      - Updated to apply again.
   * debian/rules:
     + Set HOME instead G_HOME, as GLib now honors the former. We will
       eventually remove our local patch to support G_HOME, so packages

Modified: desktop/experimental/glib2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/control?rev=37053&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/control [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/control [utf-8] Tue Mar 19 11:35:31 2013
@@ -41,7 +41,8 @@
 Recommends: libglib2.0-data,
             shared-mime-info
 Breaks: gvfs (<< 1.8),
-        glib-networking (<< 2.33.12)
+        glib-networking (<< 2.33.12),
+        python-gi (<< 3.7.2)
 Replaces: libglib2.0-dev (<< 2.23.2-2)
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}

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=37053&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 Mar 19 11:35:31 2013
@@ -4,8 +4,6 @@
 Author: Josselin Mouette <joss at debian.org>
 Origin: vendor
 
-Index: b/docs/reference/glib/running.xml
-===================================================================
 --- a/docs/reference/glib/running.xml
 +++ b/docs/reference/glib/running.xml
 @@ -244,6 +244,24 @@
@@ -33,26 +31,9 @@
  </refsect2>
  
  <refsect2 id="setlocale">
-Index: b/glib/gutils.c
-===================================================================
 --- a/glib/gutils.c
 +++ b/glib/gutils.c
-@@ -701,8 +701,12 @@
-     }
- #endif	/* !G_OS_WIN32 */
- 
--  /* We first check HOME and use it if it is set */
--  g_home_dir = g_strdup (g_getenv ("HOME"));
-+  /* Debian specific: Allow G_HOME to override the home directory */
-+  g_home_dir = g_strdup (g_getenv ("G_HOME"));
-+
-+  /* If G_HOME isn't set, we check HOME and use it if it is set */
-+  if (!g_home_dir)
-+      g_home_dir = g_strdup (g_getenv ("HOME"));
- 
- #ifdef G_OS_WIN32
-   /* Only believe HOME if it is an absolute path and exists.
-@@ -1000,6 +1004,13 @@
+@@ -872,6 +872,13 @@
   *   should either directly check the <envar>HOME</envar> environment
   *   variable yourself or unset it before calling any functions in GLib.
   * </para></note>
@@ -66,3 +47,14 @@
   *
   * Returns: the current user's home directory
   */
+@@ -885,7 +892,9 @@
+       gchar *tmp;
+ 
+       /* We first check HOME and use it if it is set */
+-      tmp = g_strdup (g_getenv ("HOME"));
++      tmp = g_strdup (g_getenv ("G_HOME"));
++      if (!tmp)
++        tmp = g_strdup (g_getenv ("HOME"));
+ 
+ #ifdef G_OS_WIN32
+       /* Only believe HOME if it is an absolute path and exists.