gnome3-team team mailing list archive

[Jeremy Bicha <jeremy@xxxxxxxxx>]

Jeremy Bicha has proposed merging lp:~jbicha/gnome-session/gnome-session-3.0.1 into lp:~gnome3-team/gnome-session/ubuntu.

Requested reviews:
  Rico Tzschichholz (ricotz)

For more details, see:
https://code.launchpad.net/~jbicha/gnome-session/gnome-session-3.0.1/+merge/60192
-- 
https://code.launchpad.net/~jbicha/gnome-session/gnome-session-3.0.1/+merge/60192
Your team GNOME3 Team is subscribed to branch lp:~gnome3-team/gnome-session/ubuntu.

=== modified file 'debian/changelog'
--- debian/changelog	2011-05-06 05:50:51 +0000
+++ debian/changelog	2011-05-06 14:34:30 +0000
@@ -1,3 +1,12 @@
+gnome-session (3.0.1-0ubuntu1~build2) natty; urgency=low
+
+  * debian/po-up/de.po
+    - Restore missing file
+  * debian/patches/02_add_ubuntu_session.patch
+    - Bypass panel autostart phase as this may slow down login
+
+ -- Jeremy Bicha <jeremy@xxxxxxxxx>  Fri, 06 May 2011 10:10:41 -0400
+
 gnome-session (3.0.1-0ubuntu1~build1) natty; urgency=low
 
   * New upstream release

=== modified file 'debian/patches/02_add_ubuntu_session.patch'
--- debian/patches/02_add_ubuntu_session.patch	2011-05-04 08:56:21 +0000
+++ debian/patches/02_add_ubuntu_session.patch	2011-05-06 14:34:30 +0000
@@ -6,9 +6,9 @@
 +[GNOME Session]
 +_Name=Ubuntu
 +RequiredComponents=gnome-settings-daemon
-+RequiredProviders=windowmanager;panel
++RequiredProviders=windowmanager
 +DefaultProvider-windowmanager=compiz
-+DefaultProvider-panel=compiz
++#DefaultProvider-panel=compiz
 +IsRunnableHelper=/usr/lib/nux/unity_support_test
 +FallbackSessionsID=FallbackUnity2d;FallbackClassicGnome
 +FallbackUnity2d=2d-ubuntu
@@ -80,14 +80,13 @@
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
 +++ gnome-session-3.0.0/data/gnome-fallback-compiz.session.desktop.in.in	2011-05-04 04:10:37.060437377 -0400
-@@ -0,0 +1,7 @@
+@@ -0,0 +1,6 @@
 +[GNOME Session]
 +_Name=GNOME fallback compiz
-+RequiredComponents=gnome-settings-daemon;
++RequiredComponents=gnome-settings-daemon;gnome-panel
 +RequiredProviders=windowmanager;panel
 +DefaultProvider-windowmanager=compiz
-+DefaultProvider-panel=gnome-panel
-+DefaultProvider-notifications=notification-daemon
++#DefaultProvider-panel=gnome-panel
 Index: gnome-session-3.0.0/po/POTFILES.in
 ===================================================================
 --- gnome-session-3.0.0.orig/po/POTFILES.in	2011-03-22 16:31:43.000000000 -0400