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

Proposed by Sergey "Shnatsel" Davidoff on 2011-12-03
Status: Merged
Merge reported by: Martin Pitt
Merged at revision: not available
Proposed branch: lp:~shnatsel/ubuntu/precise/gnome-session/gnome-session-fix-899568
Merge into: lp:ubuntu/precise/gnome-session
Diff against target: 52 lines (+21/-7)
3 files modified
debian/changelog (+9/-0)
debian/gnome-session-bin.postinst (+12/-0)
debian/gnome-session.postinst (+0/-7)
To merge this branch: bzr merge lp:~shnatsel/ubuntu/precise/gnome-session/gnome-session-fix-899568
Reviewer Review Type Date Requested Status
Martin Pitt 2011-12-03 Approve on 2011-12-05
Review via email: mp+84363@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Martin Pitt (pitti) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-11-29 13:53:43 +0000
3+++ debian/changelog 2011-12-03 11:57:27 +0000
4@@ -1,3 +1,12 @@
5+gnome-session (3.2.1-0ubuntu3) precise; urgency=low
6+
7+ * debian/gnome-session-bin.postinst, debian/gnome-session-bin.prerm:
8+ - Moved registering gnome-session binary as a session manager to
9+ gnome-session-bin package
10+ LP: #899568
11+
12+ -- Sergey "Shnatsel" Davidoff <shnatsel@gmail.com> Sat, 03 Dec 2011 14:51:58 +0300
13+
14 gnome-session (3.2.1-0ubuntu2) precise; urgency=low
15
16 * debian/patches/105_hide_session_startup_help.patch:
17
18=== added file 'debian/gnome-session-bin.postinst'
19--- debian/gnome-session-bin.postinst 1970-01-01 00:00:00 +0000
20+++ debian/gnome-session-bin.postinst 2011-12-03 11:57:27 +0000
21@@ -0,0 +1,12 @@
22+#!/bin/sh
23+
24+set -e
25+
26+if [ "$1" = configure ]; then
27+ update-alternatives --install /usr/bin/x-session-manager \
28+ x-session-manager /usr/bin/gnome-session 50 \
29+ --slave /usr/share/man/man1/x-session-manager.1.gz \
30+ x-session-manager.1.gz /usr/share/man/man1/gnome-session.1.gz
31+fi
32+
33+#DEBHELPER#
34
35=== renamed file 'debian/gnome-session.prerm' => 'debian/gnome-session-bin.prerm'
36=== modified file 'debian/gnome-session.postinst'
37--- debian/gnome-session.postinst 2011-08-10 02:23:55 +0000
38+++ debian/gnome-session.postinst 2011-12-03 11:57:27 +0000
39@@ -2,13 +2,6 @@
40
41 set -e
42
43-if [ "$1" = configure ]; then
44- update-alternatives --install /usr/bin/x-session-manager \
45- x-session-manager /usr/bin/gnome-session 50 \
46- --slave /usr/share/man/man1/x-session-manager.1.gz \
47- x-session-manager.1.gz /usr/share/man/man1/gnome-session.1.gz
48-fi
49-
50 case "$1" in
51 configure|upgrade)
52 if [ -x /usr/lib/lightdm/lightdm-set-defaults ] ; then

Subscribers

People subscribed via source and target branches