r26885 - 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:37:25 2011
New Revision: 26885

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=26885
Log:
Do not put the fallback session in its own package.

Removed:
    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=26885&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-session/debian/control [utf-8] Mon Mar 14 22:37:25 2011
@@ -38,6 +38,12 @@
 Depends: ${misc:Depends},
          gnome-settings-daemon,
          gnome-shell,
+         nautilus (>= 2.26),
+         policykit-1-gnome,
+         gnome-panel (>= 2.26),
+         metacity,
+         nautilus (>= 2.26),
+         notification-daemon,
          gsettings-desktop-schemas,
          gnome-session-bin (>= ${binary:Version}),
          gnome-session-bin (<< ${gnome:NextVersion})
@@ -77,21 +83,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-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=26885&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:37:25 2011
@@ -33,6 +33,12 @@
 Depends: ${misc:Depends},
          gnome-settings-daemon,
          gnome-shell,
+         nautilus (>= 2.26),
+         policykit-1-gnome,
+         gnome-panel (>= 2.26),
+         metacity,
+         nautilus (>= 2.26),
+         notification-daemon,
          gsettings-desktop-schemas,
          gnome-session-bin (>= ${binary:Version}),
          gnome-session-bin (<< ${gnome:NextVersion})
@@ -72,21 +78,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-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/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-session/debian/rules?rev=26885&op=diff
==============================================================================
--- desktop/experimental/gnome-session/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-session/debian/rules [utf-8] Mon Mar 14 22:37:25 2011
@@ -15,8 +15,3 @@
 
 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
-