merge debian/1.3.6-3

debian/README.source

@@ -2,4 +2,3 @@ This package uses the dpatch system of patch handling.
 See /usr/share/doc/dpatch/README.source.gz for more details.
 
  -- Nobuhiro Iwamatsu <iwamatsu@debian.org>, Mon, 07 Sep 2009 01:33:36 +0900
-

debian/changelog

@@ -1,16 +1,86 @@
-slim (1.3.6-0.1) UNRELEASED; urgency=medium
+slim (1.3.6-3) unstable; urgency=high
+
+  * debian/patches:
+    - Replace no-slimlock.patch with no-slimlock-with-pam.patch to fix
+      build with pam support on non-linux arches. (Closes: #743864)
+    - Update libslim-cmake-fixes.patch.
+
+ -- Mateusz Łukasik <mati75@linuxmint.pl>  Fri, 25 Apr 2014 16:57:11 +0200
+
+slim (1.3.6-2) unstable; urgency=medium
+
+  * debian/rules:
+    - Fix the if statement for hurd-i386 build architecture test which
+      previously disabled PAM on non-Hurd archs. (Closes: #742904, #742950)
+
+ -- Mateusz Łukasik <mati75@linuxmint.pl>  Tue, 01 Apr 2014 14:11:43 +0200
+
+slim (1.3.6-1) unstable; urgency=medium
+
+  * Add myself to the list of uploaders with permission from Nobuhiro Iwamatsu.
+  * Fix systemd support: (Closes: #741511)
+    - debian/fix-systemd-service.patch: Add missing
+      "WantedBy=graphical.target" slim.service file.
+    - debian/control: Add dh-systemd to build depends.
+    - debian/rules: Add dh_systemd support.
+
+ -- Mateusz Łukasik <mati75@linuxmint.pl>  Fri, 14 Mar 2014 23:20:35 +0100
+
+slim (1.3.6-0.3) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/rules:
+    - Test for hurd-i386 build architecture as "gnu", not
+      "hurd" to really fix FTBFS.
+  * debian/control:
+    - Update long description. (Closes: #659857)
+  * debian/patches:
+    - Add slim-add-sessiondir.patch: to set directory that contains
+      the xsessions. (Closes: #740394)
+    - Update slim-conf.patch.
+    - Add libslim-cmake-fixes.patch: Fix FTBFS on Ubuntu.
+
+ -- Mateusz Łukasik <mati75@linuxmint.pl>  Sun, 02 Mar 2014 18:21:42 +0100
+
+slim (1.3.6-0.2) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Don't build slimlock on non-Linux ports, fixes FTBFS:
+    - Add patch to make cmake target "slimlock" conditional
+      on BUILD_SLIMLOCK: debian/patches/no-slimlock.patch.
+    - Set -DBUILD_SLIMLOCK=yes|no depending on the host
+      operating system in debian/rules.
+
+ -- Mateusz Łukasik <mati75@linuxmint.pl>  Thu, 27 Feb 2014 16:38:54 +0100
+
+slim (1.3.6-0.1) unstable; urgency=medium
 
   * Non-maintainer upload.
-  * New upstream release. (Closes: #725902, #733916, #692148)
+  * New upstream release:
+    - Added systemd support. (Closes: #692148)
+    - Fixed CVE-2013-4412. (Closes: #725902)
   * Add debian/watch.
   * debian/control:
-    + update build depends for new version.
-    + bump standards version.
-  * Add upstart support. (Closes: #704049)
+    - Update build depends for new version.
+    - Bump standards version to 3.9.5.
   * Add fvwm to slim.conf. (Closes: #689781)
-  * Add debian/patches/slim-1.3.6-fix-libslim-libraries.patch.
+  * Remove debian/patches/disable_log.patch -- no longer needed.
+  * Update debian/slim.init:
+    - Use lsb init functions in the init script file. (Closes: #698257)
+    - Run dbus before slim. (Closes: #705883)
+  * Refresh debian/patches/slim-fix-env-alloc.patch.
+  * Rewrite debian/copyright.
 
- -- Mateusz Łukasik <mati75@linuxmint.pl>  Wed, 08 Jan 2014 19:20:58 +0100
+ -- Mateusz Łukasik <mati75@linuxmint.pl>  Sat, 22 Feb 2014 09:58:00 +0100
+
+slim (1.3.4-2.1) unstable; urgency=high
+
+  * Non-maintainer upload.
+  * Add debian/patches/slim-fix-env-alloc.patch:
+    - fix memory corruption in slim child. (Closes: #733916)
+  * debian/slim.upstart: Add upstart job. (Closes: #704049)
+
+ -- Mateusz Łukasik <mati75@linuxmint.pl>  Fri, 07 Feb 2014 10:23:12 +0100
 
 slim (1.3.4-2) unstable; urgency=low
 
@@ -25,8 +95,8 @@ slim (1.3.4-1) unstable; urgency=low
   * Update debian/control.
     - Add xauth to Suggests. (Closes: #587320)
   * debian/slim.pam:
-    - enable pam_loginuid. (Closes: #677436)
-  * Add patches/disable_log.patch. Disable log to stderr.
+    - Enable pam_loginuid. (Closes: #677436)
+  * Add patches/disable_log.patch. Disable logging to stderr.
 
  -- Nobuhiro Iwamatsu <iwamatsu@debian.org>  Wed, 27 Jun 2012 00:37:44 +0900
 
@@ -40,22 +110,22 @@ slim (1.3.3-1) unstable; urgency=low
 
   * New upstream release. (Closes: #614749, #472855, #612023)
   * Remove unnecessary patches.
-    - patches/fix-black-screen.patch
-    - patches/fix_ftbfs-as-needed.patch
-    - patches/Makefile.patch
+    - debian/patches/fix-black-screen.patch.
+    - debian/patches/fix_ftbfs-as-needed.patch.
+    - debian/patches/Makefile.patch.
   * Update debian/control.
     - Update Standards-Version to 3.9.3.
     - Update Build-Depends. Add cmake, libck-connector-dev and zlib1g-dev.
     - Add dbus and consolekit to Depends.
   * Update debian/rules.
-    - Rewrite debian/rules. covert to dh.
-  * Update patch for slim.conf
-  * Update compat to 9
+    - Rewrite debian/rules, convert to dh.
+  * Update patch for slim.conf.
+  * Update compat to 9.
   * Add directory for pam.d from install file.
   * Remove directory for theme files to debian/slim.dirs.
-  * Add new template for daemon name
-  * Change source format to 3.0(quilt)
-    - Remove *.shar files
+  * Add new template for daemon name.
+  * Change source format to 3.0 (quilt).
+    - Remove *.shar files.
   * Update postinst and add postrm and prerm for slim.
   * Add pam file for slim. (Closes: #476248, #664806)
   * Update translations.
@@ -70,14 +140,14 @@ slim (1.3.2-1) unstable; urgency=low
     - Bump up Standards-Version to 3.9.2.
     - Change Build-Depends from libjpeg62-dev to libjpeg-dev. (Closes: #644805)
     - Change Build-Depends from libpng12-dev to libpng-dev.
-  * Fefresh patches.
-    - Drop patches/ftbfs_gcc_4.4.patch. Applied to upstream.
-    - Drop patches/xauth_secret_support.patch. Applied to upstream.
-    - Drop patches/insecure_PATH_assignment.patch. Applied to upstream.
-    - Drop patches/fix-manpage.patch. Applied to upstream.
+  * Refresh patches.
+    - Drop patches/ftbfs_gcc_4.4.patch. Applied upstream.
+    - Drop patches/xauth_secret_support.patch. Applied upstream.
+    - Drop patches/insecure_PATH_assignment.patch. Applied upstream.
+    - Drop patches/fix-manpage.patch. Applied upstream.
     - Update patches/Makefile.patch and debian/patches/slim-conf.patch.
-    - Add patches/fix_ftbfs_as-needed.patch.
-      Fix build failure with ld --as-needed. (Closes: #607185)
+    - Add patches/fix_ftbfs_as-needed.patch to fix FTBFS with
+      ld --as-needed. (Closes: #607185)
   * Update debian/rules.
     - Fix lintian debian-rules-missing-recommended-target build-{arch,indep}.
   * Update debian/README.Debian.
@@ -88,8 +158,8 @@ slim (1.3.2-1) unstable; urgency=low
 slim (1.3.1-8) unstable; urgency=low
 
   * New theme.
-    - Add new theme debian-spacefun and set it as default (Closes: #603256).
-	  Thanks to Yves-Alexis Perez.
+    - Add new theme debian-spacefun and set it as default. (Closes: #603256)
+      Thanks to Yves-Alexis Perez.
     - Update patches/slim-conf.patch.
     - Add remove function of debian/debian-spacefun to debian/rules.
     - Add debian-spacefun to debian/slim.install.
@@ -100,10 +170,10 @@ slim (1.3.1-7) unstable; urgency=high
 
   * Update debian/control.
     - Bump up Standards-Version to 3.9.1.
-  * Fix show black screen on On kfreebsd (Closes: #586593).
-    debian/patches/fix-black-screen.patch
-  * Fix CVE-2010-2945: insecure PATH assignment (Closes: #594414).
-    debian/patches/insecure_PATH_assignment.patch
+  * Add debian/patches/fix-black-screen.patch to fix
+    black screen on kfreebsd. (Closes: #586593)
+  * Add debian/patches/insecure_PATH_assignment.patch to fix
+    CVE-2010-2945: Insecure PATH assignment (Closes: #594414).
 
  -- Nobuhiro Iwamatsu <iwamatsu@debian.org>  Thu, 26 Aug 2010 12:40:13 +0900
 
@@ -111,10 +181,10 @@ slim (1.3.1-6) unstable; urgency=low
 
   * Update debian/control.
     - Bump up Standards-Version.
-  * Fix default path (Closes: #581775).
+  * Fix default path. (Closes: #581775)
     Thanks to Andrei Popescu.
   * Debconf translation:
-    - Update Danish translation (Closes: #587800).
+    - Update Danish translation. (Closes: #587800)
       Thanks to Joe Dalton.
 
  -- Nobuhiro Iwamatsu <iwamatsu@debian.org>  Thu, 08 Jul 2010 05:41:40 +0900
@@ -123,46 +193,47 @@ slim (1.3.1-5) unstable; urgency=low
 
   * Update debian/control.
     - Bump up Standards-Version.
-  * Update patches/slim-conf.patch
-    - scrot default location to /root. (Closes: #537604)
+  * Update patches/slim-conf.patch:
+    - Set scrot default location to /root. (Closes: #537604)
 
  -- Nobuhiro Iwamatsu <iwamatsu@debian.org>  Tue, 09 Feb 2010 22:58:12 +0900
 
 slim (1.3.1-4) unstable; urgency=low
 
-  * Fix FTBFS with GCC 4.4. (Closes: #553703)
-    Update patches/ftbfs_gcc_4.4.patch
-  * Update 20slim_locale. (Closes: #536541) 
+  * Update debian/patches/ftbfs_gcc_4.4.patch to fix
+    FTBFS with GCC 4.4. (Closes: #553703)
+  * Update 20slim_locale. (Closes: #536541)
 
  -- Nobuhiro Iwamatsu <iwamatsu@debian.org>  Mon, 07 Dec 2009 23:15:33 +0900
 
 slim (1.3.1-3) unstable; urgency=low
 
   * Remove x-terminal-emulator from Recommends and change from
-    x-terminal-emulator to xterm in slim.conf file (Closes: #536542)
+    x-terminal-emulator to xterm in slim.conf file. (Closes: #536542)
 
  -- Nobuhiro Iwamatsu <iwamatsu@debian.org>  Sat, 17 Oct 2009 08:03:36 +0900
 
 slim (1.3.1-2) unstable; urgency=low
 
   * Add Jens Peter Secher to Uploaders list.
-  * Update es.po (Closes: #510469)
+  * Update es.po. (Closes: #510469)
   * Fix FTBFS with GCC 4.4. (Closes: #505332)
   * Fix insecure xauth secret. (Closes: #529306)
-  * Fix allows login as root without password. (Closes: #536542)
-     - Wrote explanation about this problem to README.Debian.
+  * Fix bug which allowed logging in as root without password. (Closes: #536542)
+    - Add explanation about this problem to README.Debian.
 
  -- Nobuhiro Iwamatsu <iwamatsu@debian.org>  Mon, 21 Sep 2009 15:52:33 +0900
 
 slim (1.3.1-1) unstable; urgency=low
 
-  * New Maintainer (Nobuhiro Iwamatsu).
+  * New Maintainer.
   * New upstream release.
   * Update Standards-Version.
-  * Update patch. 
-    Makefile.patch slim-conf.patch 
+  * Update patches:
+    - debian/patches/Makefile.patch.
+    - debian/patches/slim-conf.patch.
   * Remove patch.
-    ftbfs-gcc4.3-cfg.cpp.patch
+    - debian/patches/ftbfs-gcc4.3-cfg.cpp.patch.
 
  -- Nobuhiro Iwamatsu <iwamatsu@debian.org>  Sun, 23 Aug 2009 13:42:54 +0900
 
@@ -171,22 +242,22 @@ slim (1.3.0-2) unstable; urgency=low
   * Minor changes:
     - Move from dpatch to quilt.
     - Export every possible locale env-var (updated
-      local/Xsession.d/20slim_locale). Closes: #441630
-      Note: Test and validate the patch that uses pam instead (#476248).
+      local/Xsession.d/20slim_locale). (Closes: #441630)
+      Note: Test and validate the patch that uses pam instead. (Closes: #476248)
     - Modifications to patches/slim-conf.patch:
-      - Replace X11R6/bin with bin/X11. Closes: #469401
-      - Add "default" to the start of the list of sessions. Closes: #476245
-      - Set default X server option -nolisten tcp. Closes: #478671
-      - Don't include the current path "." inside $PATH. Closes: #484773
-      - Switch from xterm to x-terminal-emulator. Closes: #499048
-        Note: now we recommend xterm at least.
-    - Add patches/fix-manpage.patch, lintian spewed an error on slim.1.
-    - Update clean rule to remove the .pc directory
+      - Replace X11R6/bin with bin/X11. (Closes: #469401)
+      - Add "default" to the start of the list of sessions. (Closes: #476245)
+      - Set default X server option -nolisten tcp. (Closes: #478671)
+      - Don't include the current path "." inside $PATH. (Closes: #484773)
+      - Switch from xterm to x-terminal-emulator. (Closes: #499048)
+        Note: Now we recommend xterm at least.
+    - Add debian/patches/fix-manpage.patch, lintian spewed an error on slim.1.
+    - Update clean rule to remove the .pc directory.
   * New theme:
-    - Add new theme debian-moreblue-orbit and set it as default. Closes: #495029
+    - Add new theme debian-moreblue-orbit and set it as default. (Closes: #495029)
   * Update translations:
-    - Portuguese. Closes: #497587
-    - Turkish. Closes: #499557
+    - Portuguese. (Closes: #497587)
+    - Turkish. (Closes: #499557)
 
  -- Mike Massonnet <mmassonnet@gmail.com>  Sun, 21 Sep 2008 16:15:15 +0200
 
@@ -194,49 +265,47 @@ slim (1.3.0-1) unstable; urgency=low
 
   [ Mike Massonnet <mmassonnet@gmail.com> ]
 
-  * Package new upstream version 1.3.0. Closes: #447913
+  * Package new upstream version 1.3.0. (Closes: #447913)
     - Build against libpam (add build dependency libpam0g-dev).
     - DPatch cfg.cpp to include <stdlib.h> and fix FTBFS with GCC-4.3.
-      Closes: #455138
+      (Closes: #455138)
     - Add /etc/X11/Xsession.d/20slim_locale to export the LANG.
-      Closes: #440862
-    - Replace xfce4-session with startxfce4 and add ion3. Closes: #426466
-    - Don't set the DPI. Closes: #428407
+      (Closes: #440862)
+    - Replace xfce4-session with startxfce4 and add ion3. (Closes: #426466)
+    - Don't set the DPI. (Closes: #428407)
   * The code concerning the environment init has drastically changed in this
-    new version, and Steve Kemp did a security audit over it. Closes: #435841
+    new version, and Steve Kemp did a security audit over it. (Closes: #435841)
   * Debconf translation:
-    - New Finnish translation. Closes: #457447
-    - Update Portuguese translation. Closes: #445495
+    - New Finnish translation. (Closes: #457447)
+    - Update Portuguese translation. (Closes: #445495)
   * Minor changes:
-    - Suggest scrot as default screenshoter
-    - Refined the description
-    - Set the Homepage field
-    - Bump standards version to 3.7.3
-    - Patch Makefile (LDFLAGS) to remove unnecessary links
+    - Suggest scrot as default screenshot utility.
+    - Refined the description.
+    - Set the Homepage field.
+    - Bump standards version to 3.7.3.
+    - Patch Makefile (LDFLAGS) to remove unnecessary links.
 
   [ Christian Perrier <bubulle@debian.org> ]
 
   * Debconf templates and debian/control reviewed by the debian-l10n-
-    english team as part of the Smith review project. Closes: #426233, #423279
+    english team as part of the Smith review project. (Closes: #426233, #423279)
   * Debconf translation updates:
-    - German and all others taken from xdm. Closes: #426532, #424677
-    - Romanian. Closes: #428955
-    - Vietnamese. Closes: #427145
+    - German and all others taken from xdm. (Closes: #426532, #424677)
+    - Romanian. (Closes: #428955)
+    - Vietnamese. (Closes: #427145)
 
  -- Mike Massonnet <mmassonnet@gmail.com>  Wed, 24 Oct 2007 22:44:07 +0200
 
 slim (1.2.6-1) unstable; urgency=low
 
-  * Initial release (Closes: #337578)
+  * Initial release. (Closes: #337578)
   * Add default Debian theme.
   * Add openbox to the sessions.
   * Patched app.cpp to avoid a segfault (Darren Salt).
   * Patched Makefile to set MANDIR to /usr/share/man instead of /usr/man.
-  * Use the Xsession script as default login script.  This changes the
+  * Use the Xsession script as default login script. This changes the
     behavior of slim where it now uses ~/.xsession instead of ~/.xinitrc.
   * Adapted scripts from xdm to allow slim to be chosen as the default display
     manager (Darren Salt).
 
-
  -- Mike Massonnet <mmassonnet@gmail.com>  Thu,  5 Apr 2007 11:18:33 +0200
-

debian/control

@@ -2,11 +2,11 @@ Source: slim
 Section: x11
 Priority: optional
 Maintainer: Nobuhiro Iwamatsu <iwamatsu@debian.org>
-Uploaders: Jens Peter Secher <jps@debian.org>
+Uploaders: Jens Peter Secher <jps@debian.org>, Mateusz Łukasik <mati75@linuxmint.pl>
 Build-Depends: debconf, debhelper (>= 9), libjpeg-dev, libpam0g-dev,
 	libpng-dev, libxft-dev, libxmu-dev, po-debconf, sharutils,
-	libck-connector-dev, zlib1g-dev, cmake, freeglut3-dev, cmake,
-	libpthread-stubs0-dev, libxrandr-dev
+	libck-connector-dev, zlib1g-dev, cmake, freeglut3-dev,
+	libpthread-stubs0-dev, libxrandr-dev, dh-systemd
 Standards-Version: 3.9.5
 Homepage: http://slim.berlios.de/
 
@@ -17,6 +17,7 @@ Recommends: xterm
 Suggests: scrot, xauth
 Depends: ${shlibs:Depends}, ${misc:Depends}, debconf (>= 1.2.9) | debconf-2.0, dbus, consolekit
 Description: desktop-independent graphical login manager for X11
- SLiM aims to be light and simple, although completely configurable through
- themes and an option file. It is particularly suitable for machines that
- don't require remote logins.
+ SLiM aims to be light, simple and independent from the various
+ desktop environments. Although completely configurable through
+ themes and an option file. It is particularly suitable for machines 
+ that don't require remote logins.

debian/copyright

@@ -1,37 +1,113 @@
-This package was debianized by Mike Massonnet <mmassonnet@gmail.com> on
-Tue, 30 Jan 2007 00:03:45 +0100.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: slim
+Upstream-Contact: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
+Source: http://developer.berlios.de/project/showfiles.php?group_id=2663
 
-It was downloaded from http://slim.berlios.de/
+Files: *
+Copyright: 1997-1998 Per Liden
+	   2004-2006, Simone Rota <sip@varlock.com>, Johannes Winkelmann <jw@tks6.net>
+	   2006-2013, Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
+License: GPL-2+
 
-Upstream Author: Simone Rota <sip@varlock.com>, Johannes Winkelmann
+Files: Ck.cpp
+Copyright: 2011, David Hauweele
+License: GPL-2+
 
-Copyright: (C) 2004-06 by Simone Rota, Johannes Winkelmann
+Files: Ck.h; PAM.*
+Copyright: 2007, Martin Parm
+License: GPL-2+
 
-License:
+Files: image.*
+Copyright: 2002-2004 Hari Nair <hari@alumni.caltech.edu>
+License: GPL-2+
 
-   This package is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
+Files: jpeg.c; png.c
+Copyright: 2002 Hari Nair <hari@alumni.caltech.edu>
+License: GPL-2+
 
-   This package is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+Files: slimlock.cpp
+Copyright: 2010-2012 Joel Burget <joelburget@gmail.com>
+License: GPL-2+
 
-   You should have received a copy of the GNU General Public License
-   along with this package; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+Files: util.*
+Copyright: 2009 Eygene Ryabinkin <rea@codelabs.ru>
+License: GPL-2+
 
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Files: themes/default/panel.png
+Copyright: 2004 Lila Community
+License: GPL-2+
 
-The Debian packaging is (C) 2007, Mike Massonnet <mmassonnet@gmail.com> 
-and is licensed under the GPL, see above.
+Files: themes/default/background.png
+Copyright: 2005 rafael nascimento
+License: permissive
+ This file may be copied and used freely without restrictions. It may
+ be used in projects which are not available under a GNU General Public License.
 
-Image handling code adapted and extended from xplanet 1.0.1,
-copyright (c) 2002-04 by Hari Nair and is licensed through
-the GNU General Public License.
+Files: cmake/*
+Copyright: 2006, Alexander Neundorf, <neundorf@kde.org>
+	       2008, Kevin Kofler, <kevin.kofler@chello.at>
+License: BSD-3-clause
+ These scripts are placed under the BSD license:
+ Copyright (c) The Regents of the University of California.
+ All rights reserved.
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ 1. Redistributions of source code must retain the above copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. Neither the name of the University nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ SUCH DAMAGE.
 
-Login.app is copyright (c) 1997, 1998 by Per Liden and is
-licensed through the GNU General Public License.
+Files: debian/*
+Copyright: 2007-2008, Mike Massonnet <mmassonnet@gmail.com> 
+	   2009-2012, Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
+	   2014, Mateusz Łukasik <mati75@linuxmint.pl>
+License: GPL-2+
+
+Files: debian/debian-joy/*;debian/debian-moreblue-orbit/*;debian/debian-spacefun/*;
+Copyright: 2007-2008 Mike Massonnet <mmassonnet@gmail.com>
+	   2008 Yves-Alexis Perez <corsac@debian.org>
+License: GPL-2+
+
+Files: debian/debian-moreblue/*
+Copyright: 2007 Mike Massonnet
+License: GPL-2+
+
+Files: debian/debian-moreblue-orbit/background.png
+Copyright: Valessio S Brito <valessio@debianart.org>
+License: GPL-2+
+
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 dated June, 1991.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston,
+ MA 02110-1301, USA.
+ .
+ On Debian GNU/Linux systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.

debian/patches/disable_log.patch

@@ -1,24 +0,0 @@
-diff --git a/log.cpp b/log.cpp
-index b8b32f3..7f8fcb9 100644
---- a/log.cpp
-+++ b/log.cpp
-@@ -5,9 +5,11 @@ bool
- LogUnit::openLog(const char * filename)
- {
- 	if (logFile.is_open()) {
-+		/*
- 		cerr << APPNAME 
- 			<< ": opening a new Log file, while another is already open"
- 			<< endl;
-+		*/
- 		logFile.close();
- 	}
- 	logFile.open(filename, ios_base::app);
-@@ -20,7 +22,5 @@ LogUnit::closeLog()
- {
- 	if (logFile.is_open()) {
- 		logFile.close();
--	} else {
--		cerr << APPNAME << ": closing Log file, while is already closed" << endl;
- 	}
- }

debian/patches/fix-systemd-service.patch

@@ -0,0 +1,11 @@
+Description: Add WantedBy field to systemd slim.service
+Author: Mateusz Łukasik <mati75@linuxmint.pl>
+Bug-Debian: http://bugs.debian.org/741511
+
+--- a/slim.service
++++ b/slim.service
+@@ -7,3 +7,4 @@ ExecStart=/usr/bin/slim -nodaemon
+ 
+ [Install]
+ Alias=display-manager.service
++WantedBy=graphical.target

debian/patches/libslim-cmake-fixes.patch

@@ -0,0 +1,36 @@
+Description: Fix libralies linking
+Author: Ian Stakenvicius <axs@gentoo.org>
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -122,6 +122,7 @@ if(USE_PAM)
+ 		message("\tPAM Found")
+ 		set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DUSE_PAM")
+ 		target_link_libraries(${PROJECT_NAME} ${PAM_LIBRARY})
++		target_link_libraries(libslim ${PAM_LIBRARY})
+ 		if(BUILD_SLIMLOCK)
+ 			target_link_libraries(slimlock ${PAM_LIBRARY})
+ 		endif(BUILD_SLIMLOCK)
+@@ -182,7 +183,10 @@ include_directories(
+ )
+ 
+ target_link_libraries(libslim
+-    ${JPEG_LIBRARIES}
++	${RT_LIB}
++	${X11_Xft_LIB}
++	${X11_Xrandr_LIB}
++	${JPEG_LIBRARIES}
+ 	${PNG_LIBRARIES}
+ )
+ 
+@@ -235,8 +239,8 @@ if (BUILD_SHARED_LIBS)
+ 		SOVERSION ${SLIM_VERSION})
+ 
+ 	install(TARGETS libslim
+-		LIBRARY DESTINATION lib
+-		ARCHIVE DESTINATION lib
++		LIBRARY DESTINATION lib${LIB_SUFFIX}
++		ARCHIVE DESTINATION lib${LIB_SIFFUX}
+ 	)
+ endif (BUILD_SHARED_LIBS)
+ 

debian/patches/no-slimlock-with-pam.patch

@@ -0,0 +1,52 @@
+Description: Fix build slim with PAM support and without slimlock
+Author: Mateusz Łukasik <mati75@linuxmint.pl>
+
+Bug-Debian: http://bugs.debian.org/743864
+Last-Update: 2014-04-25
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -71,7 +71,9 @@ set(common_srcs
+ if(USE_PAM)
+ 	set(common_srcs ${common_srcs} PAM.cpp)
+     # for now, only build slimlock if we are using PAM.
+-    set(BUILD_SLIMLOCK 1)
++    if(BUILD_SLIMLOCK)
++	set(BUILD_SLIMLOCK 1)
++    endif(BUILD_SLIMLOCK)
+ endif(USE_PAM)
+ 
+ # Build common library
+@@ -120,7 +122,9 @@ if(USE_PAM)
+ 		message("\tPAM Found")
+ 		set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DUSE_PAM")
+ 		target_link_libraries(${PROJECT_NAME} ${PAM_LIBRARY})
+-		target_link_libraries(slimlock ${PAM_LIBRARY})
++		if(BUILD_SLIMLOCK)
++			target_link_libraries(slimlock ${PAM_LIBRARY})
++		endif(BUILD_SLIMLOCK)
+ 		include_directories(${PAM_INCLUDE_DIR})
+ 	else(PAM_FOUND)
+ 		message("\tPAM Not Found")
+@@ -221,7 +225,9 @@ endif(BUILD_SLIMLOCK)
+ ####### install
+ # slim
+ install(TARGETS slim RUNTIME DESTINATION bin)
+-install(TARGETS slimlock RUNTIME DESTINATION bin)
++if(BUILD_SLIMLOCK)
++	install(TARGETS slimlock RUNTIME DESTINATION bin)
++endif(BUILD_SLIMLOCK)
+ 
+ if (BUILD_SHARED_LIBS)
+ 	set_target_properties(libslim PROPERTIES
+@@ -236,7 +242,9 @@ endif (BUILD_SHARED_LIBS)
+ 
+ # man file
+ install(FILES slim.1 DESTINATION ${MANDIR}/man1/)
+-install(FILES slimlock.1 DESTINATION ${MANDIR}/man1/)
++if(BUILD_SLIMLOCK)
++	install(FILES slimlock.1 DESTINATION ${MANDIR}/man1/)
++endif(BUILD_SLIMLOCK)
+ # configure
+ install(FILES slim.conf DESTINATION ${SYSCONFDIR})
+ # systemd service file

debian/patches/series

@@ -1,3 +1,6 @@
+slim-add-sessiondir.patch
 slim-conf.patch
-#disable_log.patch
-slim-1.3.6-fix-libslim-libraries.patch
+slim-fix-env-alloc.patch
+no-slimlock-with-pam.patch
+libslim-cmake-fixes.patch
+fix-systemd-service.patch

debian/patches/slim-1.3.6-fix-libslim-libraries.patch

@@ -1,20 +0,0 @@
-diff -upr slim-1.3.6.orig/CMakeLists.txt slim-1.3.6/CMakeLists.txt
---- slim-1.3.6.orig/CMakeLists.txt	2013-10-02 16:16:22.000000000 +0300
-+++ slim-1.3.6/CMakeLists.txt	2013-10-02 16:19:57.000000000 +0300
-@@ -119,6 +119,7 @@ if(USE_PAM)
- 	if(PAM_FOUND)
- 		message("\tPAM Found")
- 		set(SLIM_DEFINITIONS ${SLIM_DEFINITIONS} "-DUSE_PAM")
-+		target_link_libraries(libslim ${PAM_LIBRARY})
- 		target_link_libraries(${PROJECT_NAME} ${PAM_LIBRARY})
- 		target_link_libraries(slimlock ${PAM_LIBRARY})
- 		include_directories(${PAM_INCLUDE_DIR})
-@@ -178,6 +179,8 @@ include_directories(
- )
- 
- target_link_libraries(libslim
-+	${X11_Xft_LIB}
-+	${X11_Xrandr_LIB}
-     ${JPEG_LIBRARIES}
- 	${PNG_LIBRARIES}
- )

debian/patches/slim-add-sessiondir.patch

@@ -0,0 +1,140 @@
+Description: Set directory that contains the xsessions
+Author: Mateusz Łukasik <mati75@linuxmint.pl>
+Author: Ian Stakenvicius <axs@gentoo.org>
+Author: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
+Bug-Debian: http://bugs.debian.org/740394
+
+--- a/cfg.cpp	2013-10-01 18:38:05.000000000 -0400
++++ b/cfg.cpp	2013-10-24 12:12:20.584103253 -0400
+@@ -274,14 +274,14 @@
+ 	while (true) {
+ 		string::const_iterator begin = s;
+ 		while (*s != c && s != str.end()) { ++s; }
+-	tmp = string(begin, s);
+-	if (useEmpty || tmp.size() > 0)
++		tmp = string(begin, s);
++		if (useEmpty || tmp.size() > 0)
+ 			v.push_back(tmp);
+ 		if (s == str.end()) {
+ 			break;
+ 		}
+ 		if (++s == str.end()) {
+-		if (useEmpty)
++			if (useEmpty)
+ 				v.push_back("");
+ 			break;
+ 		}
+@@ -289,6 +289,7 @@
+ }
+ 
+ void Cfg::fillSessionList(){
++	string strSessionList = getOption("sessions");
+ 	string strSessionDir  = getOption("sessiondir");
+ 
+ 	sessions.clear();
+@@ -307,29 +308,29 @@
+ 				struct stat oFileStat;
+ 
+ 				if (stat(strFile.c_str(), &oFileStat) == 0) {
+-                    if (S_ISREG(oFileStat.st_mode) &&
+-                            access(strFile.c_str(), R_OK) == 0){
+-                        ifstream desktop_file( strFile.c_str() );
+-                        if (desktop_file){
+-                             string line, session_name = "", session_exec = "";
+-                             while (getline( desktop_file, line )) {
+-                                 if (line.substr(0, 5) == "Name=") {
+-                                     session_name = line.substr(5);
+-                                     if (!session_exec.empty())
+-                                         break;
+-                                 } else
+-                                     if (line.substr(0, 5) == "Exec=") {
+-                                         session_exec = line.substr(5);
+-                                         if (!session_name.empty())
+-                                             break;
+-                                     }
+-                             }
+-                             desktop_file.close();
+-                             pair<string,string> session(session_name,session_exec);
+-                             sessions.push_back(session);
+-                             cout << session_exec << " - " << session_name << endl;
+-                        }
+-
++					if (S_ISREG(oFileStat.st_mode) &&
++						access(strFile.c_str(), R_OK) == 0){
++							ifstream desktop_file( strFile.c_str() );
++							if (desktop_file){
++								string line, session_name = "", session_exec = "";
++								while (getline( desktop_file, line )) {
++								if (line.substr(0, 5) == "Name=") {
++									session_name = line.substr(5);
++									if (!session_exec.empty()) break;
++								} else if (line.substr(0, 5) == "Exec=") {
++									session_exec = line.substr(5);
++									if (!session_name.empty()) break;
++								}
++							}
++							desktop_file.close();
++							if (!session_name.empty() && !session_exec.empty()) {
++								pair<string,string> session(session_name,session_exec);
++								sessions.push_back(session);
++							} else if (access(strFile.c_str(), X_OK) == 0) {
++								pair<string,string> session(string(pDirent->d_name),strFile);
++								sessions.push_back(session);
++							}
++						}
+ 					}
+ 				}
+ 			}
+@@ -338,8 +339,18 @@
+ 	}
+ 
+ 	if (sessions.empty()){
+-        pair<string,string> session("","");
+-        sessions.push_back(session);
++		if (strSessionList.empty()) {
++			pair<string,string> session("","");
++			sessions.push_back(session);
++		} else {
++			// iterate through the split of the session list
++			vector<string> sessit;
++			split(sessit,strSessionList,',',false);
++			for (vector<string>::iterator it = sessit.begin(); it != sessit.end(); ++it) {
++				pair<string,string> session(*it,*it);
++				sessions.push_back(session);
++			}
++		}
+ 	}
+ }
+ 
+--- a/app.cpp	2013-10-24 12:16:59.870111072 -0400
++++ b/app.cpp	2013-10-24 12:29:59.899132910 -0400
+@@ -377,10 +377,6 @@
+ 			LoginPanel->SetName(cfg->getOption("default_user") );
+ 		}
+ 
+-        if (firstloop) {
+-            LoginPanel->SwitchSession();
+-        }
+-
+ 		if (!AuthenticateUser(focuspass && firstloop)){
+ 			panelclosed = 0;
+ 			firstloop = false;
+--- a/slim.conf
++++ b/slim.conf
+@@ -47,11 +47,9 @@ login_cmd           exec /bin/bash -login ~/.xinitrc %session
+ # options "-d" and "-nodaemon"
+ # daemon	yes
+ 
+-# Available sessions (first one is the default).
+-# The current chosen session name is replaced in the login_cmd
+-# above, so your login command can handle different sessions.
+-# see the xinitrc.sample file shipped with slim sources
+-sessions            xfce4,icewm-session,wmaker,blackbox
++# Set directory that contains the xsessions.
++# slim reads xsesion from this directory, and be able to select.
++sessiondir            /usr/share/xsessions/
+ 
+ # Executed when pressing F11 (requires imagemagick)
+ screenshot_cmd      import -window root /slim.png
+--
+cgit v0.9.2

debian/patches/slim-conf.patch

@@ -1,5 +1,6 @@
 diff --git a/slim.conf b/slim.conf
 index a8e2e1c..36ee57f 100644
+
 --- a/slim.conf
 +++ b/slim.conf
 @@ -1,17 +1,18 @@
@@ -35,20 +36,18 @@ index a8e2e1c..36ee57f 100644
  
  # Commands executed when starting and exiting a session.
  # They can be used for registering a X11 session with
-@@ -51,10 +52,10 @@ login_cmd           exec /bin/bash -login ~/.xinitrc %session
- # The current chosen session name is replaced in the login_cmd
- # above, so your login command can handle different sessions.
- # see the xinitrc.sample file shipped with slim sources
--sessions            xfce4,icewm-session,wmaker,blackbox
-+sessions            default,startxfce4,openbox,ion3,icewm,wmaker,blackbox,awesome,fvwm
- 
- # Executed when pressing F11 (requires imagemagick)
+@@ -51,8 +52,8 @@ login_cmd           exec /bin/bash -logi
+ # slim reads xsesion from this directory, and be able to select.
+ sessiondir            /usr/share/xsessions/
+ 
+-# Executed when pressing F11 (requires imagemagick)
 -screenshot_cmd      import -window root /slim.png
++# Executed when pressing F11 (requires scrot)
 +screenshot_cmd      scrot /root/slim.png
  
  # welcome message. Available variables: %host, %domain
  welcome_msg         Welcome to %host
-@@ -81,7 +82,7 @@ reboot_msg         The system is rebooting...
+@@ -79,7 +80,7 @@ reboot_msg         The system is rebooti
  
  # current theme, use comma separated list to specify a set to 
  # randomly choose from

debian/patches/slim-fix-env-alloc.patch

@@ -0,0 +1,19 @@
+Description: Fix env alloc
+Author: Nicolas Schier <nicolas@cs.tu-berlin.de>
+Bug-Debian: http://bugs.debian.org/733916
+
+diff --git a/app.cpp b/app.cpp
+index eb7e05f..6ffb6f8 100644
+--- a/app.cpp
++++ b/app.cpp
+@@ -596,8 +596,8 @@ void App::Login() {
+ 
+ 		n++;
+ 
+-		child_env = static_cast<char**>(malloc(sizeof(char*)*n));
+-		memcpy(child_env, old_env, sizeof(char*)*n+1);
++		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 */

debian/rules

@@ -1,10 +1,20 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-CMAKE_FLAGS = -DUSE_PAM=yes -DUSE_CONSOLEKIT=yes
+DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+
+CMAKE_FLAGS = -DUSE_PAM=yes -DUSE_CONSOLEKIT=yes -DBUILD_SHARED_LIBS=no -DBUILD_SLIMLOCK=yes
+
+ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
+ CMAKE_FLAGS = -DUSE_PAM=yes -DUSE_CONSOLEKIT=yes -DBUILD_SHARED_LIBS=no -DBUILD_SLIMLOCK=no
+endif
+
+ifeq ($(DEB_HOST_ARCH_OS),hurd)
+ CMAKE_FLAGS = -DUSE_PAM=yes -DUSE_CONSOLEKIT=yes -DBUILD_SHARED_LIBS=no -DBUILD_SLIMLOCK=no
+endif
 
 %:
-	dh $@ --buildsystem=cmake
+	dh $@ --buildsystem=cmake --with systemd
 
 override_dh_auto_configure:
 	dh_auto_configure -- $(CMAKE_FLAGS)
@@ -29,4 +39,3 @@ override_dh_install:
 		debian/slim/usr/share/slim/themes/debian-moreblue/COPYING \
 		debian/slim/usr/share/slim/themes/debian-spacefun/COPYING \
 		debian/slim/usr/share/slim/themes/debian-joy/COPYING
-

debian/slim.config

@@ -65,4 +65,3 @@ if [ -n "$NEW_DEFAULT" ]; then
     fi
   fi
 fi
-

debian/slim.init

@@ -6,57 +6,48 @@
 
 ### BEGIN INIT INFO
 # Provides:          slim
-# Required-Start:    $local_fs $remote_fs
+# Required-Start:    dbus $local_fs $remote_fs
 # Required-Stop:     $local_fs $remote_fs
 # Should-Start:      xfs $named slapd
 # Should-Stop:       xfs $named slapd
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
-# Short-Description: Start/stop the SLiM daemon.
+# Short-Description: Start daemon at boot time
+# Description:	     Debian init script for the SLiM.
 ### END INIT INFO
 
 test -z "$HEED_DEFAULT_DISPLAY_MANAGER" && HEED_DEFAULT_DISPLAY_MANAGER=true
 DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager
 
+NAME="slim"
+DESC="X display manager"
 DAEMON=/usr/bin/slim
 PIDFILE=/var/run/slim.lock
 
 SSD_START_ARGS="--pidfile $PIDFILE --name $(basename $DAEMON) --startas $DAEMON -- -d"
 SSD_STOP_ARGS="--pidfile $PIDFILE --name $(basename $DAEMON) --retry TERM/5/TERM/5"
 
+test -x $DAEMON || exit 0
+. /lib/lsb/init-functions
+
 case $1 in
   start)
     if [ "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" ] &&
        [ -e $DEFAULT_DISPLAY_MANAGER_FILE ] &&
        [ "$(cat $DEFAULT_DISPLAY_MANAGER_FILE)" != "$DAEMON" ]; then
-      echo "Not starting X display manager (slim); it is not the default display manager."
+       log_daemon_msg "Not starting $DESC ($NAME); it is not the default display manager." "$NAME"
     else
-      echo -n "Starting X display manager: slim"
-      start-stop-daemon --start --quiet $SSD_START_ARGS || echo -n " already running"
-      echo "."
+      log_daemon_msg "Starting $NAME" "$NAME"
+      start-stop-daemon --start --quiet $SSD_START_ARGS
+      log_end_msg $?
     fi
   ;;
 
   stop)
-    echo -n "Stopping X display manager: slim"
-    if ! [ -f $PIDFILE ]; then
-      echo -n " not running ($PIDFILE not found)"
-    else
-      start-stop-daemon --stop --quiet $SSD_STOP_ARGS
-      SSD_RES=$?
-      if [ $SSD_RES -eq 1 ]; then
-        echo -n " not running"
-      fi
-      if [ $SSD_RES -eq 2 ]; then
-        echo -n " not responding to TERM signals"
-      else
-    if [ -f $PIDFILE ]; then
-      echo -n " (removing stale $PIDFILE)"
-      rm $PIDFILE
-    fi
-      fi
-    fi
-    echo "."
+    log_daemon_msg "Stopping $DESC" "$NAME"
+    start-stop-daemon --stop --quiet $SSD_STOP_ARGS
+    log_end_msg $?
+    rm -f $PIDFILE
   ;;
 
   restart)
@@ -69,11 +60,14 @@ case $1 in
     /etc/init.d/slim restart
   ;;
 
+  status)
+    status_of_proc /usr/bin/$NAME $NAME
+  ;;
+
   *)
-    echo "Usage: /etc/init.d/slim {start|stop|restart|force-reload}"
+    echo "Usage: /etc/init.d/slim {start|stop|restart|force-reload|status}"
     exit 1
   ;;
 esac
 
 # End of file
-