r26884 - in /desktop/experimental/gnome-session/debian: control control.in gnome-session-fallback.install rules

[fpeters at users.alioth.debian.org]

Author: fpeters
Date: Mon Mar 14 22:18:02 2011
New Revision: 26884

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26884
Log:
move the fallback gnome session to its own package

Added:
    desktop/experimental/gnome-session/debian/gnome-session-fallback.install
Modified:
    desktop/experimental/gnome-session/debian/control
    desktop/experimental/gnome-session/debian/control.in
    desktop/experimental/gnome-session/debian/rules

Modified: desktop/experimental/gnome-session/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/control?rev=26884&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-session/debian/control [utf-8] Mon Mar 14 22:18:02 2011
@@ -36,15 +36,12 @@
 Package: gnome-session
 Architecture: all
 Depends: ${misc:Depends},
-         gnome-settings-daemon (>= 2.26),
-         gnome-panel (>= 2.26),
-         gnome-shell | metacity,
-         nautilus (>= 2.26),
-         policykit-1-gnome,
+         gnome-settings-daemon,
+         gnome-shell,
          gsettings-desktop-schemas,
          gnome-session-bin (>= ${binary:Version}),
          gnome-session-bin (<< ${gnome:NextVersion})
-Recommends: gnome-power-manager (>= 2.28)
+Recommends: gnome-session-fallback, gnome-power-manager (>= 2.28)
 Replaces: gnome-session-common (<< 2.91.91.3-1),
           gnome3-session
 Breaks: bug-buddy (<< 2.20),
@@ -73,9 +70,28 @@
          dbus-x11,
          upower (>= 0.9.0)
 Conflicts: gnome-session (<< 2.26.1-5)
+Replaces: gnome-session-common (<< 2.91.91.3-1)
 Description: The GNOME Session Manager - Minimal runtime
  This package contains the binaries for the GNOME Session Manager, but
  no startup scripts. It is meant for those willing to start
  gnome-session by hand with the components of their choice, and for
  applications such as GDM that use gnome-session internally.
 
+Package: gnome-session-fallback
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-session-bin (>= ${source:Version}),
+         nautilus (>= 2.26),
+         policykit-1-gnome,
+         gnome-panel (>= 2.26),
+         metacity,
+         nautilus (>= 2.26),
+         notification-daemon
+Recommends: gnome-power-manager (>= 2.28)
+Description: The GNOME Session Manager - GNOME 3 fallback session
+ This package contains the GNOME 3 fallback session, that will be
+ started if the normal GNOME 3 session can't be used.
+ .
+ The session manager also features the ability to save a running session
+ an restore it later.
+

Modified: desktop/experimental/gnome-session/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/control.in?rev=26884&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-session/debian/control.in [utf-8] Mon Mar 14 22:18:02 2011
@@ -31,15 +31,12 @@
 Package: gnome-session
 Architecture: all
 Depends: ${misc:Depends},
-         gnome-settings-daemon (>= 2.26),
-         gnome-panel (>= 2.26),
-         gnome-shell | metacity,
-         nautilus (>= 2.26),
-         policykit-1-gnome,
+         gnome-settings-daemon,
+         gnome-shell,
          gsettings-desktop-schemas,
          gnome-session-bin (>= ${binary:Version}),
          gnome-session-bin (<< ${gnome:NextVersion})
-Recommends: gnome-power-manager (>= 2.28)
+Recommends: gnome-session-fallback, gnome-power-manager (>= 2.28)
 Replaces: gnome-session-common (<< 2.91.91.3-1),
           gnome3-session
 Breaks: bug-buddy (<< 2.20),
@@ -75,3 +72,21 @@
  gnome-session by hand with the components of their choice, and for
  applications such as GDM that use gnome-session internally.
 
+Package: gnome-session-fallback
+Architecture: all
+Depends: ${misc:Depends},
+         gnome-session-bin (>= ${source:Version}),
+         nautilus (>= 2.26),
+         policykit-1-gnome,
+         gnome-panel (>= 2.26),
+         metacity,
+         nautilus (>= 2.26),
+         notification-daemon
+Recommends: gnome-power-manager (>= 2.28)
+Description: The GNOME Session Manager - GNOME 3 fallback session
+ This package contains the GNOME 3 fallback session, that will be
+ started if the normal GNOME 3 session can't be used.
+ .
+ The session manager also features the ability to save a running session
+ an restore it later.
+

Added: desktop/experimental/gnome-session/debian/gnome-session-fallback.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/gnome-session-fallback.install?rev=26884&op=file
==============================================================================
--- desktop/experimental/gnome-session/debian/gnome-session-fallback.install (added)
+++ desktop/experimental/gnome-session/debian/gnome-session-fallback.install [utf-8] Mon Mar 14 22:18:02 2011
@@ -1,0 +1,1 @@
+debian/tmp/usr/share/gnome-session/sessions/gnome-fallback.session

Modified: desktop/experimental/gnome-session/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/rules?rev=26884&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-session/debian/rules [utf-8] Mon Mar 14 22:18:02 2011
@@ -14,3 +14,9 @@
 	--enable-ipv6
 
 LDFLAGS += -Wl,-z,defs -Wl,-O1 -Wl,--as-needed
+
+binary-post-install/gnome-session-bin::
+	# remove fallback session from gnome-session-bin, it will go in the
+	# gnome-session-fallback package
+	rm -rf `pwd`/debian/gnome-session-bin/usr/share/gnome-session/sessions/gnome-fallback.session
+