Skip to content

Commit 5573aaa

Browse files
committed
limpieza de capturas y mejor debianización
git-svn-id: file:///opt/svn/colegios/controlaula/trunk@463 c4774de7-f4ed-435d-9225-5986420fcf7b
1 parent 6900a4c commit 5573aaa

13 files changed

+12
-61
lines changed

MANIFEST.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
include GPL-LICENSE.txt controlaula.desktop controlaula.png startcontrolaula.desktop
1+
include GPL-LICENSE.txt controlaula.desktop controlaula.png startcontrolaula.desktop controlaula nobody.png
22
recursive-include Backend frontend
33

44
recursive-include Backend *

controlaula

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/sh
2+
3+
exec python "/usr/share/controlaula/monitor.py"
4+

debian/init

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ case "$1" in
5151
# Make cache files readable
5252
umask 022
5353
start-stop-daemon --start --quiet --exec $twistd -- \
54-
--pidfile=$pidfile --rundir=$rundir --python=$application \
55-
--logfile=$logfile --no_save
54+
--pidfile=$pidfile --python $application --rundir=$rundir \
55+
--logfile=$logfile --reactor=glib2 --no_save
5656
log_end_msg $?
5757
;;
5858

-48.6 KB
Binary file not shown.
-83.8 KB
Binary file not shown.
-84.2 KB
Binary file not shown.
-83.8 KB
Binary file not shown.
-48.6 KB
Binary file not shown.
-84.2 KB
Binary file not shown.

frontend/www/css/data-view.css~

-56
This file was deleted.

Backend/src/nobody.png nobody.png

File renamed without changes.

setup.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
datafiles.append(('share/pixmaps',['controlaula.png']))
1616
datafiles.append(('share/applications',['controlaula.desktop']))
1717
datafiles.append(('/etc/xdg/autostart',['startcontrolaula.desktop']))
18+
datafiles.append(('share/controlaula',['nobody.png']))
19+
datafiles.append(('share/controlaula',['Backend/src/monitor.py']))
1820

1921
setup(name='ControlAula',
2022
version='1.5',
@@ -26,9 +28,10 @@
2628
license = "GNU GPLv3",
2729
packages=['ControlAula','ControlAula.Plugins','ControlAula.Utils'],
2830
package_dir={'ControlAula': 'Backend/src/ControlAula'},
31+
# package_data={'ControlAula': ['nobody.png']},
2932
url = 'http://www.itais.net/en/',
3033
# Those are going to be installed on /usr/bin/
31-
scripts=['Backend/src/monitor.py','Backend/src/sirvecole.py'],
34+
scripts=['controlaula','Backend/src/sirvecole.py'],
3235

3336
data_files=datafiles
3437
)

startcontrolaula.desktop

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
Encoding=UTF-8
33
Version=1.0
44
Type=Application
5-
Exec=/usr/bin/Monitor.py
5+
Exec=/usr/bin/controlaula
66
Icon=/usr/share/pixmaps/controlaula.png
77
Terminal=false
88
Name[es_ES]=Control del Aula

0 commit comments

Comments
 (0)