Commit efb980fc authored by Daniel Bissani Furlin's avatar Daniel Bissani Furlin
Browse files

SCRUM#365: Remove some lintian's warning

parent ca7f587d
......@@ -11,7 +11,7 @@ VERSION=$(echo $LINE | cut -d' ' -f2 | grep -o -E '[0-9]*\.[0-9]*\.[0-9]*')
tar --exclude=debian -czf ${PACKAGE}_${VERSION}.orig.tar.gz package/*
cd package
debuild -us -uc
debuild -us -uc --lintian-opts --profile debian
cd ../
mkdir build/
......
......@@ -4,10 +4,10 @@ Priority: optional
Maintainer: C3SL <contato@c3sl.ufpr.br>
Uploaders: Stephanie Briere Americo <sba16@c3sl.ufpr.br>
Build-Depends: debhelper (>=9)
Standards-Version: 3.9.6
Standards-Version: 3.9.7
Vcs-Git: https://gitlab.c3sl.ufpr.br/le6/le-multiterminal.git
Package: le-multiterminal
Architecture: amd64
Depends: ${misc:Depends}, curl, xserver-xorg-video-siliconmotion-hwe-16.04, compton, numlockx, xserver-xephyr-hwe-16.04, libc-bin, lightdm, xorg, udev, systemd, policykit-1-gnome, libcairo2
Depends: ${misc:Depends}, ${shlibs:Depends}, curl, xserver-xorg-video-siliconmotion-hwe-16.04, compton,numlockx, xserver-xephyr-hwe-16.04, lightdm, udev, systemd, policykit-1-gnome, libcairo2
Description: Configura multiterminal para funcionar com o LE
......@@ -5,19 +5,19 @@ etc/polkit-1/localauthority/50-local.d/90-restrict-guest-permissions.pkla etc/po
etc/systemd/system/le-multiterminal.service etc/systemd/system/
etc/systemd/system/xorg-daemon.service etc/systemd/system/
etc/systemd/system/xorg-daemon.socket etc/systemd/system/
etc/udev/rules.d/71-seat-usb.rules etc/udev/rules.d/
etc/udev/rules.d/73-seat-attach-assistant.rules etc/udev/rules.d/
etc/xdg/lightdm/lightdm.conf.d/97-no-screen-blanking.conf etc/xdg/lightdm/lightdm.conf.d/
opt/le-multiterminal/configurar-multiterminal.sh opt/le-multiterminal/
opt/le-multiterminal/detect-keyboard.sh opt/le-multiterminal/
opt/le-multiterminal/find-devices.sh opt/le-multiterminal/
opt/le-multiterminal/multiseat-controller.sh opt/le-multiterminal/
opt/le-multiterminal/multiterminal.sh opt/le-multiterminal/
opt/le-multiterminal/read-devices opt/le-multiterminal/
opt/le-multiterminal/seat-parent-window opt/le-multiterminal/
opt/le-multiterminal/window-acess.sh opt/le-multiterminal/
opt/le-multiterminal/write-message opt/le-multiterminal/
usr/local/bin/seat-attach-assistant usr/local/bin
usr/local/bin/update-xorg-conf usr/local/bin
usr/local/bin/xephyr-wrapper usr/local/bin
usr/local/bin/xorg-daemon usr/local/bin
lib/udev/rules.d/71-seat-usb.rules lib/udev/rules.d/
lib/udev/rules.d/73-seat-attach-assistant.rules lib/udev/rules.d/
usr/lib/find-devices usr/lib/
usr/lib/window-acess usr/lib/
usr/sbin/configurar-multiterminal usr/sbin/
usr/sbin/detect-keyboard usr/sbin/
usr/sbin/multiseat-controller usr/sbin/
usr/sbin/multiterminal usr/sbin/
usr/sbin/read-devices usr/sbin/
usr/sbin/seat-parent-window usr/sbin/
usr/sbin/write-message usr/sbin/
usr/sbin/seat-attach-assistant usr/sbin/
usr/sbin/update-xorg-conf usr/sbin/
usr/sbin/xephyr-wrapper usr/sbin/
usr/sbin/xorg-daemon usr/sbin/
#!/bin/sh
# postinst script for le-multiterminal
#DEBHELPER#
set -e
update-xorg-conf "Silicon.Motion" /etc/X11/xorg.conf.d/98-proinfo-*.conf
systemctl daemon-reload
systemctl enable le-multiterminal
deb-systemctl-helper enable le-multiterminal
# habilita e roda o xorg-daemon
systemctl enable xorg-daemon.socket
systemctl start xorg-daemon.socket
deb-systemctl-helper enable xorg-daemon.socket
deb-systemctl-invoke start xorg-daemon.socket
udevadm trigger
......
......@@ -29,7 +29,7 @@ Before=lightdm.service
[Service]
Type=oneshot
TimeoutSec=infinity
ExecStart=/opt/le-multiterminal/multiterminal.sh
ExecStart=/usr/sbin/multiterminal
[Install]
WantedBy=graphical.target
......@@ -4,6 +4,6 @@
Description=Service for Xorg server at display :90
[Service]
ExecStartPre=/usr/local/bin/update-xorg-conf Silicon.Motion /etc/X11/xorg.conf.d/98-proinfo-urbano.conf /etc/X11/xorg.conf.d/98-proinfo-rural.conf
ExecStart=/usr/local/bin/xorg-daemon :90
ExecStartPre=/usr/sbin/update-xorg-conf Silicon.Motion /etc/X11/xorg.conf.d/98-proinfo-urbano.conf /etc/X11/xorg.conf.d/98-proinfo-rural.conf
ExecStart=/usr/sbin/xorg-daemon :90
SuccessExitStatus=0 1
......@@ -2,6 +2,6 @@
ACTION=="remove", GOTO="seat_end"
SUBSYSTEM=="usb", TAG=="master-of-seat", ENV{ID_SEAT}=="", RUN+="/usr/local/bin/seat-attach-assistant $devpath $env{ID_PATH_TAG}"
SUBSYSTEM=="usb", TAG=="master-of-seat", ENV{ID_SEAT}=="", RUN+="/usr/sbin/seat-attach-assistant $devpath $env{ID_PATH_TAG}"
LABEL="seat_end"
......@@ -24,13 +24,14 @@
#### Written by: Stephanie Briere Americo - sba16@c3sl.ufpr.br on 2017.
## Macros
DEVICES="/opt/le-multiterminal/devices" # shortcut to devices that have already been paired
DEVICES="/sbin/devices" # shortcut to devices that have already been paired
#TODO: This path is correctly??
CONF="/opt/le-multiterminal/98-xephyr-multi-seat.conf" # lightdm settings file (associates seat to output)
## Script/function in other file
READ_DEVICES="read-devices"
DETECT_KEYBOARDS="/opt/le-multiterminal/detect-keyboard.sh"
WRITE_W="write_window" # "window-acess.sh"
DETECT_KEYBOARDS="/sbin/detect-keyboard"
WRITE_W="write_window" # "window-acess"
## Variables
declare -a SEATS_LISTED # save the name of the existing seats
......
......@@ -30,7 +30,7 @@ WRITE_MESSAGE="write-message" # it receives as parameter <ID_WINDOW> <Message>
create_window () {
#### Description: Create a window in a specific display.
#### ID_WINDOWS and WINDOW_COUNTER are declared in "multiseat-controller.sh".
#### ID_WINDOWS and WINDOW_COUNTER are declared in "multiseat-controller".
# Try to access Xorg
xdpyinfo -display ${DISPLAY_XORGS[$WINDOW_COUNTER]}
......@@ -69,7 +69,7 @@ create_window () {
write_window() {
#### Description: Writes in a specific window on a particular display.
#### Parameters: $1 - message to be written; $2 - display to be used.
#### DISPLAY_XORGS and ID_WINDOWS are declared in "multiseat-controller.sh".
#### DISPLAY_XORGS and ID_WINDOWS are declared in "multiseat-controller".
export DISPLAY=${DISPLAY_XORGS[$2]}
case $1 in
......
......@@ -26,21 +26,20 @@
set -x
export PATH=$PATH:/opt/le-multiterminal
## Auxiliary scripts
source /opt/le-multiterminal/find-devices.sh
source /opt/le-multiterminal/window-acess.sh
source /usr/sbin/find-devices
source /usr/sbin/window-acess
## Path constants
MC3SL_DEVICES="/opt/le-multiterminal/devices" # shortcut to devices that have already been paired
MC3SL_DEVICES="/usr/sbin/devices" # shortcut to devices that have already been paired
#TODO: This path is correctly??
MC3SL_CONF="/opt/le-multiterminal/98-xephyr-multi-seat.conf" # lightdm settings file (associates seat to output)
LIGHTDM_CONF="/etc/xdg/lightdm/lightdm.conf.d/98-xephyr-multi-seat.conf"
## Script/function in other file
FIND_KEYBOARD="find_keyboard" # "find-devices.sh"
CREATE_WINDOW="create_window" # "window-acess.sh"
WRITE_WINDOW="write_window" # "window-acess.sh"
FIND_KEYBOARD="find_keyboard" # "find-devices"
CREATE_WINDOW="create_window" # "window-acess"
WRITE_WINDOW="write_window" # "window-acess"
## Macros
FAKE_DISPLAY=:90 # display to access fake-seat (secondary card)
......@@ -54,7 +53,7 @@ WINDOW_COUNTER=0 # how many windows were created
N_SEATS_LISTED=0 # how many seats are there in the system
ONBOARD=0 # if the onboard is connected
declare -a DISPLAY_XORGS # saves the display of the Xorg launched processes
declare -a ID_WINDOWS # saves the created window ids (used in window-acess.sh)
declare -a ID_WINDOWS # saves the created window ids (used in window-acess)
declare -a PID_FIND_DEVICES # saves the pid from the launched configuration processes
create_onboard_window () {
......@@ -213,7 +212,7 @@ while test $CONFIGURED_SEATS -lt $N_SEATS_LISTED; do
if test $EXIT_CODE -eq 0; then
CONFIGURED_SEATS=$(($CONFIGURED_SEATS+1))
else if test $EXIT_CODE -eq 2; then
echo "[Error] Can not configure output: find-devices.sh failed."
echo "[Error] Can not configure output: find-devices failed."
rm -f $MC3SL_CONF
exit 1
fi
......
......@@ -38,6 +38,6 @@ if test ! -e /etc/le-multiterminal/configurado; then
fi
if test $CONFIG_FLAG -eq 1; then
/opt/le-multiterminal/multiseat-controller.sh >> /var/log/le-multiterminal/controller.log 2>&1
/usr/sbin/multiseat-controller >> /var/log/le-multiterminal/controller.log 2>&1
reboot
fi
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment