Compare commits

...

29 Commits

Author SHA1 Message Date
  Mark Hindley 2e65aca918 Changelog for version 1.3.6-5.1+devuan6. 8 months ago
  Mark Hindley cc1134a6ce Reorder dependencies to prefer default-logind over consolekit. 8 months ago
  Mark Hindley 0ee72705e6 Add Vcs-* fields. 8 months ago
  Mark Hindley d2194c584c Add myself to uploaders. 8 months ago
  Mark Hindley 280668416a Remove Changed-By field. 8 months ago
  Mark Hindley d86fa91b52 Add debian-branch and debian-tag defaults to d/gbp.conf. 8 months ago
  Mark Hindley 1f9bd195e4 Use virtual package default-logind rather than libpam-elogind. 8 months ago
  Mark Hindley 78143e78b4 Fix typo and remove related lintian override. 8 months ago
  Mark Hindley abb2ba0759 Add missing dependency on lsb-base, required by initscript. 8 months ago
  Mark Hindley 9f837def0a Move updates-alternatives --remove to prerm. 8 months ago
  Mark Hindley 38f80a9698 Changelog for version 1.3.6-5.1+devuan5. 9 months ago
  Mark Hindley 528f7cface Revert "Don't use unnecessary bash when exec will do." 9 months ago
  Mark Hindley db5631aac4 Correct closes bug number. 1 year ago
  Ralph Rönnquist b88df07e38 Bump version line for unstable. 1 year ago
  Ralph Rönnquist aa93c16916 Merge branch 'suites/experimental' into 'suites/unstable' 1 year ago
  Ralph Rönnquist 4317637211 Merge branch 'wip/devuan' into 'suites/experimental' 1 year ago
  Mark Hindley 6637cfea8d Changelog. 1 year ago
  Mark Hindley 11ca1951b6 Don't use unnecessary bash when exec will do. 1 year ago
  Mark Hindley d90325a646 Use /usr/bin/sessreg to register logins in utmp, wtmp and lastlog. 1 year ago
  Mark Hindley 926f520ad8 Bump version number so that upgrades work. 1 year ago
  Mark Hindley 81abd90ef8 Target experimental. 1 year ago
  Daniel Reurich e7b149e0d5 Merge branch 'wip/devuan' into 'suites/experimental' 1 year ago
  Mark Hindley 6899c79108 Changelog. 1 year ago
  Mark Hindley 85dcd316fd Delete unused duplicate copy of patch. 1 year ago
  Mark Hindley bd91736e10 Depend on libpam-elogind | logind as alternatives to consolekit. 1 year ago
  Mark Hindley 442148b455 Add patch to support runtime detection of consolekit falling back to pam session if not found. 1 year ago
  Daniel Reurich e80dcc6340 Update changelog for 1.3.6-5+devuan5 release 1 year ago
  Daniel Reurich 2ce1e57a98 add gbp.conf with forced compression-level 1 year ago
  Daniel Reurich 8266d1b5f6 Update Maintainers, Uploaders, Changed-By 1 year ago
11 changed files with 147 additions and 29 deletions
Split View
  1. +50
    -0
      debian/changelog
  2. +8
    -3
      debian/control
  3. +4
    -0
      debian/gbp.conf
  4. +11
    -0
      debian/patches/Fix_typo.patch
  5. +0
    -23
      debian/patches/fix-hyphen-used-as-minus-sign.patch
  6. +3
    -0
      debian/patches/series
  7. +11
    -0
      debian/patches/sessreg.patch
  8. +58
    -0
      debian/patches/support-consolekit-runtime-detection.patch
  9. +0
    -1
      debian/slim.lintian-overrides
  10. +0
    -2
      debian/slim.postrm
  11. +2
    -0
      debian/slim.prerm

+ 50
- 0
debian/changelog View File

@@ -1,3 +1,53 @@
slim (1.3.6-5.1+devuan6) unstable; urgency=medium

* Move updates-alternatives --remove to prerm.
* Add missing dependency on lsb-base, required by initscript.
* Fix typo and remove related lintian override.
* Use virtual package default-logind rather than libpam-elogind.
* Reorder dependencies to prefer default-logind over consolekit.
* Add debian-branch and debian-tag defaults to d/gbp.conf.
* Remove Changed-By field.
* Add myself to uploaders.
* Add Vcs-* fields.

-- Mark Hindley <mark@hindley.org.uk> Tue, 07 Jan 2020 11:09:49 +0000

slim (1.3.6-5.1+devuan5) unstable; urgency=medium

* Fix closes bug number.
* Revert to invoking /etc/X11/Xsession with explicit shell. Sometimes
this file seesm to lose its executable bit.

-- Mark Hindley <mark@hindley.org.uk> Sat, 14 Dec 2019 09:24:35 +0000

slim (1.3.6-5.1+devuan4) unstable; urgency=medium

* Bump version number and target archive for unstable.

-- Ralph Ronnquist <ralph.ronnquist@gmail.com> Thu, 13 Jun 2019 21:55:02 +0000

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: #301).
* 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.

-- Mark Hindley <mark@hindley.org.uk> Mon, 11 Feb 2019 17:38:54 +0000

slim (1.3.6-5+devuan5) unstable; urgency=medium

* Update Maintainers, Uploaders, Changed-By
* add gbp.conf with forced compression-level

-- Daniel Reurich <centurion@haggai.centurion.net.nz> Mon, 11 Feb 2019 22:37:19 +1300

slim (1.3.6-5+devuan4) unstable; urgency=medium

* change to using /etc/alternatives and cleanup


+ 8
- 3
debian/control View File

@@ -1,12 +1,17 @@
Source: slim
Section: x11
Priority: optional
Maintainer: Dima Krasner <dima@dimakrasner.com>
Uploaders: Jens Peter Secher <jps@debian.org>, Mateusz Łukasik <mati75@linuxmint.pl>
Maintainer: Devuan Dev Team <devuan-dev@lists.dyne.org>
Uploaders:
Mark (LeePen) Hindley <mark@hindley.org.uk>,
Daniel Reurich <daniel@centurion.net.nz>,
Dima Krasner <dima@dimakrasner.com>,
Build-Depends: debconf, debhelper (>= 9), libjpeg-dev, libpam0g-dev,
libpng-dev, libxft-dev, libxmu-dev, po-debconf, sharutils, cmake,
freeglut3-dev, libpthread-stubs0-dev, libxrandr-dev, libck-connector-dev
Standards-Version: 3.9.6
Vcs-Git: https://git.devuan.org/devuan-packages/slim.git
Vcs-Browser: https://git.devuan.org/devuan-packages/slim
Homepage: http://sourceforge.net/projects/slim.berlios/

Package: slim
@@ -14,7 +19,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
Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 1.2.9) | debconf-2.0, dbus, default-logind | logind | consolekit, x11-xserver-utils, lsb-base
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


+ 4
- 0
debian/gbp.conf View File

@@ -0,0 +1,4 @@
[DEFAULT]
compression-level = 9
debian-branch = suites/unstable
debian-tag = devuan/%(version)s

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

@@ -0,0 +1,11 @@
--- a/app.cpp
+++ b/app.cpp
@@ -1144,7 +1144,7 @@
void App::OpenLog() {
if ( !logStream.openLog( cfg->getOption("logfile").c_str() ) ) {
- logStream << APPNAME << ": Could not accesss log file: " << cfg->getOption("logfile") << endl;
+ logStream << APPNAME << ": Could not access log file: " << cfg->getOption("logfile") << endl;
RemoveLock();
exit(ERR_EXIT);
}

+ 0
- 23
debian/patches/fix-hyphen-used-as-minus-sign.patch View File

@@ -1,23 +0,0 @@
Description: Fix hyphen used as minus sign
Author: Mateusz Łukasik <mati75@linuxmint.pl>

--- a/slimlock.1
+++ b/slimlock.1
@@ -5,7 +5,7 @@
.SH SYNOPSIS
.nf
.fam C
-\fBslimlock\fP [-v]
+\fBslimlock\fP [\-v]
.fam T
.fi
.SH DESCRIPTION
@@ -25,7 +25,7 @@ slimlock.conf contains the following set
.B dpms_standby_timeout
number of seconds of inactivity before the screen blanks.
.BI "Default: " 60
-.TP
+.TP
.B dpms_off_timeout
number of seconds of inactivity before the screen is turned off.
.BI "Default: " 600

+ 3
- 0
debian/patches/series View File

@@ -1,3 +1,4 @@
Fix_typo.patch
slim-add-sessiondir.patch
slim-conf.patch
slim-fix-env-alloc.patch
@@ -5,3 +6,5 @@ no-slimlock-with-pam.patch
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

+ 58
- 0
debian/patches/support-consolekit-runtime-detection.patch View File

@@ -0,0 +1,58 @@
--- a/app.cpp
+++ b/app.cpp
@@ -570,8 +570,13 @@
ck.open_session(DisplayName, pw->pw_uid);
}
catch(Ck::Exception &e) {
+#ifdef USE_PAM
+ logStream << APPNAME << ": Consolekit::" << e << endl;
+ logStream << APPNAME << ": falling back to PAM session" << endl;
+#else
logStream << APPNAME << ": " << e << endl;
exit(ERR_EXIT);
+#endif
}
#endif
@@ -584,18 +589,20 @@
char** child_env = pam.getenvlist();
# ifdef USE_CONSOLEKIT
- char** old_env = child_env;
+ if (ck.get_xdg_session_cookie()) {
+ char** old_env = child_env;
- /* Grow the copy of the environment for the session cookie */
- int n;
- for(n = 0; child_env[n] != NULL ; n++);
-
- n++;
-
- child_env = static_cast<char**>(malloc(sizeof(char*)*(n+1)));
- memcpy(child_env, old_env, sizeof(char*)*n);
- child_env[n - 1] = StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie());
- child_env[n] = NULL;
+ /* Grow the copy of the environment for the session cookie */
+ int n;
+ for(n = 0; child_env[n] != NULL ; n++);
+
+ n++;
+
+ child_env = static_cast<char**>(malloc(sizeof(char*)*(n+1)));
+ memcpy(child_env, old_env, sizeof(char*)*n);
+ child_env[n - 1] = StrConcat("XDG_SESSION_COOKIE=", ck.get_xdg_session_cookie());
+ child_env[n] = NULL;
+ }
# endif /* USE_CONSOLEKIT */
#else
@@ -663,7 +670,8 @@
#ifdef USE_CONSOLEKIT
try {
- ck.close_session();
+ if (ck.get_xdg_session_cookie())
+ ck.close_session();
}
catch(Ck::Exception &e) {
logStream << APPNAME << ": " << e << endl;

+ 0
- 1
debian/slim.lintian-overrides View File

@@ -1,2 +1 @@
slim: spelling-error-in-binary usr/bin/slim accesss access
slim: unused-debconf-template slim/daemon_name

+ 0
- 2
debian/slim.postrm View File

@@ -14,8 +14,6 @@ if [ "$1" = "purge" ] ; then
update-rc.d slim remove >/dev/null
fi

update-alternatives --remove desktop-slim-theme /usr/share/slim/themes/default


#DEBHELPER#



+ 2
- 0
debian/slim.prerm View File

@@ -60,6 +60,8 @@ if [ "$1" = "remove" ]; then
fi
fi

update-alternatives --remove desktop-slim-theme /usr/share/slim/themes/default

#DEBHELPER#

exit 0

Loading…
Cancel
Save