[Pkg-haskell-commits] darcs: xmonad: Drop gnome+xmonad session (see NEWS)

Sun Sep 21 10:14:28 UTC 2014

Sun Sep 21 10:03:10 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Drop gnome+xmonad session (see NEWS)

     ./gnome-session-xmonad.1 -> ./xmonad-session.1
    M ./README.Debian +19
    M ./changelog -4 +3
    R ./gnome-session-xmonad
    R ./gnome-xmonad.desktop
    M ./rules -4 +1
    A ./xmonad-session
    M ./xmonad-session.1 -8 +9
    A ./xmonad.NEWS
    M ./xmonad.manpages -1 +1
    R ./xmonad.session

Sun Sep 21 10:03:10 UTC 2014  Joachim Breitner <mail at joachim-breitner.de>
  * Drop gnome+xmonad session (see NEWS)
diff -rN -u old-xmonad/changelog new-xmonad/changelog

--- old-xmonad/changelog	2014-09-21 10:14:27.944398298 +0000
+++ new-xmonad/changelog	2014-09-21 10:14:27.960398305 +0000
@@ -1,9 +1,8 @@
 xmonad (0.11-9) UNRELEASED; urgency=medium
 
-  * Remove gnome-panel from the xmonad.session file (Closes: #749389)
-    It seems that gnome-session 3.12 doesn't properly talk to gnome-panel any
-    more (i.e. won't shutdown); this attempts to work around it. It also means
-    that you have to start gnome-panel yourself, e.g. in ~/.gnomerc
+  * Drop gnome+xmonad session (see NEWS) (Closes: #749389)
+  * The xmonad session now supports the session file
+    ~/.xmonad/xmonad-session-rc (Closes: 484091)
 
  -- Joachim Breitner <nomeata at debian.org>  Fri, 18 Jul 2014 09:15:29 +0200
 
diff -rN -u old-xmonad/gnome-session-xmonad new-xmonad/gnome-session-xmonad
--- old-xmonad/gnome-session-xmonad	2014-09-21 10:14:27.944398298 +0000
+++ new-xmonad/gnome-session-xmonad	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-#! /bin/sh
-exec gnome-session --session xmonad "$@"
diff -rN -u old-xmonad/gnome-session-xmonad.1 new-xmonad/gnome-session-xmonad.1
--- old-xmonad/gnome-session-xmonad.1	2014-09-21 10:14:27.944398298 +0000
+++ new-xmonad/gnome-session-xmonad.1	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-.de EX
-.ne 5
-.if n .sp 1
-.if t .sp .5
-.nf
-.in +.5i
-..
-.de EE
-.fi
-.in -.5i
-.if n .sp 1
-.if t .sp .5
-..
-.TH GNOME-SESSION-XMONAD 1 "November 24, 2011"
-.SH NAME
-gnome-session-xmonad \- Start the XMonad window manager via Gnome session.
-.SH SYNOPSIS
-.B gnome-session-xmonad
-.RI arguments
-.SH DESCRIPTION
-Gnome-session-xmonad is a simple shell script that starts gnome-session with
-the regular Gnome window manager replaced with XMonad.
-
-Any command line arguments supplied will be passed on to gnome-session.
-
-.SH AUTHOR
-This manpage was written by Erik de Castro Lopo <erikd at mega-nerd.com>, for the
-Debian GNU/Linux system (but may be used by others).
diff -rN -u old-xmonad/gnome-xmonad.desktop new-xmonad/gnome-xmonad.desktop
--- old-xmonad/gnome-xmonad.desktop	2014-09-21 10:14:27.944398298 +0000
+++ new-xmonad/gnome-xmonad.desktop	1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=GNOME with Xmonad
-Comment=A GNOME fallback mode session using xmonad as the window manager.
-Exec=gnome-session-xmonad
-TryExec=gnome-session
-Icon=
-Type=Application
diff -rN -u old-xmonad/README.Debian new-xmonad/README.Debian
--- old-xmonad/README.Debian	2014-09-21 10:14:27.944398298 +0000
+++ new-xmonad/README.Debian	2014-09-21 10:14:27.948398300 +0000
@@ -1,3 +1,22 @@
+xmonad session
+==============
+
+The xmonad package registers a session "xmonad" with the display managers (e.g.
+gdm). This session
+
+ * sources .xmonad/xmonad-session-rc, if that file is available, and then
+ * executes xmonad.
+
+This provides a simple way to start auxillary programs and set up various
+things. Here are some suggestions what to put in that file:
+
+	xsetroot -xcf /usr/share/icons/Adwaita/cursors/left_ptr 16 -solid black
+	xscreensaver -nosplash &
+	$(gnome-keyring-daemon --start --daemonize)
+	setxkbmap de nodeadkeys
+	xmodmap ~/.Xmodmap
+
+
 xmonad packages for debian
 ==========================
 
diff -rN -u old-xmonad/rules new-xmonad/rules
--- old-xmonad/rules	2014-09-21 10:14:27.944398298 +0000
+++ new-xmonad/rules	2014-09-21 10:14:27.964398308 +0000
@@ -12,12 +12,9 @@
 	cp dist-ghc/build/xmonad/xmonad debian/xmonad/usr/bin/xmonad
 	# Pure xmonad session
 	install -D -m 0644 debian/xmonad-session.desktop debian/xmonad/usr/share/xsessions/xmonad.desktop
+	install -D -m 0755 debian/xmonad-session debian/xmonad/usr/bin/xmonad-session
 	# xmonad as window manager (gnome 2)
 	install -D -m 0644 debian/xmonad.desktop debian/xmonad/usr/share/applications/xmonad.desktop
-	# xmonad+gnome3 session
-	install -D -m 0644 debian/gnome-xmonad.desktop debian/xmonad/usr/share/xsessions/gnome-xmonad.desktop
-	install -D -m 0644 debian/xmonad.session debian/xmonad/usr/share/gnome-session/sessions/xmonad.session
-	install -D -m 0755 debian/gnome-session-xmonad debian/xmonad/usr/bin/gnome-session-xmonad
 
 clean::
 	rm -f man/xmonad.1 man/xmonad.1.html
diff -rN -u old-xmonad/xmonad.manpages new-xmonad/xmonad.manpages
--- old-xmonad/xmonad.manpages	2014-09-21 10:14:27.944398298 +0000
+++ new-xmonad/xmonad.manpages	2014-09-21 10:14:27.956398303 +0000
@@ -1,2 +1,2 @@
 man/xmonad.1
-debian/gnome-session-xmonad.1
+debian/xmonad-session.1
diff -rN -u old-xmonad/xmonad.NEWS new-xmonad/xmonad.NEWS
--- old-xmonad/xmonad.NEWS	1970-01-01 00:00:00.000000000 +0000
+++ new-xmonad/xmonad.NEWS	2014-09-21 10:14:27.956398303 +0000
@@ -0,0 +1,11 @@
+xmonad (0.11-9) UNRELEASED; urgency=medium
+
+ * GNOME session support dropped.
+   As it becomes harder and harder to run GNOME with a non-standard window
+   manager, the official support for that session has been removed from the
+   xmonad package.
+ * Pure xmonad session startup file
+   The "pure" xmonad sesion registered with the display managers now sources
+   .xmonad/xmonad-session-rc if found, for ease of configuration.
+
+ -- Joachim Breitner <nomeata at debian.org>  Sun, 21 Sep 2014 11:48:48 +0200
diff -rN -u old-xmonad/xmonad-session new-xmonad/xmonad-session
--- old-xmonad/xmonad-session	1970-01-01 00:00:00.000000000 +0000
+++ new-xmonad/xmonad-session	2014-09-21 10:14:27.956398303 +0000
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+if [ -r ".xmonad/xmonad-session-rc" ]
+then
+  . .xmonad/xmonad-session-rc
+fi
+
+exec xmonad "$@"
diff -rN -u old-xmonad/xmonad.session new-xmonad/xmonad.session
--- old-xmonad/xmonad.session	2014-09-21 10:14:27.944398298 +0000
+++ new-xmonad/xmonad.session	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-[GNOME Session]
-Name=Xmonad/GNOME
-RequiredComponents=gnome-settings-daemon;xmonad
diff -rN -u old-xmonad/xmonad-session.1 new-xmonad/xmonad-session.1
--- old-xmonad/xmonad-session.1	1970-01-01 00:00:00.000000000 +0000
+++ new-xmonad/xmonad-session.1	2014-09-21 10:14:27.956398303 +0000
@@ -0,0 +1,29 @@
+.de EX
+.ne 5
+.if n .sp 1
+.if t .sp .5
+.nf
+.in +.5i
+..
+.de EE
+.fi
+.in -.5i
+.if n .sp 1
+.if t .sp .5
+..
+.TH XMONAD-SESSION 1 "November 24, 2011"
+.SH NAME
+xmonad-sesssion \- Starts the XMonad window manager as a session
+.SH SYNOPSIS
+.B xmonad-session
+.RI arguments
+.SH DESCRIPTION
+xmonad-session is a simple shell script that starts sources the content of
+~/.xmonad/xmonad-session-rc (if that file exists) and then starts XMonad.
+
+Any command line arguments supplied will be passed on to XMonad.
+
+.SH AUTHOR
+This manpage was written by Erik de Castro Lopo <erikd at mega-nerd.com> and modified
+by Joachim Breitner <nomeata at debian.org> for the Debian GNU/Linux system (but
+may be used by others).


