=== modified file 'debian/rules' --- debian/rules 2009-11-01 00:10:28 +0000 +++ debian/rules 2009-11-11 00:25:22 +0000 @@ -15,15 +15,18 @@ # This has to be exported to make some magic below work. export DH_OPTIONS -# -pie is broken on the mips and mipsel architectures, see +# -pie was broken briefly on the mips and mipsel architectures, see # -ifneq (,$(findstring :$(DEB_HOST_ARCH):,:mips:mipsel:)) - BROKEN_PIE := yes - export BROKEN_PIE -endif -ifneq (,$(findstring :$(DEB_BUILD_ARCH):,:mips:mipsel:)) - BROKEN_PIE := yes - export BROKEN_PIE +BINUTILS_V := $(shell dpkg-query --showformat='$${Version}' \ + --show binutils) +ifeq (yes,$(shell dpkg --compare-versions $(BINUTILS_V) lt 2.20-3 \ + && dpkg --compare-versions $(BINUTILS_V) ge 2.19.1-1 \ + && echo yes)) + ifneq (,$(strip $(findstring :$(DEB_HOST_ARCH):,:mips:mipsel:) \ + $(findstring :$(DEB_BUILD_ARCH):,:mips:mipsel:))) + BROKEN_PIE := yes + export BROKEN_PIE + endif endif configure: configure-stamp === modified file 'mandos-monitor' --- mandos-monitor 2009-11-10 03:45:18 +0000 +++ mandos-monitor 2009-11-11 00:25:22 +0000 @@ -150,7 +150,7 @@ self.proxy.Enable() elif key == u"d" or key == u"-": self.proxy.Disable() - elif key == u"r" or key == u"_": + elif key == u"r" or key == u"_" or key == u"ctrl k": self.server_proxy_object.RemoveClient(self.proxy .object_path) elif key == u"s": @@ -223,8 +223,8 @@ )) if urwid.supports_unicode(): - #self.divider = u"─" # \u2500 - self.divider = u"━" # \u2501 + self.divider = u"─" # \u2500 + #self.divider = u"━" # \u2501 else: #self.divider = u"-" # \u002d self.divider = u"_" # \u005f @@ -313,6 +313,8 @@ if (self.max_log_length and len(self.log) > self.max_log_length): del self.log[0:len(self.log)-self.max_log_length-1] + self.logbox.set_focus(len(self.logbox.body.contents), + coming_from=u"above") def toggle_log_display(self): """Toggle visibility of the log buffer.""" @@ -429,7 +431,7 @@ elif key == u"w" or key == u"i": self.change_log_display() self.refresh() - elif key == u"?" or key == u"f1": + elif key == u"?" or key == u"f1" or key == u"esc": if not self.log_visible: self.log_visible = True self.rebuild()