]> rtime.felk.cvut.cz Git - sojka/lightdm.git/commitdiff
Refresh quilt patches
authorRobert Ancell <robert.ancell@canonical.com>
Thu, 6 Mar 2014 03:35:39 +0000 (16:35 +1300)
committerRobert Ancell <robert.ancell@canonical.com>
Thu, 6 Mar 2014 03:35:39 +0000 (16:35 +1300)
debian/patches/04_language_handling.patch

index fde3b68cdc846052f394dde22d5b5bc2bbb386fc..4da13fd8c04def558bfd3f27fec9398104bba49d 100644 (file)
@@ -2,10 +2,10 @@ Description: Adjustments due to handling of languages
 Forwarded: not-needed
 Author: Gunnar Hjalmarsson <gunnarhj@ubuntu.com>
 
-Index: xdg-seat/liblightdm-gobject/language.c
+Index: trunk/liblightdm-gobject/language.c
 ===================================================================
---- xdg-seat.orig/liblightdm-gobject/language.c        2014-03-01 23:32:43.217394503 +0100
-+++ xdg-seat/liblightdm-gobject/language.c     2014-03-03 08:24:26.505839803 +0100
+--- trunk.orig/liblightdm-gobject/language.c   2014-03-06 16:35:25.899347214 +1300
++++ trunk/liblightdm-gobject/language.c        2014-03-06 16:35:25.891347214 +1300
 @@ -40,7 +40,7 @@
  static void
  update_languages (void)
@@ -56,11 +56,11 @@ Index: xdg-seat/liblightdm-gobject/language.c
              return language;
      }
  
-Index: xdg-seat/tests/scripts/language-env.conf
+Index: trunk/tests/scripts/language-env.conf
 ===================================================================
---- xdg-seat.orig/tests/scripts/language-env.conf      2014-02-05 14:22:08.711739102 +0000
-+++ xdg-seat/tests/scripts/language-env.conf   2014-02-05 14:22:08.707739102 +0000
-@@ -22,8 +22,8 @@
+--- trunk.orig/tests/scripts/language-env.conf 2014-03-06 16:35:25.899347214 +1300
++++ trunk/tests/scripts/language-env.conf      2014-03-06 16:35:25.895347214 +1300
+@@ -23,8 +23,8 @@
  #?SESSION-X-0 CONNECT-XSERVER
  
  # Check environment variables
@@ -71,10 +71,10 @@ Index: xdg-seat/tests/scripts/language-env.conf
  #?*SESSION-X-0 READ-ENV NAME=GDM_LANG
  #?SESSION-X-0 READ-ENV NAME=GDM_LANG VALUE=en_AU
  
-Index: xdg-seat/src/seat.c
+Index: trunk/src/seat.c
 ===================================================================
---- xdg-seat.orig/src/seat.c   2014-02-05 14:22:08.711739102 +0000
-+++ xdg-seat/src/seat.c        2014-02-05 14:22:08.707739102 +0000
+--- trunk.orig/src/seat.c      2014-03-06 16:35:25.899347214 +1300
++++ trunk/src/seat.c   2014-03-06 16:35:25.895347214 +1300
 @@ -854,7 +854,7 @@
          session_set_env (session, "XDG_CURRENT_DESKTOP", desktop_name);
      if (language && language[0] != '\0')