r26877 - in /desktop/experimental/gnome-session/debian: ./ patches/ scripts/
fpeters at users.alioth.debian.org
fpeters at users.alioth.debian.org
Mon Mar 14 20:16:15 UTC 2011
Author: fpeters
Date: Mon Mar 14 20:16:08 2011
New Revision: 26877
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26877
Log:
gnome-session (2.91.91.3-1) UNRELEASED; urgency=low
* New upstream release.
* debian/patches/01_gnome-wm.patch: removed, gnome-wm has been killed
upstream.
* debian/patches/03_upower.patch: removed, was stolen from git.
* debian/patches/10_session_save.patch: updated.
* debian/patches/11_saved_session_name.patch: updated.
* debian/patches/13_no_fallback_notification.patch: start fallback session
even if there is no notification-daemon.
* debian/patches/90_relibtoolize.patch: remove, using dh-autoreconf.
* debian/control.in:
+ updated build-deps for new version.
+ removed gnome3-session package, gnome-session will start gnome3, and
switch to fallback mode if necessary.
+ removed gnome-session-common package, as it was there to satisfy the
presence of both gnome-session and gnome3-session
* debian/rules:
+ use autoreconf
+ remove rules for creating gnome3-session.desktop
Added:
desktop/experimental/gnome-session/debian/patches/13_no_fallback_notification.patch
Removed:
desktop/experimental/gnome-session/debian/gnome-session-common.install
desktop/experimental/gnome-session/debian/gnome-session-common.links
desktop/experimental/gnome-session/debian/gnome3-session.gconf-defaults
desktop/experimental/gnome-session/debian/gnome3-session.install
desktop/experimental/gnome-session/debian/gnome3-session.links
desktop/experimental/gnome-session/debian/gnome3-session.postinst
desktop/experimental/gnome-session/debian/gnome3-session.prerm
desktop/experimental/gnome-session/debian/gnome3.desktop.in
desktop/experimental/gnome-session/debian/scripts/
Modified:
desktop/experimental/gnome-session/debian/changelog
desktop/experimental/gnome-session/debian/control
desktop/experimental/gnome-session/debian/control.in
desktop/experimental/gnome-session/debian/gnome-session-bin.install
desktop/experimental/gnome-session/debian/gnome-session.install
desktop/experimental/gnome-session/debian/patches/10_session_save.patch
desktop/experimental/gnome-session/debian/patches/11_saved_session_name.patch
desktop/experimental/gnome-session/debian/patches/12_no_gdm_fallback.patch
desktop/experimental/gnome-session/debian/patches/series
desktop/experimental/gnome-session/debian/rules
Modified: desktop/experimental/gnome-session/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/changelog?rev=26877&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-session/debian/changelog [utf-8] Mon Mar 14 20:16:08 2011
@@ -1,3 +1,26 @@
+gnome-session (2.91.91.3-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ * debian/patches/01_gnome-wm.patch: removed, gnome-wm has been killed
+ upstream.
+ * debian/patches/03_upower.patch: removed, was stolen from git.
+ * debian/patches/10_session_save.patch: updated.
+ * debian/patches/11_saved_session_name.patch: updated.
+ * debian/patches/13_no_fallback_notification.patch: start fallback session
+ even if there is no notification-daemon.
+ * debian/patches/90_relibtoolize.patch: remove, using dh-autoreconf.
+ * debian/control.in:
+ + updated build-deps for new version.
+ + removed gnome3-session package, gnome-session will start gnome3, and
+ switch to fallback mode if necessary.
+ + removed gnome-session-common package, as it was there to satisfy the
+ presence of both gnome-session and gnome3-session
+ * debian/rules:
+ + use autoreconf
+ + remove rules for creating gnome3-session.desktop
+
+ -- Frederic Peters <fpeters at debian.org> Mon, 14 Mar 2011 18:13:07 +0100
+
gnome-session (2.30.2-4) experimental; urgency=low
[ Josselin Mouette ]
Modified: desktop/experimental/gnome-session/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/control?rev=26877&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-session/debian/control [utf-8] Mon Mar 14 20:16:08 2011
@@ -7,17 +7,20 @@
Section: gnome
Priority: optional
Maintainer: Josselin Mouette <joss at debian.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Michael Biebl <biebl at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Frederic Peters <fpeters at debian.org>, Michael Biebl <biebl at debian.org>
Standards-Version: 3.9.0
Build-Depends: cdbs (>= 0.4.41),
+ dh-autoreconf,
debhelper (>= 5.0.13),
gnome-pkg-tools (>= 0.13),
+ gnome-common,
intltool (>= 0.40.0),
libglib2.0-dev (>= 2.16.0),
- libgtk2.0-dev (>= 2.14.0),
+ libgtk-3-dev (>= 3.0.0),
libupower-glib-dev (>= 0.9.0),
libdbus-glib-1-dev (>= 0.76),
libgconf2-dev (>= 2.10.1-6),
+ librsvg2-dev,
libstartup-notification0-dev,
libsm-dev,
libice-dev,
@@ -35,47 +38,23 @@
Depends: ${misc:Depends},
gnome-settings-daemon (>= 2.26),
gnome-panel (>= 2.26),
- metacity | mutter | sawfish,
+ gnome-shell | metacity,
nautilus (>= 2.26),
policykit-1-gnome,
+ gsettings-desktop-schemas,
gnome-session-bin (>= ${binary:Version}),
- gnome-session-bin (<< ${gnome:NextVersion}),
- gnome-session-common (= ${binary:Version})
+ gnome-session-bin (<< ${gnome:NextVersion})
Recommends: gnome-power-manager (>= 2.28)
+Replaces: gnome-session-common (<< 2.91.91.3-1),
+ gnome3-session
Breaks: bug-buddy (<< 2.20),
xserver-xorg (<< 1:7.4),
- gnome-power-manager (<< 2.28)
-Conflicts: gnome-splashscreen-manager
-Provides: x-session-manager
-Suggests: gnome-user-guide,
- desktop-base,
- gnome-keyring
-Description: The GNOME Session Manager - GNOME 2 session
- This package contains a session that can be started from a display
- manager such as GDM. It will load all necessary applications for a
- full-featured user session.
- .
- The session manager also features the ability to save a running session
- an restore it later.
- .
- This version is configured to start the GNOME 2 desktop, based on the
- GNOME panel.
-
-Package: gnome3-session
-Architecture: all
-Depends: ${misc:Depends},
- gnome-settings-daemon (>= 2.26),
- gnome-shell (>= 2.91),
- nautilus (>= 2.26),
- policykit-1-gnome,
- gnome-session-bin (>= ${binary:Version}),
- gnome-session-bin (<< ${gnome:NextVersion}),
- gnome-session-common (= ${binary:Version})
-Recommends: gnome-power-manager (>= 2.28)
-Breaks: bug-buddy (<< 2.20),
- xserver-xorg (<< 1:7.4),
- gnome-power-manager (<< 2.28)
-Provides: x-session-manager
+ gnome-power-manager (<< 2.28),
+ gnome-session-common (<< 2.91.91.3-1)
+Conflicts: gnome-splashscreen-manager,
+ gnome3-session
+Provides: x-session-manager,
+ gnome3-session
Suggests: gnome-user-guide,
desktop-base,
gnome-keyring
@@ -86,9 +65,6 @@
.
The session manager also features the ability to save a running session
an restore it later.
- .
- This version is configured to start the GNOME 3 desktop, based on the
- GNOME shell.
Package: gnome-session-bin
Architecture: any
@@ -103,13 +79,3 @@
gnome-session by hand with the components of their choice, and for
applications such as GDM that use gnome-session internally.
-Package: gnome-session-common
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: gnome-session (<< 2.28.0-5),
- libgnomevfs2-common (<< 1:2.24.0-3)
-Breaks: gnome-session (<< 2.28.0-5),
- libgnomevfs2-common (<< 1:2.24.0-3)
-Description: Common files for the GNOME session manager
- This package contains common files for the GNOME 2 and GNOME 3
- sessions, such as icons, translations and startup scripts.
Modified: desktop/experimental/gnome-session/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/control.in?rev=26877&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-session/debian/control.in [utf-8] Mon Mar 14 20:16:08 2011
@@ -5,14 +5,17 @@
Uploaders: @GNOME_TEAM@
Standards-Version: 3.9.0
Build-Depends: cdbs (>= 0.4.41),
+ dh-autoreconf,
debhelper (>= 5.0.13),
gnome-pkg-tools (>= 0.13),
+ gnome-common,
intltool (>= 0.40.0),
libglib2.0-dev (>= 2.16.0),
- libgtk2.0-dev (>= 2.14.0),
+ libgtk-3-dev (>= 3.0.0),
libupower-glib-dev (>= 0.9.0),
libdbus-glib-1-dev (>= 0.76),
libgconf2-dev (>= 2.10.1-6),
+ librsvg2-dev,
libstartup-notification0-dev,
libsm-dev,
libice-dev,
@@ -30,47 +33,23 @@
Depends: ${misc:Depends},
gnome-settings-daemon (>= 2.26),
gnome-panel (>= 2.26),
- metacity | mutter | sawfish,
+ gnome-shell | metacity,
nautilus (>= 2.26),
policykit-1-gnome,
+ gsettings-desktop-schemas,
gnome-session-bin (>= ${binary:Version}),
- gnome-session-bin (<< ${gnome:NextVersion}),
- gnome-session-common (= ${binary:Version})
+ gnome-session-bin (<< ${gnome:NextVersion})
Recommends: gnome-power-manager (>= 2.28)
+Replaces: gnome-session-common (<< 2.91.91.3-1),
+ gnome3-session
Breaks: bug-buddy (<< 2.20),
xserver-xorg (<< 1:7.4),
- gnome-power-manager (<< 2.28)
-Conflicts: gnome-splashscreen-manager
-Provides: x-session-manager
-Suggests: gnome-user-guide,
- desktop-base,
- gnome-keyring
-Description: The GNOME Session Manager - GNOME 2 session
- This package contains a session that can be started from a display
- manager such as GDM. It will load all necessary applications for a
- full-featured user session.
- .
- The session manager also features the ability to save a running session
- an restore it later.
- .
- This version is configured to start the GNOME 2 desktop, based on the
- GNOME panel.
-
-Package: gnome3-session
-Architecture: all
-Depends: ${misc:Depends},
- gnome-settings-daemon (>= 2.26),
- gnome-shell (>= 2.91),
- nautilus (>= 2.26),
- policykit-1-gnome,
- gnome-session-bin (>= ${binary:Version}),
- gnome-session-bin (<< ${gnome:NextVersion}),
- gnome-session-common (= ${binary:Version})
-Recommends: gnome-power-manager (>= 2.28)
-Breaks: bug-buddy (<< 2.20),
- xserver-xorg (<< 1:7.4),
- gnome-power-manager (<< 2.28)
-Provides: x-session-manager
+ gnome-power-manager (<< 2.28),
+ gnome-session-common (<< 2.91.91.3-1)
+Conflicts: gnome-splashscreen-manager,
+ gnome3-session
+Provides: x-session-manager,
+ gnome3-session
Suggests: gnome-user-guide,
desktop-base,
gnome-keyring
@@ -81,9 +60,6 @@
.
The session manager also features the ability to save a running session
an restore it later.
- .
- This version is configured to start the GNOME 3 desktop, based on the
- GNOME shell.
Package: gnome-session-bin
Architecture: any
@@ -98,13 +74,3 @@
gnome-session by hand with the components of their choice, and for
applications such as GDM that use gnome-session internally.
-Package: gnome-session-common
-Architecture: all
-Depends: ${misc:Depends}
-Replaces: gnome-session (<< 2.28.0-5),
- libgnomevfs2-common (<< 1:2.24.0-3)
-Breaks: gnome-session (<< 2.28.0-5),
- libgnomevfs2-common (<< 1:2.24.0-3)
-Description: Common files for the GNOME session manager
- This package contains common files for the GNOME 2 and GNOME 3
- sessions, such as icons, translations and startup scripts.
Modified: desktop/experimental/gnome-session/debian/gnome-session-bin.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/gnome-session-bin.install?rev=26877&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/gnome-session-bin.install [utf-8] (original)
+++ desktop/experimental/gnome-session/debian/gnome-session-bin.install [utf-8] Mon Mar 14 20:16:08 2011
@@ -1,5 +1,7 @@
-debian/tmp/etc/gconf
debian/tmp/usr/bin/gnome-session*
-debian/tmp/usr/lib/gnome-session
+debian/tmp/usr/lib/gnome-session*
debian/tmp/usr/share/gnome-session
debian/tmp/usr/share/man/man1/gnome-session*
+debian/tmp/usr/share/glib-2.0/schemas/*
+debian/tmp/usr/share/GConf/gsettings/*
+debian/tmp/usr/share/applications/session-properties.desktop
Modified: desktop/experimental/gnome-session/debian/gnome-session.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/gnome-session.install?rev=26877&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/gnome-session.install [utf-8] (original)
+++ desktop/experimental/gnome-session/debian/gnome-session.install [utf-8] Mon Mar 14 20:16:08 2011
@@ -1,5 +1,6 @@
-debian/tmp/usr/bin/gnome-wm
-debian/tmp/usr/share/applications/gnome-wm.desktop
debian/tmp/usr/share/doc
-debian/tmp/usr/share/man/man1/gnome-wm*
debian/tmp/usr/share/xsessions
+debian/tmp/usr/share/icons
+debian/tmp/usr/share/locale
+debian/55gnome-session_gnomerc etc/X11/Xsession.d
+debian/defaults.list etc/gnome
Modified: desktop/experimental/gnome-session/debian/patches/10_session_save.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/patches/10_session_save.patch?rev=26877&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/patches/10_session_save.patch [utf-8] (original)
+++ desktop/experimental/gnome-session/debian/patches/10_session_save.patch [utf-8] Mon Mar 14 20:16:08 2011
@@ -1,10 +1,10 @@
Based on the patch in GNOME #575544
-Index: gnome-session-2.30.0/gnome-session/gsm-manager.c
-===================================================================
---- gnome-session-2.30.0.orig/gnome-session/gsm-manager.c 2010-04-13 22:43:50.193234971 +0200
-+++ gnome-session-2.30.0/gnome-session/gsm-manager.c 2010-04-13 22:45:09.769740854 +0200
-@@ -70,6 +70,7 @@
+Index: gnome-session-2.91.91.3/gnome-session/gsm-manager.c
+===================================================================
+--- gnome-session-2.91.91.3.orig/gnome-session/gsm-manager.c 2011-02-26 23:53:37.000000000 +0100
++++ gnome-session-2.91.91.3/gnome-session/gsm-manager.c 2011-03-14 18:39:39.154303002 +0100
+@@ -69,6 +69,7 @@
#define GSM_MANAGER_DBUS_NAME "org.gnome.SessionManager"
#define GSM_MANAGER_PHASE_TIMEOUT 10 /* seconds */
@@ -12,7 +12,7 @@
#define GDM_FLEXISERVER_COMMAND "gdmflexiserver"
#define GDM_FLEXISERVER_ARGS "--startnew Standard"
-@@ -1171,6 +1172,69 @@ query_end_session_complete (GsmManager *
+@@ -1306,6 +1307,69 @@
}
@@ -82,7 +82,7 @@
static guint32
generate_cookie (void)
{
-@@ -1245,6 +1309,21 @@ _on_query_end_session_timeout (GsmManage
+@@ -1386,6 +1450,21 @@
return FALSE;
}
@@ -104,9 +104,9 @@
static void
do_phase_query_end_session (GsmManager *manager)
{
-@@ -1881,13 +1960,32 @@ on_client_end_session_response (GsmClien
- const char *reason,
- GsmManager *manager)
+@@ -2054,13 +2133,32 @@
+ gboolean cancel,
+ const char *reason)
{
- /* just ignore if received outside of shutdown */
- if (manager->priv->phase < GSM_MANAGER_PHASE_QUERY_END_SESSION) {
@@ -139,7 +139,7 @@
if (cancel) {
cancel_end_session (manager);
return;
-@@ -1986,6 +2084,15 @@ on_xsmp_client_logout_request (GsmXSMPCl
+@@ -2175,6 +2273,15 @@
}
static void
@@ -155,7 +155,7 @@
on_store_client_added (GsmStore *store,
const char *id,
GsmManager *manager)
-@@ -2006,6 +2113,10 @@ on_store_client_added (GsmStore *store
+@@ -2195,6 +2302,10 @@
"logout-request",
G_CALLBACK (on_xsmp_client_logout_request),
manager);
@@ -166,7 +166,7 @@
}
g_signal_connect (client,
-@@ -2967,6 +3078,41 @@ gsm_manager_shutdown (GsmManager *manage
+@@ -3237,6 +3348,41 @@
}
gboolean
@@ -208,11 +208,11 @@
gsm_manager_can_shutdown (GsmManager *manager,
gboolean *shutdown_available,
GError **error)
-Index: gnome-session-2.30.0/gnome-session/gsm-manager.h
-===================================================================
---- gnome-session-2.30.0.orig/gnome-session/gsm-manager.h 2010-04-13 22:43:47.605735935 +0200
-+++ gnome-session-2.30.0/gnome-session/gsm-manager.h 2010-04-13 22:45:09.773737032 +0200
-@@ -152,6 +152,9 @@ gboolean gsm_manager_is_inhib
+Index: gnome-session-2.91.91.3/gnome-session/gsm-manager.h
+===================================================================
+--- gnome-session-2.91.91.3.orig/gnome-session/gsm-manager.h 2011-02-16 17:59:36.000000000 +0100
++++ gnome-session-2.91.91.3/gnome-session/gsm-manager.h 2011-03-14 18:39:39.154303002 +0100
+@@ -160,6 +160,9 @@
gboolean gsm_manager_shutdown (GsmManager *manager,
GError **error);
@@ -222,11 +222,11 @@
gboolean gsm_manager_can_shutdown (GsmManager *manager,
gboolean *shutdown_available,
GError **error);
-Index: gnome-session-2.30.0/gnome-session/gsm-xsmp-client.c
-===================================================================
---- gnome-session-2.30.0.orig/gnome-session/gsm-xsmp-client.c 2010-04-13 22:43:47.593735178 +0200
-+++ gnome-session-2.30.0/gnome-session/gsm-xsmp-client.c 2010-04-13 22:45:09.773737032 +0200
-@@ -69,6 +69,7 @@ enum {
+Index: gnome-session-2.91.91.3/gnome-session/gsm-xsmp-client.c
+===================================================================
+--- gnome-session-2.91.91.3.orig/gnome-session/gsm-xsmp-client.c 2010-11-30 08:07:11.000000000 +0100
++++ gnome-session-2.91.91.3/gnome-session/gsm-xsmp-client.c 2011-03-14 18:39:39.158303002 +0100
+@@ -67,6 +67,7 @@
enum {
REGISTER_REQUEST,
LOGOUT_REQUEST,
@@ -234,7 +234,7 @@
LAST_SIGNAL
};
-@@ -502,6 +503,30 @@ xsmp_cancel_end_session (GsmClient *clie
+@@ -500,6 +501,30 @@
return TRUE;
}
@@ -265,7 +265,7 @@
static char *
get_desktop_file_path (GsmXSMPClient *client)
{
-@@ -976,6 +1001,7 @@ gsm_xsmp_client_class_init (GsmXSMPClien
+@@ -974,6 +999,7 @@
object_class->get_property = gsm_xsmp_client_get_property;
object_class->set_property = gsm_xsmp_client_set_property;
@@ -273,7 +273,7 @@
client_class->impl_save = xsmp_save;
client_class->impl_stop = xsmp_stop;
client_class->impl_query_end_session = xsmp_query_end_session;
-@@ -1003,6 +1029,17 @@ gsm_xsmp_client_class_init (GsmXSMPClien
+@@ -1001,6 +1027,17 @@
NULL,
NULL,
g_cclosure_marshal_VOID__BOOLEAN,
@@ -291,11 +291,11 @@
G_TYPE_NONE,
1, G_TYPE_BOOLEAN);
-Index: gnome-session-2.30.0/gnome-session/gsm-xsmp-client.h
-===================================================================
---- gnome-session-2.30.0.orig/gnome-session/gsm-xsmp-client.h 2010-04-13 22:43:47.581740287 +0200
-+++ gnome-session-2.30.0/gnome-session/gsm-xsmp-client.h 2010-04-13 22:45:09.773737032 +0200
-@@ -54,7 +54,8 @@ struct _GsmXSMPClientClass
+Index: gnome-session-2.91.91.3/gnome-session/gsm-xsmp-client.h
+===================================================================
+--- gnome-session-2.91.91.3.orig/gnome-session/gsm-xsmp-client.h 2010-10-12 17:47:12.000000000 +0200
++++ gnome-session-2.91.91.3/gnome-session/gsm-xsmp-client.h 2011-03-14 18:39:39.158303002 +0100
+@@ -54,7 +54,8 @@
char **client_id);
gboolean (*logout_request) (GsmXSMPClient *client,
gboolean prompt);
@@ -305,10 +305,10 @@
void (*saved_state) (GsmXSMPClient *client);
-Index: gnome-session-2.30.0/gnome-session/org.gnome.SessionManager.xml
-===================================================================
---- gnome-session-2.30.0.orig/gnome-session/org.gnome.SessionManager.xml 2010-04-13 22:43:47.573736685 +0200
-+++ gnome-session-2.30.0/gnome-session/org.gnome.SessionManager.xml 2010-04-13 22:45:09.773737032 +0200
+Index: gnome-session-2.91.91.3/gnome-session/org.gnome.SessionManager.xml
+===================================================================
+--- gnome-session-2.91.91.3.orig/gnome-session/org.gnome.SessionManager.xml 2010-10-12 17:47:12.000000000 +0200
++++ gnome-session-2.91.91.3/gnome-session/org.gnome.SessionManager.xml 2011-03-14 18:39:39.158303002 +0100
@@ -256,6 +256,14 @@
</doc:doc>
</method>
@@ -324,11 +324,11 @@
<method name="CanShutdown">
<arg name="is_available" direction="out" type="b">
<doc:doc>
-Index: gnome-session-2.30.0/capplet/gsm-properties-dialog.c
-===================================================================
---- gnome-session-2.30.0.orig/capplet/gsm-properties-dialog.c 2010-04-13 22:43:47.513740722 +0200
-+++ gnome-session-2.30.0/capplet/gsm-properties-dialog.c 2010-04-13 22:45:09.773737032 +0200
-@@ -35,6 +35,12 @@
+Index: gnome-session-2.91.91.3/capplet/gsm-properties-dialog.c
+===================================================================
+--- gnome-session-2.91.91.3.orig/capplet/gsm-properties-dialog.c 2011-02-10 01:51:46.000000000 +0100
++++ gnome-session-2.91.91.3/capplet/gsm-properties-dialog.c 2011-03-14 18:39:39.158303002 +0100
+@@ -33,6 +33,12 @@
#include "gsm-util.h"
#include "gsp-app.h"
#include "gsp-app-manager.h"
@@ -341,7 +341,7 @@
#define GSM_PROPERTIES_DIALOG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSM_TYPE_PROPERTIES_DIALOG, GsmPropertiesDialogPrivate))
-@@ -50,6 +56,7 @@
+@@ -43,6 +49,7 @@
#define CAPPLET_DELETE_WIDGET_NAME "session_properties_delete_button"
#define CAPPLET_EDIT_WIDGET_NAME "session_properties_edit_button"
#define CAPPLET_SAVE_WIDGET_NAME "session_properties_save_button"
@@ -349,7 +349,7 @@
#define CAPPLET_REMEMBER_WIDGET_NAME "session_properties_remember_toggle"
#define STARTUP_APP_ICON "system-run"
-@@ -493,10 +500,64 @@ on_autosave_value_toggled (GtkToggleButt
+@@ -455,10 +462,64 @@
}
static void
@@ -415,23 +415,23 @@
}
static void
-Index: gnome-session-2.30.0/configure.in
-===================================================================
---- gnome-session-2.30.0.orig/configure.in 2010-04-13 22:43:50.193234971 +0200
-+++ gnome-session-2.30.0/configure.in 2010-04-13 22:45:09.773737032 +0200
-@@ -57,6 +57,7 @@ PKG_CHECK_MODULES(GNOME_SESSION,
+Index: gnome-session-2.91.91.3/configure.ac
+===================================================================
+--- gnome-session-2.91.91.3.orig/configure.ac 2011-03-09 17:46:06.000000000 +0100
++++ gnome-session-2.91.91.3/configure.ac 2011-03-14 18:40:07.838303002 +0100
+@@ -63,6 +63,7 @@
PKG_CHECK_MODULES(SESSION_PROPERTIES,
glib-2.0 >= $GLIB_REQUIRED
- gtk+-2.0 >= $GTK_REQUIRED
+ gtk+-3.0 >= $GTK3_REQUIRED
+ dbus-glib-1 >= $DBUS_GLIB_REQUIRED
)
- PKG_CHECK_MODULES(SPLASH,
-Index: gnome-session-2.30.0/gnome-session/gsm-client.h
-===================================================================
---- gnome-session-2.30.0.orig/gnome-session/gsm-client.h 2010-04-13 22:43:47.561735927 +0200
-+++ gnome-session-2.30.0/gnome-session/gsm-client.h 2010-04-13 22:45:09.773737032 +0200
-@@ -92,6 +92,9 @@ struct _GsmClientClass
+ PKG_CHECK_MODULES(SM, sm)
+Index: gnome-session-2.91.91.3/gnome-session/gsm-client.h
+===================================================================
+--- gnome-session-2.91.91.3.orig/gnome-session/gsm-client.h 2010-10-12 17:47:12.000000000 +0200
++++ gnome-session-2.91.91.3/gnome-session/gsm-client.h 2011-03-14 18:39:39.158303002 +0100
+@@ -92,6 +92,9 @@
GError **error);
gboolean (*impl_stop) (GsmClient *client,
GError **error);
@@ -441,7 +441,7 @@
GKeyFile * (*impl_save) (GsmClient *client,
GError **error);
};
-@@ -137,6 +140,9 @@ gboolean gsm_client_cancel_
+@@ -137,6 +140,9 @@
void gsm_client_disconnected (GsmClient *client);
@@ -451,11 +451,11 @@
GKeyFile *gsm_client_save (GsmClient *client,
GError **error);
/* exported to bus */
-Index: gnome-session-2.30.0/gnome-session/gsm-dbus-client.c
-===================================================================
---- gnome-session-2.30.0.orig/gnome-session/gsm-dbus-client.c 2010-04-13 22:43:47.549737125 +0200
-+++ gnome-session-2.30.0/gnome-session/gsm-dbus-client.c 2010-04-13 22:45:09.773737032 +0200
-@@ -413,6 +413,19 @@ gsm_dbus_client_finalize (GObject *objec
+Index: gnome-session-2.91.91.3/gnome-session/gsm-dbus-client.c
+===================================================================
+--- gnome-session-2.91.91.3.orig/gnome-session/gsm-dbus-client.c 2010-11-30 08:07:11.000000000 +0100
++++ gnome-session-2.91.91.3/gnome-session/gsm-dbus-client.c 2011-03-14 18:39:39.158303002 +0100
+@@ -412,6 +412,19 @@
G_OBJECT_CLASS (gsm_dbus_client_parent_class)->finalize (object);
}
@@ -475,7 +475,7 @@
static GKeyFile *
dbus_client_save (GsmClient *client,
GError **error)
-@@ -665,6 +678,7 @@ gsm_dbus_client_class_init (GsmDBusClien
+@@ -664,6 +677,7 @@
object_class->set_property = gsm_dbus_client_set_property;
object_class->dispose = gsm_dbus_client_dispose;
@@ -483,11 +483,11 @@
client_class->impl_save = dbus_client_save;
client_class->impl_stop = dbus_client_stop;
client_class->impl_query_end_session = dbus_client_query_end_session;
-Index: gnome-session-2.30.0/gnome-session/gsm-client.c
-===================================================================
---- gnome-session-2.30.0.orig/gnome-session/gsm-client.c 2010-04-13 22:43:47.537738813 +0200
-+++ gnome-session-2.30.0/gnome-session/gsm-client.c 2010-04-13 22:45:09.777736633 +0200
-@@ -510,6 +510,16 @@ gsm_client_disconnected (GsmClient *clie
+Index: gnome-session-2.91.91.3/gnome-session/gsm-client.c
+===================================================================
+--- gnome-session-2.91.91.3.orig/gnome-session/gsm-client.c 2010-10-12 17:47:12.000000000 +0200
++++ gnome-session-2.91.91.3/gnome-session/gsm-client.c 2011-03-14 18:39:39.158303002 +0100
+@@ -510,6 +510,16 @@
g_signal_emit (client, signals[DISCONNECTED], 0);
}
@@ -504,10 +504,10 @@
GKeyFile *
gsm_client_save (GsmClient *client,
GError **error)
-Index: gnome-session-2.30.0/data/session-properties.ui
-===================================================================
---- gnome-session-2.30.0.orig/data/session-properties.ui 2010-04-13 22:43:47.461741519 +0200
-+++ gnome-session-2.30.0/data/session-properties.ui 2010-04-13 22:45:09.777736633 +0200
+Index: gnome-session-2.91.91.3/data/session-properties.ui
+===================================================================
+--- gnome-session-2.91.91.3.orig/data/session-properties.ui 2010-10-12 17:47:12.000000000 +0200
++++ gnome-session-2.91.91.3/data/session-properties.ui 2011-03-14 18:39:39.158303002 +0100
@@ -148,6 +148,7 @@
<property name="visible">True</property>
<child>
Modified: desktop/experimental/gnome-session/debian/patches/11_saved_session_name.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/patches/11_saved_session_name.patch?rev=26877&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/patches/11_saved_session_name.patch [utf-8] (original)
+++ desktop/experimental/gnome-session/debian/patches/11_saved_session_name.patch [utf-8] Mon Mar 14 20:16:08 2011
@@ -1,7 +1,7 @@
-Index: gnome-session-2.30.2/gnome-session/gsm-util.c
+Index: gnome-session-2.91.91.3/gnome-session/gsm-util.c
===================================================================
---- gnome-session-2.30.2.orig/gnome-session/gsm-util.c 2010-02-09 14:22:01.000000000 +0100
-+++ gnome-session-2.30.2/gnome-session/gsm-util.c 2010-07-22 17:14:59.450607567 +0200
+--- gnome-session-2.91.91.3.orig/gnome-session/gsm-util.c 2010-10-12 17:47:12.000000000 +0200
++++ gnome-session-2.91.91.3/gnome-session/gsm-util.c 2011-03-14 18:41:34.266303001 +0100
@@ -36,6 +36,7 @@
#include "gsm-util.h"
@@ -32,11 +32,11 @@
NULL);
exists = ensure_dir_exists (_saved_session_dir);
-Index: gnome-session-2.30.2/gnome-session/gsm-util.h
+Index: gnome-session-2.91.91.3/gnome-session/gsm-util.h
===================================================================
---- gnome-session-2.30.2.orig/gnome-session/gsm-util.h 2010-02-09 14:22:01.000000000 +0100
-+++ gnome-session-2.30.2/gnome-session/gsm-util.h 2010-07-22 17:14:59.450607567 +0200
-@@ -29,6 +29,8 @@
+--- gnome-session-2.91.91.3.orig/gnome-session/gsm-util.h 2010-11-30 08:07:11.000000000 +0100
++++ gnome-session-2.91.91.3/gnome-session/gsm-util.h 2011-03-14 18:41:34.266303001 +0100
+@@ -31,6 +31,8 @@
gchar *gsm_util_get_empty_tmp_session_dir (void);
@@ -45,23 +45,23 @@
const char *gsm_util_get_saved_session_dir (void);
gchar** gsm_util_get_app_dirs (void);
-Index: gnome-session-2.30.2/gnome-session/main.c
+Index: gnome-session-2.91.91.3/gnome-session/main.c
===================================================================
---- gnome-session-2.30.2.orig/gnome-session/main.c 2010-03-30 01:46:51.000000000 +0200
-+++ gnome-session-2.30.2/gnome-session/main.c 2010-07-22 17:14:59.450607567 +0200
-@@ -433,9 +433,11 @@
+--- gnome-session-2.91.91.3.orig/gnome-session/main.c 2011-02-26 23:53:37.000000000 +0100
++++ gnome-session-2.91.91.3/gnome-session/main.c 2011-03-14 18:48:51.882303002 +0100
+@@ -272,9 +272,11 @@
GdmSignalHandler *signal_handler;
static char **override_autostart_dirs = NULL;
- static char *default_session_key = NULL;
+ static char *session_name = NULL;
+ static char *saved_session_name = NULL;
static GOptionEntry entries[] = {
{ "autostart", 'a', 0, G_OPTION_ARG_STRING_ARRAY, &override_autostart_dirs, N_("Override standard autostart directories"), NULL },
- { "default-session-key", 0, 0, G_OPTION_ARG_STRING, &default_session_key, N_("GConf key used to lookup default session"), NULL },
+ { "session", 0, 0, G_OPTION_ARG_STRING, &session_name, N_("Session to use"), NULL },
+ { "saved-session", 0, 0, G_OPTION_ARG_STRING, &saved_session_name, N_("Override name of the saved session")},
{ "debug", 0, 0, G_OPTION_ARG_NONE, &debug, N_("Enable debugging code"), NULL },
{ "failsafe", 'f', 0, G_OPTION_ARG_NONE, &failsafe, N_("Do not load user-specified applications"), NULL },
{ "version", 0, 0, G_OPTION_ARG_NONE, &show_version, N_("Version of this application"), NULL },
-@@ -470,6 +472,9 @@
+@@ -309,6 +311,9 @@
g_print ("%s %s\n", argv [0], VERSION);
exit (1);
}
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=26877&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] Mon Mar 14 20:16:08 2011
@@ -3,11 +3,11 @@
Don’t fall back to GDM when ConsoleKit fails. If CK is not available, it
will not be attempted anyway.
-Index: gnome-session-2.28.0/gnome-session/gsm-manager.c
+Index: gnome-session-2.91.91.3/gnome-session/gsm-manager.c
===================================================================
---- gnome-session-2.28.0.orig/gnome-session/gsm-manager.c 2010-03-02 09:50:28.083214273 +0100
-+++ gnome-session-2.28.0/gnome-session/gsm-manager.c 2010-03-02 09:51:19.974714717 +0100
-@@ -424,7 +424,7 @@ gsm_manager_quit (GsmManager *manager)
+--- gnome-session-2.91.91.3.orig/gnome-session/gsm-manager.c 2011-03-14 18:39:39.154303002 +0100
++++ gnome-session-2.91.91.3/gnome-session/gsm-manager.c 2011-03-14 18:49:18.686303002 +0100
+@@ -436,7 +436,7 @@
g_signal_connect (consolekit,
"request-completed",
G_CALLBACK (quit_request_completed),
@@ -16,7 +16,7 @@
gsm_consolekit_attempt_restart (consolekit);
break;
case GSM_MANAGER_LOGOUT_REBOOT_GDM:
-@@ -439,7 +439,7 @@ gsm_manager_quit (GsmManager *manager)
+@@ -451,7 +451,7 @@
g_signal_connect (consolekit,
"request-completed",
G_CALLBACK (quit_request_completed),
Added: desktop/experimental/gnome-session/debian/patches/13_no_fallback_notification.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/patches/13_no_fallback_notification.patch?rev=26877&op=file
==============================================================================
--- desktop/experimental/gnome-session/debian/patches/13_no_fallback_notification.patch (added)
+++ desktop/experimental/gnome-session/debian/patches/13_no_fallback_notification.patch [utf-8] Mon Mar 14 20:16:08 2011
@@ -1,0 +1,12 @@
+Index: gnome-session-2.91.91.3/data/gnome-fallback.session.desktop.in.in
+===================================================================
+--- gnome-session-2.91.91.3.orig/data/gnome-fallback.session.desktop.in.in 2011-03-14 20:53:21.114303002 +0100
++++ gnome-session-2.91.91.3/data/gnome-fallback.session.desktop.in.in 2011-03-14 20:53:24.506303002 +0100
+@@ -1,6 +1,6 @@
+ [GNOME Session]
+ _Name=GNOME fallback
+-Required=windowmanager;panel;notifications;
++Required=windowmanager;panel;
+ Required-windowmanager=metacity
+ Required-panel=gnome-panel
+ Required-notifications=notification-daemon
Modified: desktop/experimental/gnome-session/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/patches/series?rev=26877&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/patches/series [utf-8] (original)
+++ desktop/experimental/gnome-session/debian/patches/series [utf-8] Mon Mar 14 20:16:08 2011
@@ -1,6 +1,4 @@
-01_gnome-wm.patch
-03_upower.patch
10_session_save.patch
11_saved_session_name.patch
12_no_gdm_fallback.patch
-90_relibtoolize.patch
+13_no_fallback_notification.patch
Modified: desktop/experimental/gnome-session/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/rules?rev=26877&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-session/debian/rules [utf-8] Mon Mar 14 20:16:08 2011
@@ -1,5 +1,6 @@
#!/usr/bin/make -f
+include /usr/share/cdbs/1/rules/autoreconf.mk
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/gnome.mk
include /usr/share/cdbs/1/rules/utils.mk
@@ -10,14 +11,6 @@
DEB_CONFIGURE_EXTRA_FLAGS += --localstatedir=/var/lib \
--libexecdir=/usr/lib \
- --enable-ipv6 \
- --with-default-wm=gnome-wm
+ --enable-ipv6
LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
-
-# Build desktop file for gnome3-session
-%.desktop: %.desktop.in
- intltool-merge -d po $< $@
-build/gnome3-session:: debian/gnome3.desktop
-clean::
- rm -f debian/gnome3.desktop
More information about the pkg-gnome-commits
mailing list