Merge lp:~cosmos-door/ubuntu/raring/newt/lp1092117 into lp:ubuntu/raring/newt

Proposed by Mitsuya Shibata
Status: Merged
Merged at revision: 52
Proposed branch: lp:~cosmos-door/ubuntu/raring/newt/lp1092117
Merge into: lp:ubuntu/raring/newt
Diff against target: 195 lines (+35/-27)
3 files modified
debian/changelog (+7/-0)
debian/patches/python3.patch (+27/-27)
snack.py (+1/-0)
To merge this branch: bzr merge lp:~cosmos-door/ubuntu/raring/newt/lp1092117
Reviewer Review Type Date Requested Status
Jamie Strandboge Approve
Ubuntu branches Pending
Review via email: mp+141183@code.launchpad.net

Description of the change

* Modified python3.patch (LP: #1092117).
  - New snack.py depends on string modules.

To post a comment you must log in.
Revision history for this message
Jamie Strandboge (jdstrand) wrote :

Thanks for your patch! ACK, merged and uploaded. :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-11-28 14:14:01 +0000
3+++ debian/changelog 2012-12-23 13:27:26 +0000
4@@ -1,3 +1,10 @@
5+newt (0.52.14-11ubuntu5) raring; urgency=low
6+
7+ * Modified python3.patch (LP: #1092117).
8+ - New snack.py depends on string modules.
9+
10+ -- Mitsuya Shibata <mty.shibata@gmail.com> Sun, 23 Dec 2012 17:52:33 +0900
11+
12 newt (0.52.14-11ubuntu4) raring; urgency=low
13
14 * Fix link target of libnewt.so to cope with move to /lib.
15
16=== modified file 'debian/patches/python3.patch'
17--- debian/patches/python3.patch 2012-11-08 14:50:00 +0000
18+++ debian/patches/python3.patch 2012-12-23 13:27:26 +0000
19@@ -1,7 +1,7 @@
20-Index: b/Makefile.in
21+Index: newt/Makefile.in
22 ===================================================================
23---- a/Makefile.in 2012-11-08 15:04:46.651999096 +0000
24-+++ b/Makefile.in 2012-11-08 15:05:29.931998376 +0000
25+--- newt.orig/Makefile.in 2012-12-23 17:44:17.187381000 +0900
26++++ newt/Makefile.in 2012-12-23 17:44:17.187381000 +0900
27 @@ -12,7 +12,7 @@
28 TAG = r$(subst .,-,$(VERSION))
29 SONAME = @SONAME@
30@@ -56,10 +56,10 @@
31 install -m 644 snack.py $(instroot)/$(libdir)/$$ver/site-packages ;\
32 done || :
33
34-Index: b/peanuts.py
35+Index: newt/peanuts.py
36 ===================================================================
37---- a/peanuts.py 2011-12-02 12:59:49.000000000 +0000
38-+++ b/peanuts.py 2012-11-08 15:05:29.931998376 +0000
39+--- newt.orig/peanuts.py 2012-12-23 17:44:17.187381000 +0900
40++++ newt/peanuts.py 2012-12-23 17:44:17.187381000 +0900
41 @@ -2,6 +2,7 @@
42
43 # Demo program to show use of python-newt module
44@@ -82,10 +82,10 @@
45 +print("rb:", rb.getSelection())
46 +print("bb:", bb.buttonPressed(result))
47 +print("checkboxtree:", ct.getSelection())
48-Index: b/popcorn.py
49+Index: newt/popcorn.py
50 ===================================================================
51---- a/popcorn.py 2011-12-02 12:59:49.000000000 +0000
52-+++ b/popcorn.py 2012-11-08 15:05:29.935998375 +0000
53+--- newt.orig/popcorn.py 2012-12-23 17:44:17.187381000 +0900
54++++ newt/popcorn.py 2012-12-23 17:44:17.187381000 +0900
55 @@ -1,5 +1,6 @@
56 #!/usr/bin/python
57
58@@ -126,10 +126,10 @@
59 +print('lbcw', lbcw)
60 +print("ct selected", ct.getSelection())
61 +print("ct current", ct.getCurrent())
62-Index: b/snackmodule.c
63+Index: newt/snackmodule.c
64 ===================================================================
65---- a/snackmodule.c 2012-11-08 14:58:07.000000000 +0000
66-+++ b/snackmodule.c 2012-11-08 15:05:29.935998375 +0000
67+--- newt.orig/snackmodule.c 2012-12-23 17:44:17.187381000 +0900
68++++ newt/snackmodule.c 2012-12-23 17:44:17.187381000 +0900
69 @@ -12,10 +12,24 @@
70 #include <unistd.h>
71
72@@ -425,11 +425,11 @@
73 +
74 + return MOD_SUCCESS_VAL(m);
75 }
76-Index: b/snack.py
77+Index: newt/snack.py
78 ===================================================================
79---- a/snack.py 2011-12-02 12:59:49.000000000 +0000
80-+++ b/snack.py 2012-11-08 15:05:29.935998375 +0000
81-@@ -39,9 +39,10 @@
82+--- newt.orig/snack.py 2012-12-23 17:44:17.187381000 +0900
83++++ newt/snack.py 2012-12-23 17:51:13.355976796 +0900
84+@@ -39,9 +39,11 @@
85 - EntryWindow
86 """
87
88@@ -437,12 +437,12 @@
89 +from __future__ import absolute_import, print_function, unicode_literals
90 import _snack
91 -import types
92--import string
93+ import string
94 +import sys
95
96 from _snack import FLAG_DISABLED, FLAGS_SET, FLAGS_RESET, FLAGS_TOGGLE, FD_READ, FD_WRITE, FD_EXCEPT
97
98-@@ -304,7 +305,7 @@
99+@@ -304,7 +306,7 @@
100 "INSERT": _snack.KEY_INSERT,
101 " " : ord(" ") }
102
103@@ -451,7 +451,7 @@
104 hotkeys[hotkeys[n]] = n
105 for o,c in [ (ord(c),c) for c in string.ascii_letters+string.digits ]:
106 hotkeys[c] = o
107-@@ -328,14 +329,14 @@
108+@@ -328,14 +330,14 @@
109 self.w.addhotkey(hotkeys[keyname])
110
111 def add(self, widget):
112@@ -469,7 +469,7 @@
113 self.trans[widget.w.key] = widget
114 return self.w.add(widget.w)
115 return None
116-@@ -408,14 +409,14 @@
117+@@ -408,14 +410,14 @@
118 if (growy):
119 gridFlags = gridFlags | _snack.GRID_GROWY
120
121@@ -486,7 +486,7 @@
122 self.gridmembers = []
123
124 colorsets = { "ROOT" : _snack.COLORSET_ROOT,
125-@@ -481,7 +482,7 @@
126+@@ -481,7 +483,7 @@
127
128 def helpCallback(self, cb):
129 self.helpCb = cb
130@@ -495,7 +495,7 @@
131
132 def suspendCallback(self, cb, data = None):
133 if data:
134-@@ -604,9 +605,9 @@
135+@@ -604,9 +606,9 @@
136 self.item = 0
137 Grid.__init__(self, len(buttonlist), 1)
138 for blist in buttonlist:
139@@ -507,7 +507,7 @@
140 elif len(blist) == 2:
141 (title, value) = blist
142 else:
143-@@ -622,7 +623,7 @@
144+@@ -622,7 +624,7 @@
145 self.item = self.item + 1
146
147 def buttonPressed(self, result):
148@@ -516,7 +516,7 @@
149 return self.hotkeys[result]
150
151 for (button, value) in self.list:
152-@@ -657,7 +658,7 @@
153+@@ -657,7 +659,7 @@
154 self.form_created = 0
155 args = list(args)
156 args[:0] = [self]
157@@ -525,7 +525,7 @@
158
159 def add(self, widget, col, row, padding = (0, 0, 0, 0),
160 anchorLeft = 0, anchorTop = 0, anchorRight = 0,
161-@@ -713,7 +714,7 @@
162+@@ -713,7 +715,7 @@
163 """
164 def __init__(self, screen, title, *args):
165 myargs = (self, screen, title, None) + args
166@@ -534,7 +534,7 @@
167
168 class CheckboxTree(Widget):
169 """ CheckboxTree combo widget,
170-@@ -788,7 +789,7 @@
171+@@ -788,7 +790,7 @@
172 l = Listbox(height, scroll = scroll, returnExit = 1)
173 count = 0
174 for item in items:
175@@ -543,7 +543,7 @@
176 (text, key) = item
177 else:
178 text = item
179-@@ -848,9 +849,9 @@
180+@@ -848,9 +850,9 @@
181 count = 0
182 entryList = []
183 for n in prompts:
184
185=== modified file 'snack.py'
186--- snack.py 2012-11-08 14:50:00 +0000
187+++ snack.py 2012-12-23 13:27:26 +0000
188@@ -42,6 +42,7 @@
189
190 from __future__ import absolute_import, print_function, unicode_literals
191 import _snack
192+import string
193 import sys
194
195 from _snack import FLAG_DISABLED, FLAGS_SET, FLAGS_RESET, FLAGS_TOGGLE, FD_READ, FD_WRITE, FD_EXCEPT

Subscribers

People subscribed via source and target branches