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
1=== modified file 'commiecc/__init__.py'
2--- commiecc/__init__.py 2009-11-30 22:15:58 +0000
3+++ commiecc/__init__.py 2009-12-07 13:50:25 +0000
4@@ -0,0 +1,22 @@
5+# -*- coding: utf-8 -*-
6+# vim: ts=4
7+###
8+#
9+# CommieCC is the legal property of J. Félix Ontañón <felixonta@gmail.com>
10+# Copyright (c) 2009 J. Félix Ontañón
11+#
12+# This program is free software; you can redistribute it and/or modify
13+# it under the terms of the GNU General Public License version 3 as
14+# published by the Free Software Foundation
15+#
16+# This program is distributed in the hope that it will be useful,
17+# but WITHOUT ANY WARRANTY; without even the implied warranty of
18+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
19+# GNU General Public License for more details.
20+#
21+# You should have received a copy of the GNU General Public License
22+# along with this program; if not, write to the Free Software
23+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
24+#
25+###
26+
27
28=== modified file 'commiecc/slavelib/dbusmanager.py'
29--- commiecc/slavelib/dbusmanager.py 2009-12-03 19:19:39 +0000
30+++ commiecc/slavelib/dbusmanager.py 2009-12-07 13:50:25 +0000
31@@ -42,17 +42,18 @@
32 running somewhere"
33 pass
34
35- @log('Lock order received', logging.INFO)
36+ # FIXME: How to decorate it?
37+ #@log('Lock order received', logging.INFO)
38 @dbus.service.method(LOCKER_IFACE_URI)
39 def Lock(self):
40 self.Locked(True)
41
42- @log('Unlock order received', logging.INFO)
43+ #@log('Unlock order received', logging.INFO)
44 @dbus.service.method(LOCKER_IFACE_URI)
45 def Unlock(self):
46 self.Locked(False)
47
48- @log('Stop lockers order received', logging.INFO)
49+ #@log('Stop lockers order received', logging.INFO)
50 @dbus.service.method(LOCKER_IFACE_URI)
51 def Stop(self):
52 self.Stoped()
53
54=== added directory 'debian'
55=== added file 'debian/changelog'
56--- debian/changelog 1970-01-01 00:00:00 +0000
57+++ debian/changelog 2009-12-07 13:50:25 +0000
58@@ -0,0 +1,5 @@
59+commiecc (0.1-1) karmic; urgency=low
60+
61+ * Initial release
62+
63+ -- J. Félix Ontañón <felixonta@gmail.com> Fri, 04 Dec 2009 09:27:30 +0100
64
65=== added file 'debian/commiecc-common.install'
66--- debian/commiecc-common.install 1970-01-01 00:00:00 +0000
67+++ debian/commiecc-common.install 2009-12-07 13:50:25 +0000
68@@ -0,0 +1,1 @@
69+debian/tmp/usr/lib/python*/*/commiecc/*.py
70
71=== added file 'debian/commiecc-master.install'
72--- debian/commiecc-master.install 1970-01-01 00:00:00 +0000
73+++ debian/commiecc-master.install 2009-12-07 13:50:25 +0000
74@@ -0,0 +1,7 @@
75+debian/tmp/usr/lib/python*/*/commiecc/masterlib/*.py
76+debian/tmp/usr/lib/python*/*/commiecc/classcontrol/*.py
77+
78+debian/tmp/usr/bin/commie-class-control
79+
80+debian/tmp/usr/share/commiecc/data/classcontrol.ui
81+debian/tmp/usr/share/commiecc/data/img/commiecc-c-logo-bg64x64.png
82
83=== added file 'debian/commiecc-slave.install'
84--- debian/commiecc-slave.install 1970-01-01 00:00:00 +0000
85+++ debian/commiecc-slave.install 2009-12-07 13:50:25 +0000
86@@ -0,0 +1,11 @@
87+debian/tmp/usr/lib/python*/*/commiecc/slavelib/*.py
88+
89+debian/tmp/usr/bin/commiecc-slave
90+debian/tmp/usr/bin/commiecc-screen-locker
91+
92+debian/tmp/usr/share/commiecc/data/lock_screen.ui
93+debian/tmp/usr/share/commiecc/data/img/commiecc-artwork192x192.png
94+
95+debian/tmp/usr/share/gdm/autostart/LoginWindow/commiecc-screen-locker.desktop
96+
97+debian/tmp/etc/dbus-1/system.d/commiecc.conf
98
99=== added file 'debian/commiecc-slave.upstart'
100--- debian/commiecc-slave.upstart 1970-01-01 00:00:00 +0000
101+++ debian/commiecc-slave.upstart 2009-12-07 13:50:25 +0000
102@@ -0,0 +1,17 @@
103+# commiecc-slave - Classroom controller slave side
104+
105+description "CommieCC slave"
106+
107+start on (filesystem
108+ and started dbus
109+ and started avahi-daemon)
110+stop on stopping dbus
111+
112+#expect daemon
113+respawn
114+
115+pre-stop script
116+ dbus-send --print-reply --system --dest=org.gnome.CommieCC /org/gnome/CommieCC org.gnome.CommieCC.ScreenLocker.Stop
117+end script
118+
119+exec commiecc-slave
120
121=== added file 'debian/compat'
122--- debian/compat 1970-01-01 00:00:00 +0000
123+++ debian/compat 2009-12-07 13:50:25 +0000
124@@ -0,0 +1,1 @@
125+7
126
127=== added file 'debian/control'
128--- debian/control 1970-01-01 00:00:00 +0000
129+++ debian/control 2009-12-07 13:50:25 +0000
130@@ -0,0 +1,48 @@
131+Source: commiecc
132+Section: utils
133+Priority: extra
134+Maintainer: J. Félix Ontañón <felixonta@gmail.com>
135+Build-Depends: cdbs, debhelper (>= 7), python, python-support (>= 0.5.3)
136+Standards-Version: 3.8.3
137+Homepage: http://launchpad.net/commiecc
138+
139+Package: commiecc-common
140+Architecture: any
141+Depends: ${misc:Depends}, ${python:Depends},
142+Description: A slave-master app for managing a computer classroom
143+ CommieCC (stands for Commie Classroom Control) helps to manage the common
144+ tasks on a computer classroom: discover computers, lock/unlock screen,
145+ reboot and halt.
146+ .
147+ It provides a GUI for managing the computers and has a plugin-driven
148+ architecture so the actions can be easily extended.
149+ .
150+ This is the common files package
151+
152+Package: commiecc-slave
153+Architecture: any
154+Depends: ${misc:Depends}, ${python:Depends}, commiecc-common, python-dbus,
155+ python-gtk2, python-avahi, network-manager, consolekit, gdm, upstart
156+Description: A slave-master app for managing a computer classroom
157+ CommieCC (stands for Commie Classroom Control) helps to manage the common
158+ tasks on a computer classroom: discover computers, lock/unlock screen,
159+ reboot and halt.
160+ .
161+ It provides a GUI for managing the computers and has a plugin-driven
162+ architecture so the actions can be easily extended.
163+ .
164+ This is the slave server package with screen locker support
165+
166+Package: commiecc-master
167+Architecture: any
168+Depends: ${misc:Depends}, ${python:Depends}, commiecc-common, python-gtk2,
169+ python-avahi, python-egenix-mxdatetime
170+Description: A slave-master app for managing a computer classroom
171+ CommieCC (stands for Commie Classroom Control) helps to manage the common
172+ tasks on a computer classroom: discover computers, lock/unlock screen,
173+ reboot and halt.
174+ .
175+ It provides a GUI for managing the computers and has a plugin-driven
176+ architecture so the actions can be easily extended.
177+ .
178+ This is the master application package
179
180=== added file 'debian/copyright'
181--- debian/copyright 1970-01-01 00:00:00 +0000
182+++ debian/copyright 2009-12-07 13:50:25 +0000
183@@ -0,0 +1,39 @@
184+This package was debianized by:
185+
186+ J. Félix Ontañón <felixonta@gmail.com> on Fri, 04 Dec 2009 09:27:30 +0100
187+
188+It was downloaded from:
189+
190+ http://launchpad.net/commiecc
191+
192+Upstream Author:
193+
194+ J. Félix Ontañón <felixonta@gmail.com>
195+
196+Copyright:
197+
198+ Copyright (C) 2009 J. Félix Ontañón
199+
200+License:
201+
202+ This program is free software: you can redistribute it and/or modify
203+ it under the terms of the GNU General Public License as published by
204+ the Free Software Foundation, either version 3 of the License, or
205+ (at your option) any later version.
206+
207+ This package is distributed in the hope that it will be useful,
208+ but WITHOUT ANY WARRANTY; without even the implied warranty of
209+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
210+ GNU General Public License for more details.
211+
212+ You should have received a copy of the GNU General Public License
213+ along with this program. If not, see <http://www.gnu.org/licenses/>.
214+
215+On Debian systems, the complete text of the GNU General
216+Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
217+
218+The Debian packaging is:
219+
220+ Copyright (C) 2009 J. Félix Ontañón <felixonta@gmail.com>
221+
222+and is licensed under the GPL version 3, see above.
223
224=== added file 'debian/dirs'
225--- debian/dirs 1970-01-01 00:00:00 +0000
226+++ debian/dirs 2009-12-07 13:50:25 +0000
227@@ -0,0 +1,2 @@
228+usr/bin
229+usr/sbin
230
231=== added file 'debian/docs'
232--- debian/docs 1970-01-01 00:00:00 +0000
233+++ debian/docs 2009-12-07 13:50:25 +0000
234@@ -0,0 +1,1 @@
235+README
236
237=== added file 'debian/pycompat'
238--- debian/pycompat 1970-01-01 00:00:00 +0000
239+++ debian/pycompat 2009-12-07 13:50:25 +0000
240@@ -0,0 +1,1 @@
241+2
242
243=== added file 'debian/rules'
244--- debian/rules 1970-01-01 00:00:00 +0000
245+++ debian/rules 2009-12-07 13:50:25 +0000
246@@ -0,0 +1,11 @@
247+#!/usr/bin/make -f
248+
249+DEB_PYTHON_SYSTEM=pysupport
250+
251+include /usr/share/cdbs/1/rules/debhelper.mk
252+include /usr/share/cdbs/1/class/python-distutils.mk
253+include /usr/share/cdbs/1/rules/simple-patchsys.mk
254+
255+# Add here any variable or target overrides you need.
256+
257+DEB_PYTHON_INSTALL_ARGS_ALL = --prefix=/usr

Subscribers

People subscribed via source and target branches

to all changes: