API tools faq
paste
Advertisement
darkxst

gnome-session 3.7.4

darkxst
Feb 6th, 2013
50
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 12.48 KB | None | 0 0
raw download clone embed print report
  1. --- gnome-session-3.7.3/debian/changelog    2013-01-09 19:39:41.000000000 +1100
  2. +++ gnome-session-3.7.4/debian/changelog    2013-02-07 10:48:57.000000000 +1100
  3. @@ -1,3 +1,10 @@
  4. +gnome-session (3.7.4-0ubuntu1~raring1) raring; urgency=low
  5. +
  6. +  * New upstream release
  7. +  * debian/patches/00_revert_remove_fallback_session.patch
  8. +
  9. + -- Tim Lunn <tim@feathertop.org>  Thu, 07 Feb 2013 08:32:32 +1100
  10. +
  11.  gnome-session (3.7.3-0ubuntu1~raring3) raring; urgency=medium
  12.  
  13.    * New upstream release:
  14. --- gnome-session-3.7.3/debian/patches/00_revert_remove_fallback_session.patch  1970-01-01 10:00:00.000000000 +1000
  15. +++ gnome-session-3.7.4/debian/patches/00_revert_remove_fallback_session.patch  2013-02-07 10:44:11.000000000 +1100
  16. @@ -0,0 +1,27 @@
  17. +--- a/data/Makefile.am
  18. ++++ b/data/Makefile.am
  19. +@@ -23,7 +23,7 @@
  20. + desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
  21. +
  22. + sessiondir = $(datadir)/gnome-session/sessions
  23. +-session_in_in_files = gnome.session.desktop.in.in
  24. ++session_in_in_files = gnome.session.desktop.in.in gnome-fallback.session.desktop.in.in
  25. + session_in_files = $(session_in_in_files:.session.desktop.in.in=.session.desktop.in)
  26. + session_DATA = $(session_in_files:.session.desktop.in=.session)
  27. +
  28. +--- /dev/null
  29. ++++ b/data/gnome-fallback.session.desktop.in.in
  30. +@@ -0,0 +1,6 @@
  31. ++[GNOME Session]
  32. ++_Name=GNOME fallback
  33. ++RequiredComponents=gnome-panel;gnome-settings-daemon;gnome-screensaver;
  34. ++RequiredProviders=windowmanager;notifications;
  35. ++DefaultProvider-windowmanager=metacity
  36. ++DefaultProvider-notifications=notification-daemon
  37. +--- a/data/gnome.session.desktop.in.in
  38. ++++ b/data/gnome.session.desktop.in.in
  39. +@@ -2,3 +2,4 @@
  40. + _Name=GNOME
  41. + RequiredComponents=gnome-shell;gnome-settings-daemon;
  42. + IsRunnableHelper=@LIBEXECDIR@/gnome-session-check-accelerated
  43. ++FallbackSession=gnome-fallback
  44. --- gnome-session-3.7.3/debian/patches/02_fallback_desktop.patch    2013-01-07 11:00:44.000000000 +1100
  45. +++ gnome-session-3.7.4/debian/patches/02_fallback_desktop.patch    2013-02-07 09:45:34.000000000 +1100
  46. @@ -1,7 +1,5 @@
  47. -Index: gnome-session-3.0.2/data/gnome-fallback.desktop.in
  48. -===================================================================
  49. ---- /dev/null  1970-01-01 00:00:00.000000000 +0000
  50. -+++ gnome-session-3.0.2/data/gnome-fallback.desktop.in 2011-11-04 20:06:03.653307488 +0100
  51. +--- /dev/null
  52. ++++ b/data/gnome-fallback.desktop.in
  53.  @@ -0,0 +1,7 @@
  54.  +[Desktop Entry]
  55.  +_Name=GNOME Classic
  56. --- gnome-session-3.7.3/debian/patches/03_fallback_desktop_makefile.patch   2013-01-07 11:00:44.000000000 +1100
  57. +++ gnome-session-3.7.4/debian/patches/03_fallback_desktop_makefile.patch   2013-02-07 09:46:37.000000000 +1100
  58. @@ -1,13 +1,11 @@
  59. -Index: gnome-session-3.4.0/data/Makefile.am
  60. -===================================================================
  61. ---- gnome-session-3.4.0.orig/data/Makefile.am  2011-10-21 16:35:39.000000000 +0200
  62. -+++ gnome-session-3.4.0/data/Makefile.am   2012-04-06 23:20:36.422851504 +0200
  63. -@@ -9,7 +9,7 @@
  64. +--- a/data/Makefile.am
  65. ++++ b/data/Makefile.am
  66. +@@ -10,7 +10,7 @@
  67.   hwcompat_DATA = hardware-compatibility
  68.  
  69.   xsessiondir = $(datadir)/xsessions
  70.  -xsession_in_files = gnome.desktop.in
  71.  +xsession_in_files = gnome.desktop.in gnome-fallback.desktop.in
  72. - xsession_DATA = $(xsession_in_files:.desktop.in=.desktop)
  73.  
  74. - desktopdir = $(datadir)/applications
  75. + if BUILD_SESSION_SELECTOR
  76. + xsession_in_files += gnome-custom-session.desktop.in
  77. --- gnome-session-3.7.3/debian/patches/50_ubuntu_sessions.patch 2013-01-09 19:39:02.000000000 +1100
  78. +++ gnome-session-3.7.4/debian/patches/50_ubuntu_sessions.patch 2013-02-07 10:45:12.000000000 +1100
  79. @@ -6,10 +6,8 @@
  80.   (TryExec enables to show them or not depends on the package installed)
  81.  Forwarded: Not needed
  82.  
  83. -Index: gnome-session-3.4.1/data/gnome.desktop.in
  84. -===================================================================
  85. ---- gnome-session-3.4.1.orig/data/gnome.desktop.in 2010-02-09 08:22:01.000000000 -0500
  86. -+++ gnome-session-3.4.1/data/gnome.desktop.in  2012-05-06 20:22:30.285990734 -0400
  87. +--- a/data/gnome.desktop.in
  88. ++++ b/data/gnome.desktop.in
  89.  @@ -1,7 +1,7 @@
  90.   [Desktop Entry]
  91.   _Name=GNOME
  92. @@ -20,20 +18,18 @@
  93.  +TryExec=gnome-shell
  94.   Icon=
  95.   Type=Application
  96. -Index: gnome-session-3.4.1/data/Makefile.am
  97. -===================================================================
  98. ---- gnome-session-3.4.1.orig/data/Makefile.am  2012-05-06 20:20:27.389381326 -0400
  99. -+++ gnome-session-3.4.1/data/Makefile.am   2012-05-06 20:20:29.177390192 -0400
  100. -@@ -9,7 +9,7 @@
  101. +--- a/data/Makefile.am
  102. ++++ b/data/Makefile.am
  103. +@@ -10,7 +10,7 @@
  104.   hwcompat_DATA = hardware-compatibility
  105.  
  106.   xsessiondir = $(datadir)/xsessions
  107.  -xsession_in_files = gnome.desktop.in gnome-fallback.desktop.in
  108.  +xsession_in_files = gnome.desktop.in gnome-fallback.desktop.in gnome-fallback-compiz.desktop.in ubuntu.desktop.in
  109. - xsession_DATA = $(xsession_in_files:.desktop.in=.desktop)
  110.  
  111. - desktopdir = $(datadir)/applications
  112. -@@ -17,7 +17,7 @@
  113. + if BUILD_SESSION_SELECTOR
  114. + xsession_in_files += gnome-custom-session.desktop.in
  115. +@@ -23,7 +23,7 @@
  116.   desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
  117.  
  118.   sessiondir = $(datadir)/gnome-session/sessions
  119. @@ -42,10 +38,8 @@
  120.   session_in_files = $(session_in_in_files:.session.desktop.in.in=.session.desktop.in)
  121.   session_DATA = $(session_in_files:.session.desktop.in=.session)
  122.  
  123. -Index: gnome-session-3.4.1/data/gnome-fallback-compiz.desktop.in
  124. -===================================================================
  125. ---- /dev/null  1970-01-01 00:00:00.000000000 +0000
  126. -+++ gnome-session-3.4.1/data/gnome-fallback-compiz.desktop.in  2012-05-06 20:20:29.177390192 -0400
  127. +--- /dev/null
  128. ++++ b/data/gnome-fallback-compiz.desktop.in
  129.  @@ -0,0 +1,7 @@
  130.  +[Desktop Entry]
  131.  +_Name=GNOME Fallback
  132. @@ -54,10 +48,8 @@
  133.  +TryExec=gnome-session
  134.  +Icon=
  135.  +Type=Application
  136. -Index: gnome-session-3.4.1/data/gnome-fallback-compiz.session.desktop.in.in
  137. -===================================================================
  138. ---- /dev/null  1970-01-01 00:00:00.000000000 +0000
  139. -+++ gnome-session-3.4.1/data/gnome-fallback-compiz.session.desktop.in.in   2012-05-06 20:20:29.177390192 -0400
  140. +--- /dev/null
  141. ++++ b/data/gnome-fallback-compiz.session.desktop.in.in
  142.  @@ -0,0 +1,8 @@
  143.  +[GNOME Session]
  144.  +_Name=GNOME Fallback
  145. @@ -67,10 +59,8 @@
  146.  +DefaultProvider-notifications=notify-osd
  147.  +IsRunnableHelper=@LIBEXECDIR@/gnome-session-check-accelerated
  148.  +FallbackSession=gnome-fallback
  149. -Index: gnome-session-3.4.1/data/gnome-fallback.session.desktop.in.in
  150. -===================================================================
  151. ---- gnome-session-3.4.1.orig/data/gnome-fallback.session.desktop.in.in 2012-05-06 20:20:27.389381326 -0400
  152. -+++ gnome-session-3.4.1/data/gnome-fallback.session.desktop.in.in  2012-05-06 20:20:29.181390204 -0400
  153. +--- a/data/gnome-fallback.session.desktop.in.in
  154. ++++ b/data/gnome-fallback.session.desktop.in.in
  155.  @@ -1,6 +1,6 @@
  156.   [GNOME Session]
  157.  -_Name=GNOME fallback
  158. @@ -82,10 +72,8 @@
  159.  +RequiredProviders=windowmanager;
  160.  +DefaultProvider-windowmanager=metacity
  161.  +DefaultProvider-notifications=notify-osd
  162. -Index: gnome-session-3.4.1/data/gnome-fallback.desktop.in
  163. -===================================================================
  164. ---- gnome-session-3.4.1.orig/data/gnome-fallback.desktop.in    2012-05-06 20:20:27.389381326 -0400
  165. -+++ gnome-session-3.4.1/data/gnome-fallback.desktop.in 2012-05-06 20:20:29.181390204 -0400
  166. +--- a/data/gnome-fallback.desktop.in
  167. ++++ b/data/gnome-fallback.desktop.in
  168.  @@ -1,7 +1,7 @@
  169.   [Desktop Entry]
  170.  -_Name=GNOME Classic
  171. @@ -97,10 +85,8 @@
  172.   TryExec=gnome-session
  173.   Icon=
  174.   Type=Application
  175. -Index: gnome-session-3.4.1/data/ubuntu.session.desktop.in.in
  176. -===================================================================
  177. ---- /dev/null  1970-01-01 00:00:00.000000000 +0000
  178. -+++ gnome-session-3.4.1/data/ubuntu.session.desktop.in.in  2012-05-06 20:20:29.181390204 -0400
  179. +--- /dev/null
  180. ++++ b/data/ubuntu.session.desktop.in.in
  181.  @@ -0,0 +1,6 @@
  182.  +[GNOME Session]
  183.  +_Name=Ubuntu
  184. @@ -108,10 +94,8 @@
  185.  +RequiredProviders=windowmanager;panel;
  186.  +DefaultProvider-windowmanager=compiz
  187.  +DefaultProvider-panel=compiz
  188. -Index: gnome-session-3.4.1/data/ubuntu.desktop.in
  189. -===================================================================
  190. ---- /dev/null  1970-01-01 00:00:00.000000000 +0000
  191. -+++ gnome-session-3.4.1/data/ubuntu.desktop.in 2012-05-06 20:20:29.181390204 -0400
  192. +--- /dev/null
  193. ++++ b/data/ubuntu.desktop.in
  194.  @@ -0,0 +1,7 @@
  195.  +[Desktop Entry]
  196.  +_Name=Ubuntu
  197. --- gnome-session-3.7.3/debian/patches/52_xdg_current_desktop.patch 2013-01-09 19:39:02.000000000 +1100
  198. +++ gnome-session-3.7.4/debian/patches/52_xdg_current_desktop.patch 2013-02-07 09:48:40.000000000 +1100
  199. @@ -1,52 +1,42 @@
  200. -Index: gnome-session-3.6.0/data/gnome-fallback-compiz.session.desktop.in.in
  201. -===================================================================
  202. ---- gnome-session-3.6.0.orig/data/gnome-fallback-compiz.session.desktop.in.in  2012-09-26 11:00:16.384033749 +1200
  203. -+++ gnome-session-3.6.0/data/gnome-fallback-compiz.session.desktop.in.in   2012-09-26 11:00:18.704033669 +1200
  204. +--- a/data/gnome-fallback-compiz.session.desktop.in.in
  205. ++++ b/data/gnome-fallback-compiz.session.desktop.in.in
  206.  @@ -6,3 +6,4 @@
  207.   DefaultProvider-notifications=notify-osd
  208.   IsRunnableHelper=@LIBEXECDIR@/gnome-session-check-accelerated
  209.   FallbackSession=gnome-fallback
  210.  +DesktopName=GNOME
  211. -Index: gnome-session-3.6.0/data/gnome-fallback.session.desktop.in.in
  212. -===================================================================
  213. ---- gnome-session-3.6.0.orig/data/gnome-fallback.session.desktop.in.in 2012-09-26 11:00:16.384033749 +1200
  214. -+++ gnome-session-3.6.0/data/gnome-fallback.session.desktop.in.in  2012-09-26 11:00:18.704033669 +1200
  215. +--- a/data/gnome-fallback.session.desktop.in.in
  216. ++++ b/data/gnome-fallback.session.desktop.in.in
  217.  @@ -4,3 +4,4 @@
  218.   RequiredProviders=windowmanager;
  219.   DefaultProvider-windowmanager=metacity
  220.   DefaultProvider-notifications=notify-osd
  221.  +DesktopName=GNOME
  222. -Index: gnome-session-3.6.0/data/gnome.session.desktop.in.in
  223. -===================================================================
  224. ---- gnome-session-3.6.0.orig/data/gnome.session.desktop.in.in  2012-07-13 08:00:42.000000000 +1200
  225. -+++ gnome-session-3.6.0/data/gnome.session.desktop.in.in   2012-09-26 11:00:18.704033669 +1200
  226. +--- a/data/gnome.session.desktop.in.in
  227. ++++ b/data/gnome.session.desktop.in.in
  228.  @@ -3,3 +3,4 @@
  229.   RequiredComponents=gnome-shell;gnome-settings-daemon;
  230.   IsRunnableHelper=@LIBEXECDIR@/gnome-session-check-accelerated
  231.   FallbackSession=gnome-fallback
  232.  +DesktopName=GNOME
  233. -Index: gnome-session-3.6.0/data/ubuntu.session.desktop.in.in
  234. -===================================================================
  235. ---- gnome-session-3.6.0.orig/data/ubuntu.session.desktop.in.in 2012-09-26 11:00:16.388033750 +1200
  236. -+++ gnome-session-3.6.0/data/ubuntu.session.desktop.in.in  2012-09-26 11:00:18.704033669 +1200
  237. +--- a/data/ubuntu.session.desktop.in.in
  238. ++++ b/data/ubuntu.session.desktop.in.in
  239.  @@ -4,3 +4,4 @@
  240.   RequiredProviders=windowmanager;panel;
  241.   DefaultProvider-windowmanager=compiz
  242.   DefaultProvider-panel=compiz
  243.  +DesktopName=Unity
  244. -Index: gnome-session-3.6.0/gnome-session/gsm-session-fill.c
  245. -===================================================================
  246. ---- gnome-session-3.6.0.orig/gnome-session/gsm-session-fill.c  2012-09-26 11:00:17.264033717 +1200
  247. -+++ gnome-session-3.6.0/gnome-session/gsm-session-fill.c   2012-09-26 11:00:18.704033669 +1200
  248. +--- a/gnome-session/gsm-session-fill.c
  249. ++++ b/gnome-session/gsm-session-fill.c
  250.  @@ -31,6 +31,7 @@
  251.   #define GSM_KEYFILE_SESSION_GROUP "GNOME Session"
  252.   #define GSM_KEYFILE_RUNNABLE_KEY "IsRunnableHelper"
  253.   #define GSM_KEYFILE_FALLBACK_KEY "FallbackSession"
  254.  +#define GSM_KEYFILE_DESKTOP_NAME_KEY "DesktopName"
  255.   #define GSM_KEYFILE_REQUIRED_COMPONENTS_KEY "RequiredComponents"
  256. - #define GSM_KEYFILE_REQUIRED_PROVIDERS_KEY  "RequiredProviders"
  257. - #define GSM_KEYFILE_DEFAULT_PROVIDER_PREFIX "DefaultProvider"
  258. -@@ -450,6 +451,24 @@
  259. +
  260. + /* See https://bugzilla.gnome.org/show_bug.cgi?id=641992 for discussion */
  261. +@@ -315,6 +316,24 @@
  262.           return keyfile;
  263.   }
  264.  
  265. @@ -71,7 +61,7 @@
  266.   gboolean
  267.   gsm_session_fill (GsmManager  *manager,
  268.                     const char  *session)
  269. -@@ -467,6 +486,8 @@
  270. +@@ -332,6 +351,8 @@
  271.  
  272.           g_free (actual_session);
  273.  
  274. --- gnome-session-3.7.3/debian/patches/series   2013-01-07 11:00:44.000000000 +1100
  275. +++ gnome-session-3.7.4/debian/patches/series   2013-02-07 09:44:38.000000000 +1100
  276. @@ -1,3 +1,4 @@
  277. +00_revert_remove_fallback_session.patch
  278.  01_gnome-wm.patch
  279.  02_fallback_desktop.patch
  280.  03_fallback_desktop_makefile.patch
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!