[Pkg-ocaml-maint-commits] [SCM] marionnet packaging branch, master, updated. upstream/0.90.6+bzr427-58-g99edf34

[Lucas Nussbaum]

The following commit has been merged in the master branch:
commit 62f28795db1d6b057ecb2ab70091d36875d66a99
Author: Lucas Nussbaum <lucas at debian.org>
Date:   Wed Jul 10 08:45:03 2013 +0200

    Drop instructions about UBUNTU_MENUPROXY, a fix was included upstream.

diff --git a/debian/README.Debian b/debian/README.Debian
index c233630..377ceaf 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -23,12 +23,8 @@ To install the i386 libc on an amd64 system, as root, run:
 
 Running Marionnet on Ubuntu
 ===========================
-1) You need to: export UBUNTU_MENUPROXY=0
-   before start Marionnet, or the icons on the left won't show up.
-[FIXME: this should be turned into a patch]
-
-2) lightdm starts X with '-nolisten tcp'. You need to allow TCP connections
-   to the X server. Edit /etc/lightdm/lightdm.conf and add
+lightdm starts X with '-nolisten tcp'. You need to allow TCP connections
+to the X server. Edit /etc/lightdm/lightdm.conf and add
        xserver-allow-tcp=true
    in the [SeatDefaults] section.
 [FIXME: the init script should check for that and issue a warning]

-- 
marionnet packaging