From 81c3a2ce21bddd8aeecc110ffc90a43f3cbc88cd Mon Sep 17 00:00:00 2001
From: legton <lvs16@inf.ufpr.br>
Date: Thu, 29 Nov 2018 08:48:36 -0200
Subject: [PATCH 1/2] SCRUM#634: Atualiza gitlab-ci
---
.gitlab-ci.yml | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 34f829a..0f3e9a6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,16 +28,20 @@ build:
tags:
- debian-packaging
script:
- - apt-get update && apt-get install -y libx11-dev libcairo2-dev
+ - apt-get update && apt-get install -y libx11-dev libcairo2-dev debhelper
- ./.build.sh
test:
stage: test
tags:
- ubuntu
- - debootstrap
+ - regular
script:
- apt-get update && apt-get install -y wget
+ # Instalacao previa do lightdm, necessaria devido ao Bug #1537329 do pacote plymouth:
+ - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install lightdm language-pack-gnome-pt language-pack-pt-base
+ # Instalacao previa de dependencias que dao erros devido a conflitos de pacotes na imagem docker ubuntu:16:04 regular:
+ - apt-get install -y xserver-xorg-core-hwe-16.04
- echo "deb http://repo.c3sl.ufpr.br/le6/ unstable main" > /etc/apt/sources.list.d/le6.list
- wget -O- http://repo.c3sl.ufpr.br/le6/le.c3sl.ufpr.br.key | apt-key add -
- echo "Installation test:"
--
GitLab
From 579eb2cd879f680aad633b6bef9aa0bf59947a24 Mon Sep 17 00:00:00 2001
From: Lucas Sulzbach <ls17@c3sl.ufpr.br>
Date: Wed, 9 Jan 2019 08:10:16 -0200
Subject: [PATCH 2/2] SCRUM#644: Move lightdm config to a dedicated script on
lightdm.conf.d/
---
package/debian/changelog | 12 +++
package/debian/install | 1 -
package/debian/postinst | 36 ++++++-
package/etc/lightdm/lightdm.conf | 165 -------------------------------
4 files changed, 47 insertions(+), 167 deletions(-)
delete mode 100644 package/etc/lightdm/lightdm.conf
diff --git a/package/debian/changelog b/package/debian/changelog
index 34f97d2..a6c4ddc 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,3 +1,15 @@
+le-multiterminal (1.1.1) unstable; urgency=medium
+
+ * Move lightdm config to a dedicated file on /etc/lightdm.conf.d/ (Closes:
+ #644)
+ * debian/install: Remove rule for file lightdm.conf
+ * debian/postinst:
+ - Add GPL in the head of file
+ - Make it a bash script instead of a sh script
+ - Configure lightdm
+
+ -- Lucas Sulzbach <lesuporte@c3sl.ufpr.br> Mon, 07 Jan 2019 11:26:30 -0200
+
le-multiterminal (1.1.0) unstable; urgency=medium
* Allow guests to hibernate/poweroff/reboot/suspend only when no one else is
diff --git a/package/debian/install b/package/debian/install
index 8b9e809..c7e0bc5 100644
--- a/package/debian/install
+++ b/package/debian/install
@@ -1,7 +1,6 @@
etc/X11/xorg.conf.d/97-proinfo-monitores.conf etc/X11/xorg.conf.d/
etc/X11/xorg.conf.d/98-proinfo-urbano.conf etc/X11/xorg.conf.d/
etc/le-multiterminal/readme etc/le-multiterminal/
-etc/lightdm/lightdm.conf etc/lightdm/
etc/polkit-1/localauthority/50-local.d/90-restrict-guest-permissions.pkla etc/polkit-1/localauthority/50-local.d/
lib/systemd/system/le-multiterminal.service lib/systemd/system/
lib/systemd/system/xorg-daemon.service lib/systemd/system/
diff --git a/package/debian/postinst b/package/debian/postinst
index e97862f..fdf4bf2 100755
--- a/package/debian/postinst
+++ b/package/debian/postinst
@@ -1,8 +1,42 @@
-#!/bin/sh
+#!/bin/bash
# postinst script for le-multiterminal
#DEBHELPER#
+# Copyright (C) 2004-2019 Centro de Computacao Cientifica e Software Livre
+# Departamento de Informatica - Universidade Federal do Parana - C3SL/UFPR
+#
+# This file is part of le-multiterminal
+#
+# le-multiterminal 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.
+#
+# This program 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 program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
+# USA.
+
set -e
+# Set option on lightdm.conf. If the option $1 already exists, make sure it
+# has the value $2. If it doesn't exist, add it.
+function setLightdmOption() {
+ local option=$1
+ local value=$2
+ if [[ ! -d "/etc/lightdm/lightdm.conf.d/" ]]; then
+ mkdir -p "/etc/lightdm/lightdm.conf.d/"
+ fi
+ echo -e "[Seat:*]\\n${option}=${value}" > /etc/lightdm/lightdm.conf.d/5-multiterminal.conf
+}
+
+# Set lightdm cleanup script
+setLightdmOption "session-cleanup-script" "/usr/sbin/cleanup-sessions"
+
case "$1" in
configure)
update-xorg-conf "Silicon.Motion" /etc/X11/xorg.conf.d/98-proinfo-*.conf
diff --git a/package/etc/lightdm/lightdm.conf b/package/etc/lightdm/lightdm.conf
deleted file mode 100644
index 16bb143..0000000
--- a/package/etc/lightdm/lightdm.conf
+++ /dev/null
@@ -1,165 +0,0 @@
-#
-# General configuration
-#
-# start-default-seat = True to always start one seat if none are defined in the configuration
-# greeter-user = User to run greeter as
-# minimum-display-number = Minimum display number to use for X servers
-# minimum-vt = First VT to run displays on
-# lock-memory = True to prevent memory from being paged to disk
-# user-authority-in-system-dir = True if session authority should be in the system location
-# guest-account-script = Script to be run to setup guest account
-# logind-check-graphical = True to on start seats that are marked as graphical by logind
-# log-directory = Directory to log information to
-# run-directory = Directory to put running state in
-# cache-directory = Directory to cache to
-# sessions-directory = Directory to find sessions
-# remote-sessions-directory = Directory to find remote sessions
-# greeters-directory = Directory to find greeters
-# backup-logs = True to move add a .old suffix to old log files when opening new ones
-#
-[LightDM]
-#start-default-seat=true
-#greeter-user=lightdm
-#minimum-display-number=0
-#minimum-vt=7
-#lock-memory=true
-#user-authority-in-system-dir=false
-#guest-account-script=guest-account
-#logind-check-graphical=false
-#log-directory=/var/log/lightdm
-#run-directory=/var/run/lightdm
-#cache-directory=/var/cache/lightdm
-#sessions-directory=/usr/share/lightdm/sessions:/usr/share/xsessions:/usr/share/wayland-sessions
-#remote-sessions-directory=/usr/share/lightdm/remote-sessions
-#greeters-directory=/usr/share/lightdm/greeters:/usr/share/xgreeters
-#backup-logs=true
-
-#
-# Seat configuration
-#
-# Seat configuration is matched against the seat name glob in the section, for example:
-# [Seat:*] matches all seats and is applied first.
-# [Seat:seat0] matches the seat named "seat0".
-# [Seat:seat-thin-client*] matches all seats that have names that start with "seat-thin-client".
-#
-# type = Seat type (xlocal, xremote, unity)
-# pam-service = PAM service to use for login
-# pam-autologin-service = PAM service to use for autologin
-# pam-greeter-service = PAM service to use for greeters
-# xserver-command = X server command to run (can also contain arguments e.g. X -special-option)
-# xmir-command = Xmir server command to run (can also contain arguments e.g. Xmir -special-option)
-# xserver-config = Config file to pass to X server
-# xserver-layout = Layout to pass to X server
-# xserver-allow-tcp = True if TCP/IP connections are allowed to this X server
-# xserver-share = True if the X server is shared for both greeter and session
-# xserver-hostname = Hostname of X server (only for type=xremote)
-# xserver-display-number = Display number of X server (only for type=xremote)
-# xdmcp-manager = XDMCP manager to connect to (implies xserver-allow-tcp=true)
-# xdmcp-port = XDMCP UDP/IP port to communicate on
-# xdmcp-key = Authentication key to use for XDM-AUTHENTICATION-1 (stored in keys.conf)
-# unity-compositor-command = Unity compositor command to run (can also contain arguments e.g. unity-system-compositor -special-option)
-# unity-compositor-timeout = Number of seconds to wait for compositor to start
-# greeter-session = Session to load for greeter
-# greeter-hide-users = True to hide the user list
-# greeter-allow-guest = True if the greeter should show a guest login option
-# greeter-show-manual-login = True if the greeter should offer a manual login option
-# greeter-show-remote-login = True if the greeter should offer a remote login option
-# user-session = Session to load for users
-# allow-user-switching = True if allowed to switch users
-# allow-guest = True if guest login is allowed
-# guest-session = Session to load for guests (overrides user-session)
-# session-wrapper = Wrapper script to run session with
-# greeter-wrapper = Wrapper script to run greeter with
-# guest-wrapper = Wrapper script to run guest sessions with
-# display-setup-script = Script to run when starting a greeter session (runs as root)
-# display-stopped-script = Script to run after stopping the display server (runs as root)
-# greeter-setup-script = Script to run when starting a greeter (runs as root)
-# session-setup-script = Script to run when starting a user session (runs as root)
-# session-cleanup-script = Script to run when quitting a user session (runs as root)
-# autologin-guest = True to log in as guest by default
-# autologin-user = User to log in with by default (overrides autologin-guest)
-# autologin-user-timeout = Number of seconds to wait before loading default user
-# autologin-session = Session to load for automatic login (overrides user-session)
-# autologin-in-background = True if autologin session should not be immediately activated
-# exit-on-failure = True if the daemon should exit if this seat fails
-#
-[Seat:*]
-#type=xlocal
-#pam-service=lightdm
-#pam-autologin-service=lightdm-autologin
-#pam-greeter-service=lightdm-greeter
-#xserver-command=X
-#xmir-command=Xmir
-#xserver-config=
-#xserver-layout=
-#xserver-allow-tcp=false
-#xserver-share=true
-#xserver-hostname=
-#xserver-display-number=
-#xdmcp-manager=
-#xdmcp-port=177
-#xdmcp-key=
-#unity-compositor-command=unity-system-compositor
-#unity-compositor-timeout=60
-#greeter-session=example-gtk-gnome
-#greeter-hide-users=false
-#greeter-allow-guest=true
-#greeter-show-manual-login=false
-#greeter-show-remote-login=true
-#user-session=default
-#allow-user-switching=true
-#allow-guest=true
-#guest-session=
-#session-wrapper=lightdm-session
-#greeter-wrapper=
-#guest-wrapper=
-#display-setup-script=
-#display-stopped-script=
-#greeter-setup-script=
-#session-setup-script=
-session-cleanup-script=/usr/sbin/cleanup-sessions
-#autologin-guest=false
-#autologin-user=
-#autologin-user-timeout=0
-#autologin-in-background=false
-#autologin-session=
-#exit-on-failure=false
-
-#
-# XDMCP Server configuration
-#
-# enabled = True if XDMCP connections should be allowed
-# port = UDP/IP port to listen for connections on
-# listen-address = Host/address to listen for XDMCP connections (use all addresses if not present)
-# key = Authentication key to use for XDM-AUTHENTICATION-1 or blank to not use authentication (stored in keys.conf)
-# hostname = Hostname to report to XDMCP clients (defaults to system hostname if unset)
-#
-# The authentication key is a 56 bit DES key specified in hex as 0xnnnnnnnnnnnnnn. Alternatively
-# it can be a word and the first 7 characters are used as the key.
-#
-[XDMCPServer]
-#enabled=false
-#port=177
-#listen-address=
-#key=
-#hostname=
-
-#
-# VNC Server configuration
-#
-# enabled = True if VNC connections should be allowed
-# command = Command to run Xvnc server with
-# port = TCP/IP port to listen for connections on
-# listen-address = Host/address to listen for VNC connections (use all addresses if not present)
-# width = Width of display to use
-# height = Height of display to use
-# depth = Color depth of display to use
-#
-[VNCServer]
-#enabled=false
-#command=Xvnc
-#port=5900
-#listen-address=
-#width=1024
-#height=768
-#depth=8
--
GitLab