Merge lp:~shnatsel/ubuntu/precise/gnome-session/gnome-session-fix-899568 into lp:ubuntu/precise/gnome-session

[Sergey "Shnatsel" Davidoff]

Moved registering gnome-session binary in alternatives system to gnome-session-bin package from the package shipping config files

[Martin Pitt (pitti)]

Thanks! I merged it into lp:~ubuntu-desktop/gnome-session/ubuntu which is the actually used branch for this (see Vcs-Bzr: field). Thus I mark this as merged manually.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-11-29 13:53:43 +0000
+++ debian/changelog	2011-12-03 11:57:27 +0000
@@ -1,3 +1,12 @@
+gnome-session (3.2.1-0ubuntu3) precise; urgency=low
+
+  * debian/gnome-session-bin.postinst, debian/gnome-session-bin.prerm:
+    - Moved registering gnome-session binary as a session manager to 
+      gnome-session-bin package
+      LP: #899568
+
+ -- Sergey "Shnatsel" Davidoff <[e-mail]>  Sat, 03 Dec 2011 14:51:58 +0300
+
 gnome-session (3.2.1-0ubuntu2) precise; urgency=low
 
   * debian/patches/105_hide_session_startup_help.patch:

=== added file 'debian/gnome-session-bin.postinst'
--- debian/gnome-session-bin.postinst	1970-01-01 00:00:00 +0000
+++ debian/gnome-session-bin.postinst	2011-12-03 11:57:27 +0000
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = configure ]; then
+  update-alternatives --install /usr/bin/x-session-manager \
+    x-session-manager /usr/bin/gnome-session 50 \
+    --slave /usr/share/man/man1/x-session-manager.1.gz \
+    x-session-manager.1.gz /usr/share/man/man1/gnome-session.1.gz
+fi
+
+#DEBHELPER#

=== renamed file 'debian/gnome-session.prerm' => 'debian/gnome-session-bin.prerm'
=== modified file 'debian/gnome-session.postinst'
--- debian/gnome-session.postinst	2011-08-10 02:23:55 +0000
+++ debian/gnome-session.postinst	2011-12-03 11:57:27 +0000
@@ -2,13 +2,6 @@
 
 set -e
 
-if [ "$1" = configure ]; then
-  update-alternatives --install /usr/bin/x-session-manager \
-    x-session-manager /usr/bin/gnome-session 50 \
-    --slave /usr/share/man/man1/x-session-manager.1.gz \
-    x-session-manager.1.gz /usr/share/man/man1/gnome-session.1.gz
-fi
-
 case "$1" in
   configure|upgrade)
     if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then