Merge lp:~fontanon/commiecc/karmic-packaging into lp:commiecc

Proposed by J. Félix Ontañón
Status: Merged
Approved by: J. Félix Ontañón
Approved revision: not available
Merged at revision: not available
Proposed branch: lp:~fontanon/commiecc/karmic-packaging
Merge into: lp:commiecc
Diff against target: 257 lines (+170/-3)
14 files modified
commiecc/__init__.py (+22/-0)
commiecc/slavelib/dbusmanager.py (+4/-3)
debian/changelog (+5/-0)
debian/commiecc-common.install (+1/-0)
debian/commiecc-master.install (+7/-0)
debian/commiecc-slave.install (+11/-0)
debian/commiecc-slave.upstart (+17/-0)
debian/compat (+1/-0)
debian/control (+48/-0)
debian/copyright (+39/-0)
debian/dirs (+2/-0)
debian/docs (+1/-0)
debian/pycompat (+1/-0)
debian/rules (+11/-0)
To merge this branch: bzr merge lp:~fontanon/commiecc/karmic-packaging
Reviewer Review Type Date Requested Status
J. Félix Ontañón Approve
Review via email: mp+15751@code.launchpad.net
To post a comment you must log in.
Revision history for this message
J. Félix Ontañón (fontanon) wrote :

karmic packaging approved

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'commiecc/__init__.py'
--- commiecc/__init__.py 2009-11-30 22:15:58 +0000
+++ commiecc/__init__.py 2009-12-07 13:50:25 +0000
@@ -0,0 +1,22 @@
1# -*- coding: utf-8 -*-
2# vim: ts=4
3###
4#
5# CommieCC is the legal property of J. Félix Ontañón <felixonta@gmail.com>
6# Copyright (c) 2009 J. Félix Ontañón
7#
8# This program is free software; you can redistribute it and/or modify
9# it under the terms of the GNU General Public License version 3 as
10# published by the Free Software Foundation
11#
12# This program is distributed in the hope that it will be useful,
13# but WITHOUT ANY WARRANTY; without even the implied warranty of
14# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15# GNU General Public License for more details.
16#
17# You should have received a copy of the GNU General Public License
18# along with this program; if not, write to the Free Software
19# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
20#
21###
22
023
=== modified file 'commiecc/slavelib/dbusmanager.py'
--- commiecc/slavelib/dbusmanager.py 2009-12-03 19:19:39 +0000
+++ commiecc/slavelib/dbusmanager.py 2009-12-07 13:50:25 +0000
@@ -42,17 +42,18 @@
42 running somewhere"42 running somewhere"
43 pass43 pass
4444
45 @log('Lock order received', logging.INFO)45 # FIXME: How to decorate it?
46 #@log('Lock order received', logging.INFO)
46 @dbus.service.method(LOCKER_IFACE_URI)47 @dbus.service.method(LOCKER_IFACE_URI)
47 def Lock(self):48 def Lock(self):
48 self.Locked(True)49 self.Locked(True)
4950
50 @log('Unlock order received', logging.INFO)51 #@log('Unlock order received', logging.INFO)
51 @dbus.service.method(LOCKER_IFACE_URI)52 @dbus.service.method(LOCKER_IFACE_URI)
52 def Unlock(self):53 def Unlock(self):
53 self.Locked(False)54 self.Locked(False)
54 55
55 @log('Stop lockers order received', logging.INFO)56 #@log('Stop lockers order received', logging.INFO)
56 @dbus.service.method(LOCKER_IFACE_URI)57 @dbus.service.method(LOCKER_IFACE_URI)
57 def Stop(self):58 def Stop(self):
58 self.Stoped()59 self.Stoped()
5960
=== added directory 'debian'
=== added file 'debian/changelog'
--- debian/changelog 1970-01-01 00:00:00 +0000
+++ debian/changelog 2009-12-07 13:50:25 +0000
@@ -0,0 +1,5 @@
1commiecc (0.1-1) karmic; urgency=low
2
3 * Initial release
4
5 -- J. Félix Ontañón <felixonta@gmail.com> Fri, 04 Dec 2009 09:27:30 +0100
06
=== added file 'debian/commiecc-common.install'
--- debian/commiecc-common.install 1970-01-01 00:00:00 +0000
+++ debian/commiecc-common.install 2009-12-07 13:50:25 +0000
@@ -0,0 +1,1 @@
1debian/tmp/usr/lib/python*/*/commiecc/*.py
02
=== added file 'debian/commiecc-master.install'
--- debian/commiecc-master.install 1970-01-01 00:00:00 +0000
+++ debian/commiecc-master.install 2009-12-07 13:50:25 +0000
@@ -0,0 +1,7 @@
1debian/tmp/usr/lib/python*/*/commiecc/masterlib/*.py
2debian/tmp/usr/lib/python*/*/commiecc/classcontrol/*.py
3
4debian/tmp/usr/bin/commie-class-control
5
6debian/tmp/usr/share/commiecc/data/classcontrol.ui
7debian/tmp/usr/share/commiecc/data/img/commiecc-c-logo-bg64x64.png
08
=== added file 'debian/commiecc-slave.install'
--- debian/commiecc-slave.install 1970-01-01 00:00:00 +0000
+++ debian/commiecc-slave.install 2009-12-07 13:50:25 +0000
@@ -0,0 +1,11 @@
1debian/tmp/usr/lib/python*/*/commiecc/slavelib/*.py
2
3debian/tmp/usr/bin/commiecc-slave
4debian/tmp/usr/bin/commiecc-screen-locker
5
6debian/tmp/usr/share/commiecc/data/lock_screen.ui
7debian/tmp/usr/share/commiecc/data/img/commiecc-artwork192x192.png
8
9debian/tmp/usr/share/gdm/autostart/LoginWindow/commiecc-screen-locker.desktop
10
11debian/tmp/etc/dbus-1/system.d/commiecc.conf
012
=== added file 'debian/commiecc-slave.upstart'
--- debian/commiecc-slave.upstart 1970-01-01 00:00:00 +0000
+++ debian/commiecc-slave.upstart 2009-12-07 13:50:25 +0000
@@ -0,0 +1,17 @@
1# commiecc-slave - Classroom controller slave side
2
3description "CommieCC slave"
4
5start on (filesystem
6 and started dbus
7 and started avahi-daemon)
8stop on stopping dbus
9
10#expect daemon
11respawn
12
13pre-stop script
14 dbus-send --print-reply --system --dest=org.gnome.CommieCC /org/gnome/CommieCC org.gnome.CommieCC.ScreenLocker.Stop
15end script
16
17exec commiecc-slave
018
=== added file 'debian/compat'
--- debian/compat 1970-01-01 00:00:00 +0000
+++ debian/compat 2009-12-07 13:50:25 +0000
@@ -0,0 +1,1 @@
17
02
=== added file 'debian/control'
--- debian/control 1970-01-01 00:00:00 +0000
+++ debian/control 2009-12-07 13:50:25 +0000
@@ -0,0 +1,48 @@
1Source: commiecc
2Section: utils
3Priority: extra
4Maintainer: J. Félix Ontañón <felixonta@gmail.com>
5Build-Depends: cdbs, debhelper (>= 7), python, python-support (>= 0.5.3)
6Standards-Version: 3.8.3
7Homepage: http://launchpad.net/commiecc
8
9Package: commiecc-common
10Architecture: any
11Depends: ${misc:Depends}, ${python:Depends},
12Description: A slave-master app for managing a computer classroom
13 CommieCC (stands for Commie Classroom Control) helps to manage the common
14 tasks on a computer classroom: discover computers, lock/unlock screen,
15 reboot and halt.
16 .
17 It provides a GUI for managing the computers and has a plugin-driven
18 architecture so the actions can be easily extended.
19 .
20 This is the common files package
21
22Package: commiecc-slave
23Architecture: any
24Depends: ${misc:Depends}, ${python:Depends}, commiecc-common, python-dbus,
25 python-gtk2, python-avahi, network-manager, consolekit, gdm, upstart
26Description: A slave-master app for managing a computer classroom
27 CommieCC (stands for Commie Classroom Control) helps to manage the common
28 tasks on a computer classroom: discover computers, lock/unlock screen,
29 reboot and halt.
30 .
31 It provides a GUI for managing the computers and has a plugin-driven
32 architecture so the actions can be easily extended.
33 .
34 This is the slave server package with screen locker support
35
36Package: commiecc-master
37Architecture: any
38Depends: ${misc:Depends}, ${python:Depends}, commiecc-common, python-gtk2,
39 python-avahi, python-egenix-mxdatetime
40Description: A slave-master app for managing a computer classroom
41 CommieCC (stands for Commie Classroom Control) helps to manage the common
42 tasks on a computer classroom: discover computers, lock/unlock screen,
43 reboot and halt.
44 .
45 It provides a GUI for managing the computers and has a plugin-driven
46 architecture so the actions can be easily extended.
47 .
48 This is the master application package
049
=== added file 'debian/copyright'
--- debian/copyright 1970-01-01 00:00:00 +0000
+++ debian/copyright 2009-12-07 13:50:25 +0000
@@ -0,0 +1,39 @@
1This package was debianized by:
2
3 J. Félix Ontañón <felixonta@gmail.com> on Fri, 04 Dec 2009 09:27:30 +0100
4
5It was downloaded from:
6
7 http://launchpad.net/commiecc
8
9Upstream Author:
10
11 J. Félix Ontañón <felixonta@gmail.com>
12
13Copyright:
14
15 Copyright (C) 2009 J. Félix Ontañón
16
17License:
18
19 This program is free software: you can redistribute it and/or modify
20 it under the terms of the GNU General Public License as published by
21 the Free Software Foundation, either version 3 of the License, or
22 (at your option) any later version.
23
24 This package is distributed in the hope that it will be useful,
25 but WITHOUT ANY WARRANTY; without even the implied warranty of
26 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
27 GNU General Public License for more details.
28
29 You should have received a copy of the GNU General Public License
30 along with this program. If not, see <http://www.gnu.org/licenses/>.
31
32On Debian systems, the complete text of the GNU General
33Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
34
35The Debian packaging is:
36
37 Copyright (C) 2009 J. Félix Ontañón <felixonta@gmail.com>
38
39and is licensed under the GPL version 3, see above.
040
=== added file 'debian/dirs'
--- debian/dirs 1970-01-01 00:00:00 +0000
+++ debian/dirs 2009-12-07 13:50:25 +0000
@@ -0,0 +1,2 @@
1usr/bin
2usr/sbin
03
=== added file 'debian/docs'
--- debian/docs 1970-01-01 00:00:00 +0000
+++ debian/docs 2009-12-07 13:50:25 +0000
@@ -0,0 +1,1 @@
1README
02
=== added file 'debian/pycompat'
--- debian/pycompat 1970-01-01 00:00:00 +0000
+++ debian/pycompat 2009-12-07 13:50:25 +0000
@@ -0,0 +1,1 @@
12
02
=== added file 'debian/rules'
--- debian/rules 1970-01-01 00:00:00 +0000
+++ debian/rules 2009-12-07 13:50:25 +0000
@@ -0,0 +1,11 @@
1#!/usr/bin/make -f
2
3DEB_PYTHON_SYSTEM=pysupport
4
5include /usr/share/cdbs/1/rules/debhelper.mk
6include /usr/share/cdbs/1/class/python-distutils.mk
7include /usr/share/cdbs/1/rules/simple-patchsys.mk
8
9# Add here any variable or target overrides you need.
10
11DEB_PYTHON_INSTALL_ARGS_ALL = --prefix=/usr

Subscribers

People subscribed via source and target branches

to all changes: