Browse Source

Merge branch 'wip/devuan' into 'suites/experimental'

Bump version so upgrades work

See merge request devuan-packages/slim!5
tags/devuan/1.3.6-5.1+devuan5
Ralph Rönnquist 1 year ago
parent
commit
4317637211
5 changed files with 23 additions and 3 deletions
  1. +9
    -1
      debian/changelog
  2. +1
    -1
      debian/control
  3. +1
    -0
      debian/patches/series
  4. +11
    -0
      debian/patches/sessreg.patch
  5. +1
    -1
      debian/patches/slim-conf.patch

+ 9
- 1
debian/changelog View File

@@ -1,4 +1,12 @@
slim (1.3.6-5+devuan6) UNRELEASED; urgency=medium
slim (1.3.6-5.1+devuan3) experimental; urgency=medium

* Bump version number so that upgrades work.
* Use sessreg to update utmp, wtmp and lastlog (Closes: #302).
* Don't use bash when exec will do.

-- Mark Hindley <mark@hindley.org.uk> Tue, 05 Mar 2019 16:56:23 +0000

slim (1.3.6-5+devuan6) experimental; urgency=medium

* If consolekit is not available, fall back on logind PAM session.
* Remove unused duplicate quilt patch.


+ 1
- 1
debian/control View File

@@ -15,7 +15,7 @@ Architecture: any
Provides: x-display-manager
Recommends: xterm
Suggests: scrot, xauth
Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 1.2.9) | debconf-2.0, dbus, consolekit | libpam-elogind | logind
Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 1.2.9) | debconf-2.0, dbus, consolekit | libpam-elogind | logind, x11-xserver-utils
Description: desktop-independent graphical login manager for X11
SLiM aims to be light, simple and independent from the various
desktop environments. Although completely configurable through


+ 1
- 0
debian/patches/series View File

@@ -6,3 +6,4 @@ libslim-cmake-fixes.patch
fix-systemd-service.patch
manpage-formatting-fixes.patch
support-consolekit-runtime-detection.patch
sessreg.patch

+ 11
- 0
debian/patches/sessreg.patch View File

@@ -0,0 +1,11 @@
--- a/slim.conf
+++ b/slim.conf
@@ -42,6 +42,8 @@
#
# sessionstart_cmd some command
# sessionstop_cmd some command
+sessionstart_cmd exec /usr/bin/sessreg -a -l "$DISPLAY" %user
+sessionstop_cmd exec /usr/bin/sessreg -d -l "$DISPLAY" %user
# Start in daemon mode. Valid values: yes | no
# Note that this can be overriden by the command line

+ 1
- 1
debian/patches/slim-conf.patch View File

@@ -33,7 +33,7 @@ Index: slim/slim.conf
# i.e. for freebsd use:
# login_cmd exec /bin/sh - ~/.xinitrc %session
-login_cmd exec /bin/bash -login ~/.xinitrc %session
+login_cmd exec /bin/bash -login /etc/X11/Xsession %session
+login_cmd exec /etc/X11/Xsession %session
# Commands executed when starting and exiting a session.
# They can be used for registering a X11 session with


Loading…
Cancel
Save