Lernid

Merge lp:~dholbach/lernid/small-fixes into lp:lernid

  1. small-fixes
  2. Merge into trunk
Proposed by Daniel Holbach
Status: Merged
Merged at revision: not available
Proposed branch: lp:~dholbach/lernid/small-fixes
Merge into: lp:lernid
Diff against target: 97 lines (+6/-13)
6 files modified
debian/control (+3/-3)
debian/rules (+3/-0)
lernid/AboutLernidDialog.py (+0/-1)
lernid/ConnectDialog.py (+0/-2)
lernid/IrcBackend.py (+0/-6)
lernid/PreferencesLernidDialog.py (+0/-1)
To merge this branch: bzr merge lp:~dholbach/lernid/small-fixes
Reviewer Review Type Date Requested Status
Jono Bacon Pending
Review via email: mp+16188@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2009-12-10 17:00:30 +0000
3+++ debian/control 2009-12-15 12:34:20 +0000
4@@ -5,9 +5,9 @@
5 debhelper (>= 6),
6 python,
7 python-central (>= 0.6.11),
8- python-distutils-extra (>= 2.10)
9+Build-Depends-Indep: python-distutils-extra (>= 2.10)
10 Maintainer: Jono Bacon <jono@ubuntu.com>
11-Standards-Version: 3.8.2
12+Standards-Version: 3.8.3
13 XS-Python-Version: current
14
15 Package: lernid
16@@ -24,6 +24,6 @@
17 python-notify,
18 python-vobject,
19 python-gtk2
20-Description: Connect to Ubuntu learning events.
21+Description: Connect to Ubuntu learning events
22 Lernid provides an interface for joining in Ubuntu learning events such
23 as Ubuntu Open Week and Ubuntu Developer Week.
24
25=== modified file 'debian/rules'
26--- debian/rules 2009-11-25 04:40:10 +0000
27+++ debian/rules 2009-12-15 12:34:20 +0000
28@@ -5,3 +5,6 @@
29 include /usr/share/cdbs/1/rules/debhelper.mk
30 include /usr/share/cdbs/1/class/python-distutils.mk
31 include /usr/share/cdbs/1/rules/langpack.mk
32+
33+binary-fixup/lernid::
34+ find debian/lernid/usr/share/ -type d -empty -delete
35
36=== modified file 'lernid/AboutLernidDialog.py'
37--- lernid/AboutLernidDialog.py 2009-11-25 03:36:51 +0000
38+++ lernid/AboutLernidDialog.py 2009-12-15 12:34:20 +0000
39@@ -14,7 +14,6 @@
40 #with this program. If not, see <http://www.gnu.org/licenses/>.
41 ### END LICENSE
42
43-import sys
44 import os
45 import gtk
46
47
48=== modified file 'lernid/ConnectDialog.py'
49--- lernid/ConnectDialog.py 2009-11-30 17:55:18 +0000
50+++ lernid/ConnectDialog.py 2009-12-15 12:34:20 +0000
51@@ -14,9 +14,7 @@
52 #with this program. If not, see <http://www.gnu.org/licenses/>.
53 ### END LICENSE
54
55-import sys
56 import os
57-import shutil
58 import gtk
59 import ConfigParser
60 import gobject
61
62=== modified file 'lernid/IrcBackend.py'
63--- lernid/IrcBackend.py 2009-12-01 08:34:41 +0000
64+++ lernid/IrcBackend.py 2009-12-15 12:34:20 +0000
65@@ -15,11 +15,7 @@
66 #with this program. If not, see <http://www.gnu.org/licenses/>.
67 ### END LICENSE
68
69-import sys
70 import os
71-import gtk
72-import gtkmozembed
73-import gobject
74 import xdg.BaseDirectory
75 import dbus.mainloop.glib
76 dbus.mainloop.glib.DBusGMainLoop(set_as_default = True)
77@@ -30,8 +26,6 @@
78
79 import logging
80
81-import gio
82-
83 DBUS_PROPERTIES = dbus.PROPERTIES_IFACE
84
85 def ignore(*args): pass
86
87=== modified file 'lernid/PreferencesLernidDialog.py'
88--- lernid/PreferencesLernidDialog.py 2009-11-25 03:36:51 +0000
89+++ lernid/PreferencesLernidDialog.py 2009-12-15 12:34:20 +0000
90@@ -14,7 +14,6 @@
91 #with this program. If not, see <http://www.gnu.org/licenses/>.
92 ### END LICENSE
93
94-import sys
95 import os
96 import gtk
97 from desktopcouch.records.server import CouchDatabase

Subscribers

People subscribed via source and target branches