Ubuntu
newt package

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

  1. Raring (13.04)
  2. lp1092117
  3. Merge into raring
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
=== modified file 'debian/changelog'
--- debian/changelog 2012-11-28 14:14:01 +0000
+++ debian/changelog 2012-12-23 13:27:26 +0000
@@ -1,3 +1,10 @@
1newt (0.52.14-11ubuntu5) raring; urgency=low
2
3 * Modified python3.patch (LP: #1092117).
4 - New snack.py depends on string modules.
5
6 -- Mitsuya Shibata <mty.shibata@gmail.com> Sun, 23 Dec 2012 17:52:33 +0900
7
1newt (0.52.14-11ubuntu4) raring; urgency=low8newt (0.52.14-11ubuntu4) raring; urgency=low
29
3 * Fix link target of libnewt.so to cope with move to /lib.10 * Fix link target of libnewt.so to cope with move to /lib.
411
=== modified file 'debian/patches/python3.patch'
--- debian/patches/python3.patch 2012-11-08 14:50:00 +0000
+++ debian/patches/python3.patch 2012-12-23 13:27:26 +0000
@@ -1,7 +1,7 @@
1Index: b/Makefile.in1Index: newt/Makefile.in
2===================================================================2===================================================================
3--- a/Makefile.in 2012-11-08 15:04:46.651999096 +00003--- newt.orig/Makefile.in 2012-12-23 17:44:17.187381000 +0900
4+++ b/Makefile.in 2012-11-08 15:05:29.931998376 +00004+++ newt/Makefile.in 2012-12-23 17:44:17.187381000 +0900
5@@ -12,7 +12,7 @@5@@ -12,7 +12,7 @@
6 TAG = r$(subst .,-,$(VERSION))6 TAG = r$(subst .,-,$(VERSION))
7 SONAME = @SONAME@7 SONAME = @SONAME@
@@ -56,10 +56,10 @@
56 install -m 644 snack.py $(instroot)/$(libdir)/$$ver/site-packages ;\56 install -m 644 snack.py $(instroot)/$(libdir)/$$ver/site-packages ;\
57 done || :57 done || :
58 58
59Index: b/peanuts.py59Index: newt/peanuts.py
60===================================================================60===================================================================
61--- a/peanuts.py 2011-12-02 12:59:49.000000000 +000061--- newt.orig/peanuts.py 2012-12-23 17:44:17.187381000 +0900
62+++ b/peanuts.py 2012-11-08 15:05:29.931998376 +000062+++ newt/peanuts.py 2012-12-23 17:44:17.187381000 +0900
63@@ -2,6 +2,7 @@63@@ -2,6 +2,7 @@
64 64
65 # Demo program to show use of python-newt module65 # Demo program to show use of python-newt module
@@ -82,10 +82,10 @@
82+print("rb:", rb.getSelection())82+print("rb:", rb.getSelection())
83+print("bb:", bb.buttonPressed(result))83+print("bb:", bb.buttonPressed(result))
84+print("checkboxtree:", ct.getSelection())84+print("checkboxtree:", ct.getSelection())
85Index: b/popcorn.py85Index: newt/popcorn.py
86===================================================================86===================================================================
87--- a/popcorn.py 2011-12-02 12:59:49.000000000 +000087--- newt.orig/popcorn.py 2012-12-23 17:44:17.187381000 +0900
88+++ b/popcorn.py 2012-11-08 15:05:29.935998375 +000088+++ newt/popcorn.py 2012-12-23 17:44:17.187381000 +0900
89@@ -1,5 +1,6 @@89@@ -1,5 +1,6 @@
90 #!/usr/bin/python90 #!/usr/bin/python
91 91
@@ -126,10 +126,10 @@
126+print('lbcw', lbcw)126+print('lbcw', lbcw)
127+print("ct selected", ct.getSelection())127+print("ct selected", ct.getSelection())
128+print("ct current", ct.getCurrent())128+print("ct current", ct.getCurrent())
129Index: b/snackmodule.c129Index: newt/snackmodule.c
130===================================================================130===================================================================
131--- a/snackmodule.c 2012-11-08 14:58:07.000000000 +0000131--- newt.orig/snackmodule.c 2012-12-23 17:44:17.187381000 +0900
132+++ b/snackmodule.c 2012-11-08 15:05:29.935998375 +0000132+++ newt/snackmodule.c 2012-12-23 17:44:17.187381000 +0900
133@@ -12,10 +12,24 @@133@@ -12,10 +12,24 @@
134 #include <unistd.h>134 #include <unistd.h>
135 135
@@ -425,11 +425,11 @@
425+425+
426+ return MOD_SUCCESS_VAL(m);426+ return MOD_SUCCESS_VAL(m);
427 }427 }
428Index: b/snack.py428Index: newt/snack.py
429===================================================================429===================================================================
430--- a/snack.py 2011-12-02 12:59:49.000000000 +0000430--- newt.orig/snack.py 2012-12-23 17:44:17.187381000 +0900
431+++ b/snack.py 2012-11-08 15:05:29.935998375 +0000431+++ newt/snack.py 2012-12-23 17:51:13.355976796 +0900
432@@ -39,9 +39,10 @@432@@ -39,9 +39,11 @@
433 - EntryWindow433 - EntryWindow
434 """434 """
435 435
@@ -437,12 +437,12 @@
437+from __future__ import absolute_import, print_function, unicode_literals437+from __future__ import absolute_import, print_function, unicode_literals
438 import _snack438 import _snack
439-import types439-import types
440-import string440 import string
441+import sys441+import sys
442 442
443 from _snack import FLAG_DISABLED, FLAGS_SET, FLAGS_RESET, FLAGS_TOGGLE, FD_READ, FD_WRITE, FD_EXCEPT443 from _snack import FLAG_DISABLED, FLAGS_SET, FLAGS_RESET, FLAGS_TOGGLE, FD_READ, FD_WRITE, FD_EXCEPT
444 444
445@@ -304,7 +305,7 @@445@@ -304,7 +306,7 @@
446 "INSERT": _snack.KEY_INSERT,446 "INSERT": _snack.KEY_INSERT,
447 " " : ord(" ") }447 " " : ord(" ") }
448 448
@@ -451,7 +451,7 @@
451 hotkeys[hotkeys[n]] = n451 hotkeys[hotkeys[n]] = n
452 for o,c in [ (ord(c),c) for c in string.ascii_letters+string.digits ]:452 for o,c in [ (ord(c),c) for c in string.ascii_letters+string.digits ]:
453 hotkeys[c] = o453 hotkeys[c] = o
454@@ -328,14 +329,14 @@454@@ -328,14 +330,14 @@
455 self.w.addhotkey(hotkeys[keyname])455 self.w.addhotkey(hotkeys[keyname])
456 456
457 def add(self, widget):457 def add(self, widget):
@@ -469,7 +469,7 @@
469 self.trans[widget.w.key] = widget469 self.trans[widget.w.key] = widget
470 return self.w.add(widget.w)470 return self.w.add(widget.w)
471 return None471 return None
472@@ -408,14 +409,14 @@472@@ -408,14 +410,14 @@
473 if (growy):473 if (growy):
474 gridFlags = gridFlags | _snack.GRID_GROWY474 gridFlags = gridFlags | _snack.GRID_GROWY
475 475
@@ -486,7 +486,7 @@
486 self.gridmembers = []486 self.gridmembers = []
487 487
488 colorsets = { "ROOT" : _snack.COLORSET_ROOT,488 colorsets = { "ROOT" : _snack.COLORSET_ROOT,
489@@ -481,7 +482,7 @@489@@ -481,7 +483,7 @@
490 490
491 def helpCallback(self, cb):491 def helpCallback(self, cb):
492 self.helpCb = cb492 self.helpCb = cb
@@ -495,7 +495,7 @@
495 495
496 def suspendCallback(self, cb, data = None):496 def suspendCallback(self, cb, data = None):
497 if data:497 if data:
498@@ -604,9 +605,9 @@498@@ -604,9 +606,9 @@
499 self.item = 0499 self.item = 0
500 Grid.__init__(self, len(buttonlist), 1)500 Grid.__init__(self, len(buttonlist), 1)
501 for blist in buttonlist:501 for blist in buttonlist:
@@ -507,7 +507,7 @@
507 elif len(blist) == 2:507 elif len(blist) == 2:
508 (title, value) = blist508 (title, value) = blist
509 else:509 else:
510@@ -622,7 +623,7 @@510@@ -622,7 +624,7 @@
511 self.item = self.item + 1511 self.item = self.item + 1
512 512
513 def buttonPressed(self, result): 513 def buttonPressed(self, result):
@@ -516,7 +516,7 @@
516 return self.hotkeys[result]516 return self.hotkeys[result]
517 517
518 for (button, value) in self.list:518 for (button, value) in self.list:
519@@ -657,7 +658,7 @@519@@ -657,7 +659,7 @@
520 self.form_created = 0520 self.form_created = 0
521 args = list(args)521 args = list(args)
522 args[:0] = [self]522 args[:0] = [self]
@@ -525,7 +525,7 @@
525 525
526 def add(self, widget, col, row, padding = (0, 0, 0, 0),526 def add(self, widget, col, row, padding = (0, 0, 0, 0),
527 anchorLeft = 0, anchorTop = 0, anchorRight = 0,527 anchorLeft = 0, anchorTop = 0, anchorRight = 0,
528@@ -713,7 +714,7 @@528@@ -713,7 +715,7 @@
529 """529 """
530 def __init__(self, screen, title, *args):530 def __init__(self, screen, title, *args):
531 myargs = (self, screen, title, None) + args531 myargs = (self, screen, title, None) + args
@@ -534,7 +534,7 @@
534 534
535 class CheckboxTree(Widget):535 class CheckboxTree(Widget):
536 """ CheckboxTree combo widget,536 """ CheckboxTree combo widget,
537@@ -788,7 +789,7 @@537@@ -788,7 +790,7 @@
538 l = Listbox(height, scroll = scroll, returnExit = 1)538 l = Listbox(height, scroll = scroll, returnExit = 1)
539 count = 0539 count = 0
540 for item in items:540 for item in items:
@@ -543,7 +543,7 @@
543 (text, key) = item543 (text, key) = item
544 else:544 else:
545 text = item545 text = item
546@@ -848,9 +849,9 @@546@@ -848,9 +850,9 @@
547 count = 0547 count = 0
548 entryList = []548 entryList = []
549 for n in prompts:549 for n in prompts:
550550
=== modified file 'snack.py'
--- snack.py 2012-11-08 14:50:00 +0000
+++ snack.py 2012-12-23 13:27:26 +0000
@@ -42,6 +42,7 @@
4242
43from __future__ import absolute_import, print_function, unicode_literals43from __future__ import absolute_import, print_function, unicode_literals
44import _snack44import _snack
45import string
45import sys46import sys
4647
47from _snack import FLAG_DISABLED, FLAGS_SET, FLAGS_RESET, FLAGS_TOGGLE, FD_READ, FD_WRITE, FD_EXCEPT48from _snack import FLAG_DISABLED, FLAGS_SET, FLAGS_RESET, FLAGS_TOGGLE, FD_READ, FD_WRITE, FD_EXCEPT

Subscribers

People subscribed via source and target branches