r35954 - in /desktop/experimental/gnome-session/debian: 55gnome-session_gnomerc changelog control control.in patches/12_no_gdm_fallback.patch

sjoerd at users.alioth.debian.org sjoerd at users.alioth.debian.org
Sun Oct 14 19:06:05 UTC 2012


Author: sjoerd
Date: Sun Oct 14 19:06:04 2012
New Revision: 35954

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35954
Log:
* New upstream release (3.6.0)
* Sync with Ubuntu:
  + debian/55gnome-session_gnomerc: Use shell builtins instead of external
    commands for extra speed
  + debian/patches/12_no_gdm_fallback.patch: Refresh

Modified:
    desktop/experimental/gnome-session/debian/55gnome-session_gnomerc
    desktop/experimental/gnome-session/debian/changelog
    desktop/experimental/gnome-session/debian/control
    desktop/experimental/gnome-session/debian/control.in
    desktop/experimental/gnome-session/debian/patches/12_no_gdm_fallback.patch

Modified: desktop/experimental/gnome-session/debian/55gnome-session_gnomerc
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/55gnome-session_gnomerc?rev=35954&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/55gnome-session_gnomerc [utf-8] (original)
+++ desktop/experimental/gnome-session/debian/55gnome-session_gnomerc [utf-8] Sun Oct 14 19:06:04 2012
@@ -1,6 +1,7 @@
 # If we are running the GNOME session, source ~/.gnomerc
 
-BASESTARTUP=$(basename "$STARTUP" | cut -d\  -f1)
+BASESTARTUP=${STARTUP%% *}
+BASESTARTUP=${BASESTARTUP##*/}
 if [ "$BASESTARTUP" = x-session-manager ]; then
     BASESTARTUP=$(basename $(readlink /etc/alternatives/x-session-manager))
 fi

Modified: desktop/experimental/gnome-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/changelog?rev=35954&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-session/debian/changelog [utf-8] Sun Oct 14 19:06:04 2012
@@ -1,3 +1,13 @@
+gnome-session (3.6.0-1) experimental; urgency=low
+
+  * New upstream release (3.6.0)
+  * Sync with Ubuntu:
+    + debian/55gnome-session_gnomerc: Use shell builtins instead of external
+      commands for extra speed
+    + debian/patches/12_no_gdm_fallback.patch: Refresh
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 14 Oct 2012 21:05:30 +0200
+
 gnome-session (3.4.2.1-3) unstable; urgency=low
 
   * defaults.list:

Modified: desktop/experimental/gnome-session/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/control?rev=35954&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-session/debian/control [utf-8] Sun Oct 14 19:06:04 2012
@@ -7,7 +7,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
 Standards-Version: 3.9.3
 Build-Depends: cdbs (>= 0.4.41),
                dh-autoreconf,
@@ -15,11 +15,10 @@
                gnome-pkg-tools (>= 0.13),
                gnome-common,
                intltool (>= 0.40.6),
-               libglib2.0-dev (>= 2.28.0),
+               libglib2.0-dev (>= 2.34.0),
                libgtk-3-dev (>= 2.90.7),
                libupower-glib-dev (>= 0.9.0),
                libdbus-glib-1-dev (>= 0.76),
-               libgconf2-dev (>= 2.10.1-6),
                libjson-glib-dev (>= 0.10),
                libnotify-dev (>= 0.7),
                libsm-dev,

Modified: desktop/experimental/gnome-session/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/control.in?rev=35954&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-session/debian/control.in [utf-8] Sun Oct 14 19:06:04 2012
@@ -10,11 +10,10 @@
                gnome-pkg-tools (>= 0.13),
                gnome-common,
                intltool (>= 0.40.6),
-               libglib2.0-dev (>= 2.28.0),
+               libglib2.0-dev (>= 2.34.0),
                libgtk-3-dev (>= 2.90.7),
                libupower-glib-dev (>= 0.9.0),
                libdbus-glib-1-dev (>= 0.76),
-               libgconf2-dev (>= 2.10.1-6),
                libjson-glib-dev (>= 0.10),
                libnotify-dev (>= 0.7),
                libsm-dev,

Modified: desktop/experimental/gnome-session/debian/patches/12_no_gdm_fallback.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/patches/12_no_gdm_fallback.patch?rev=35954&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/patches/12_no_gdm_fallback.patch [utf-8] (original)
+++ desktop/experimental/gnome-session/debian/patches/12_no_gdm_fallback.patch [utf-8] Sun Oct 14 19:06:04 2012
@@ -3,25 +3,25 @@
 Don’t fall back to GDM when ConsoleKit fails. If CK is not available, it 
 will not be attempted anyway.
 
-Index: gnome-session-3.4.1/gnome-session/gsm-manager.c
+Index: gnome-session-3.5.4/gnome-session/gsm-manager.c
 ===================================================================
---- gnome-session-3.4.1.orig/gnome-session/gsm-manager.c	2012-03-27 10:34:56.000000000 +0200
-+++ gnome-session-3.4.1/gnome-session/gsm-manager.c	2012-04-25 00:03:14.416196315 +0200
-@@ -504,7 +504,7 @@
-                 g_signal_connect (system,
+--- gnome-session-3.5.4.orig/gnome-session/gsm-manager.c	2012-07-19 13:41:23.511406643 +1200
++++ gnome-session-3.5.4/gnome-session/gsm-manager.c	2012-07-19 13:41:50.227405715 +1200
+@@ -492,7 +492,7 @@
+                 g_signal_connect (manager->priv->system,
                                    "request-completed",
                                    G_CALLBACK (quit_request_completed),
 -                                  GINT_TO_POINTER (GDM_LOGOUT_ACTION_REBOOT));
 +                                  GINT_TO_POINTER (GDM_LOGOUT_ACTION_NONE));
-                 gsm_system_attempt_restart (system);
+                 gsm_system_attempt_restart (manager->priv->system);
                  break;
          case GSM_MANAGER_LOGOUT_REBOOT_GDM:
-@@ -519,7 +519,7 @@
-                 g_signal_connect (system,
+@@ -506,7 +506,7 @@
+                 g_signal_connect (manager->priv->system,
                                    "request-completed",
                                    G_CALLBACK (quit_request_completed),
 -                                  GINT_TO_POINTER (GDM_LOGOUT_ACTION_SHUTDOWN));
 +                                  GINT_TO_POINTER (GDM_LOGOUT_ACTION_NONE));
-                 gsm_system_attempt_stop (system);
+                 gsm_system_attempt_stop (manager->priv->system);
                  break;
          case GSM_MANAGER_LOGOUT_SHUTDOWN_GDM:




More information about the pkg-gnome-commits mailing list