Commit 8d3af849 authored by Alessandro Elias's avatar Alessandro Elias
Browse files

Merge branch 'issue/365/warnings' into 'master'

Issue/365/warnings

See merge request !17
parents ba14495d 0d761be6
Pipeline #14559 passed with stages
in 8 minutes and 25 seconds
#!/bin/bash #!/bin/bash
# This script generates a .deb package # This script generates a .deb package
BUILD_DEPS=$(grep 'Build-Depends' package/debian/control | cut -d' ' -f2- | tr ', ' ' ' | sed -E "s/ \((>|<|=)+[0-9]\)//g")
apt-get update && apt-get install -y devscripts apt-get update && apt-get install -y devscripts ${BUILD_DEPS}
CHANGELOG="package/debian/changelog" CHANGELOG="package/debian/changelog"
LINE=$(head -n 1 $CHANGELOG) LINE=$(head -n 1 $CHANGELOG)
...@@ -11,7 +11,7 @@ VERSION=$(echo $LINE | cut -d' ' -f2 | grep -o -E '[0-9]*\.[0-9]*\.[0-9]*') ...@@ -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/* tar --exclude=debian -czf ${PACKAGE}_${VERSION}.orig.tar.gz package/*
cd package cd package
debuild -us -uc debuild -us -uc --lintian-opts --profile debian
cd ../ cd ../
mkdir build/ mkdir build/
......
package/debian/le-conf package/debian/le-multiterminal
package/debian/le-conf.debhelper.log package/debian/le-multiterminal.debhelper.log
package/debian/le-conf.substvars package/debian/le-multiterminal.substvars
package/debian/le-conf.*.debhelper
package/debian/files package/debian/files
package/debian/debhelper-build-stamp package/debian/debhelper-build-stamp
le-conf_*.tar.xz build
le-conf_*.build
le-conf_*.dsc
le-conf_*.changes
le-conf_*.deb
build.sh
...@@ -23,10 +23,8 @@ test: ...@@ -23,10 +23,8 @@ test:
- regular - regular
script: script:
# TODO: find a way to get the dependencies automatically # TODO: find a way to get the dependencies automatically
- apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y locales - apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y udev
- locale-gen pt_BR.UTF-8 - DEBIAN_FRONTEND=noninteractive apt-get -y -q install $(pwd)/build/*.deb
- export LANG=pt_BR.UTF-8
- DEBIAN_FRONTEND=noninteractive apt-get -y install $(pwd)/build/*.deb
dependencies: dependencies:
- build - build
......
le-multiterminal (0.0.7ubuntu1) testing; urgency=medium
* Remove warnings and fix dependencies.
-- Daniel Bissani Furlin <dbf15@inf.ufpr.br> Fri, 23 Feb 2018 17:34:10 -0300
le-multiterminal (0.0.7) testing; urgency=medium le-multiterminal (0.0.7) testing; urgency=medium
* Adds copyright and credits to all files * Adds copyright and credits to all files
......
...@@ -3,12 +3,18 @@ Section: misc ...@@ -3,12 +3,18 @@ Section: misc
Priority: optional Priority: optional
Maintainer: C3SL <contato@c3sl.ufpr.br> Maintainer: C3SL <contato@c3sl.ufpr.br>
Uploaders: Stephanie Briere Americo <sba16@c3sl.ufpr.br> Uploaders: Stephanie Briere Americo <sba16@c3sl.ufpr.br>
Build-Depends: debhelper (>=9) Build-Depends: debhelper (>=9), libx11-dev, libcairo2-dev
Standards-Version: 3.9.6 Standards-Version: 3.9.7
Vcs-Git: https://gitlab.c3sl.ufpr.br/le6/le-multiterminal.git Vcs-Git: https://gitlab.c3sl.ufpr.br/le6/le-multiterminal.git
#Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/le-multiterminal.git
Package: le-multiterminal Package: le-multiterminal
Architecture: all Architecture: amd64
Depends: ${misc:Depends}, curl, xserver-xorg-video-siliconmotion-hwe-16.04, compton, numlockx, xserver-xephyr-hwe-16.04, libc-bin Pre-Depends: lightdm
Description: Configura multiterminal para funcionar com o LE Depends: ${misc:Depends}, ${shlibs:Depends}, curl, xserver-xorg-video-siliconmotion-hwe-16.04, compton, numlockx, xserver-xephyr-hwe-16.04, systemd, policykit-1-gnome, libcairo2, pciutils
Description: Multiterminal Solution compatible with the system Linux Educational 6
Multi-terminal solution compatible with Linux Educational system 6.
The multi-terminal system configures up to three monitors simultaneously on
the same machine.
The solution relies heavily on the TN-502 video card and the Thinnetworks
Hubs, available on the 83/2008 and 71/2010 sessions of the Brazilian federal
government.
...@@ -22,4 +22,3 @@ License: GPL-3.0+ ...@@ -22,4 +22,3 @@ License: GPL-3.0+
. .
On Debian systems, the complete text of the GNU General On Debian systems, the complete text of the GNU General
Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
etc / etc/X11/xorg.conf.d/97-proinfo-monitores.conf etc/X11/xorg.conf.d/
usr / etc/X11/xorg.conf.d/98-proinfo-urbano.conf etc/X11/xorg.conf.d/
opt / etc/le-multiterminal/readme etc/le-multiterminal/
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/
lib/systemd/system/xorg-daemon.socket lib/systemd/system/
etc/xdg/lightdm/lightdm.conf.d/97-no-screen-blanking.conf etc/xdg/lightdm/lightdm.conf.d/
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/
binary-without-manpage
systemd-service-file-missing-documentation-key
#!/bin/sh #!/bin/sh
# postinst script for le-multiterminal # postinst script for le-multiterminal
#DEBHELPER#
set -e
update-xorg-conf "Silicon.Motion" /etc/X11/xorg.conf.d/98-proinfo-*.conf update-xorg-conf "Silicon.Motion" /etc/X11/xorg.conf.d/98-proinfo-*.conf
systemctl daemon-reload if [ ! -f /.dockerenv ]; then
systemctl enable le-multiterminal systemctl daemon-reload
deb-systemd-helper enable le-multiterminal.service
# habilita e roda o xorg-daemon # habilita e roda o xorg-daemon
systemctl enable xorg-daemon.socket deb-systemd-helper enable xorg-daemon.socket
systemctl start xorg-daemon.socket deb-systemd-invoke start xorg-daemon.socket
udevadm trigger udevadm trigger
fi
echo "Por favor reinicie o sistema para o multiterminal ser reconfigurado!" echo "Por favor reinicie o sistema para o multiterminal ser reconfigurado!"
exit 0 exit 0
#!/usr/bin/make -f #!/usr/bin/make -f
# See debhelper(7) (uncomment to enable)
# output every command that modifies files on the build system.
#export DH_VERBOSE = 1
# see FEATURE AREAS in dpkg-buildflags(1)
#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
# see ENVIRONMENT in dpkg-buildflags(1)
# package maintainers to append CFLAGS
#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
# package maintainers to append LDFLAGS
#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
%: %:
dh $@ dh $@
#override_dh_usrlocal:
build: build-arch build-indep
# dh_make generated override targets $(MAKE) -C src/
# This is example for Cmake (See https://bugs.debian.org/641051 ) dh_testdir
#override_dh_auto_configure: dh_auto_configure
# dh_auto_configure -- # -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH) dh_auto_build
override_dh_usrlocal: dh_auto_test
clean:
$(MAKE) -C src/ clean
dh_testdir
dh_auto_clean
dh_clean
...@@ -29,7 +29,7 @@ Before=lightdm.service ...@@ -29,7 +29,7 @@ Before=lightdm.service
[Service] [Service]
Type=oneshot Type=oneshot
TimeoutSec=infinity TimeoutSec=infinity
ExecStart=/opt/le-multiterminal/multiterminal.sh ExecStart=/usr/sbin/multiterminal
[Install] [Install]
WantedBy=graphical.target WantedBy=graphical.target
...@@ -4,6 +4,6 @@ ...@@ -4,6 +4,6 @@
Description=Service for Xorg server at display :90 Description=Service for Xorg server at display :90
[Service] [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 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/local/bin/xorg-daemon :90 ExecStart=/usr/sbin/xorg-daemon :90
SuccessExitStatus=0 1 SuccessExitStatus=0 1
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
ACTION=="remove", GOTO="seat_end" 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" LABEL="seat_end"
#!/bin/bash
# Script adapted from Laércio de Sousa <laerciosousa@sme-mogidascruzes.sp.gov.br>
cd ../../
# Copia arquivo que altera permissões dos usuários
install -m 644 etc/polkit-1/localauthority/50-local.d/* /etc/polkit-1/localauthority/50-local.d
# Copia arquivos do X para systemd
install -m 644 etc/systemd/system/* /etc/systemd/system
# Copia configs de usb para o udev
install -m 644 etc/udev/rules.d/* /etc/udev/rules.d
# Cria diretorio
install -d /etc/X11/xorg.conf.d
# Copia configurações de monitores para xorg
install -m 644 etc/X11/xorg.conf.d/9[78]*.conf /etc/X11/xorg.conf.d
# Copia scripts para bin
# mapeia as portas usb para monitores
install -m 755 usr/local/bin/seat-attach-assistant /usr/local/bin
# Copia script que atualiza entradas no xorg para bin (explicado no arquivo)
install -m 755 usr/local/bin/update-xorg-conf /usr/local/bin
# Copia script para executar o X para bin
install -m 755 usr/local/bin/xorg-daemon /usr/local/bin
# Copia script do Xephyr para bin
install -m 755 usr/local/bin/xephyr-wrapper /usr/local/bin
# Cria diretorio e copia configs do lightdm
install -d /etc/xdg/lightdm/lightdm.conf.d
install -m 644 etc/xdg/lightdm/lightdm.conf.d/*.conf /etc/xdg/lightdm/lightdm.conf.d
install -d /etc/le-multiterminal
install -d /opt/le-multiterminal
install -m 755 opt/le-multiterminal/* /opt/le-multiterminal
# roda o script que atualiza as configs do xorg
update-xorg-conf "Silicon.Motion" /etc/X11/xorg.conf.d/98-proinfo-*.conf
systemctl daemon-reload
systemctl enable le-multiterminal
# habilita e roda o xorg-daemon
systemctl enable xorg-daemon.socket
systemctl start xorg-daemon.socket
apt update
apt -y upgrade
apt -y install curl xserver-xorg-video-siliconmotion-hwe-16.04 compton numlockx xserver-xephyr-hwe-16.04
# Pede eventos ao kernel: "força" a identificação dos dispositivos na maquina
udevadm trigger
#!/usr/bin/make -f
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
DPKG_EXPORT_BUILDFLAGS = 1
include /usr/share/dpkg/buildflags.mk
CC = gcc
CFLAGSS = -O2 -Wall -fPIC -pie $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
SRC=.
DST = ../usr/sbin
all:
$(CC) $(CFLAGSS) $(SRC)/read-devices.c -o $(DST)/read-devices
$(CC) $(CFLAGSS) $(SRC)/write-message.c -o $(DST)/write-message `pkg-config --libs --cflags cairo x11`
$(CC) $(CFLAGSS) $(SRC)/seat-parent-window.c -o $(DST)/seat-parent-window `pkg-config --libs --cflags x11`
clean:
rm -f $(DST)/read-devices
rm -f $(DST)/write-message
rm -f $(DST)/seat-parent-window
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