diff -Nru sushi-1.4.0+git20160822+dfsg/debian/changelog sushi-1.4.0+git20160822+dfsg/debian/changelog --- sushi-1.4.0+git20160822+dfsg/debian/changelog 2016-08-22 21:36:52.000000000 +0200 +++ sushi-1.4.0+git20160822+dfsg/debian/changelog 2017-03-20 23:22:18.000000000 +0100 @@ -1,3 +1,31 @@ +sushi (1.4.0+git20160822+dfsg-4) unstable; urgency=medium + + * Revert following change introduced in 1.4.0+git20160822+dfsg-3, it + it not suitable during the freeze: + Fix package-uses-deprecated-debhelper-compat-version lintian warning + switching to debhelper 9. + + -- Devid Antonio Filoni Mon, 20 Mar 2017 23:20:23 +0100 + +sushi (1.4.0+git20160822+dfsg-3) unstable; urgency=medium + + * Fix FTBFS with bash as /bin/sh (Closes: #857772) + Thanks to Chris Lamb for fixing this. + * Fix package-uses-deprecated-debhelper-compat-version lintian warning + switching to debhelper 9. + * Fix empty-binary-package lintian warning + Thanks to Adrian Vondendriesch for fixing this. + * debian/control: both tekka and nigiri are now sushi deps (Closes: #836195) + * Fix spelling-error-in-description-synopsis lintian warning. + * Fix nigiri crashes: + - debian/patches/nigiri-00-fix-gobject-import.diff: fix GObject ImportError + - debian/patches/nigiri-01-fix-urwid-indexerror.diff: fix urwid + 'IndexError: No widget at position 1' error + - debian/patches/nigiri-02-none-has-no-auto_scroll.diff: fix AttributeError + * debian/control: remove DM-Upload-Allowed field. + + -- Devid Antonio Filoni Sat, 18 Mar 2017 16:08:30 +0100 + sushi (1.4.0+git20160822+dfsg-1) unstable; urgency=medium * New upstream git tarball (Closes: #811889) diff -Nru sushi-1.4.0+git20160822+dfsg/debian/control sushi-1.4.0+git20160822+dfsg/debian/control --- sushi-1.4.0+git20160822+dfsg/debian/control 2016-08-22 21:36:52.000000000 +0200 +++ sushi-1.4.0+git20160822+dfsg/debian/control 2017-03-20 23:23:24.000000000 +0100 @@ -5,20 +5,19 @@ Build-Depends: debhelper (>= 7.0.50~), python, dh-python, libdbus-1-dev, intltool, libglib2.0-dev (>= 2.40), libnice-dev, libminiupnpc-dev (>= 1.5), libgupnp-igd-1.0-dev -DM-Upload-Allowed: yes Standards-Version: 3.9.8 Homepage: https://github.com/sushi-irc Package: sushi Architecture: all -Depends: maki, tekka | nigiri, ${misc:Depends} -Description: D-Bus-based IRC suite (suite) +Depends: maki, tekka, nigiri, ${misc:Depends} +Description: D-Bus-based IRC suite (metapackage) The sushi IRC suite consists of a central daemon and several clients, which communicate via DBus. DBus methods and signals are provided by the daemon to abstract the IRC protocol. Clients can use these methods and signals to easily interact with IRC. . - This virtual package provides the full suite. + This metapackage provides the full suite. Package: maki Architecture: any diff -Nru sushi-1.4.0+git20160822+dfsg/debian/patches/nigiri-00-fix-gobject-import.diff sushi-1.4.0+git20160822+dfsg/debian/patches/nigiri-00-fix-gobject-import.diff --- sushi-1.4.0+git20160822+dfsg/debian/patches/nigiri-00-fix-gobject-import.diff 1970-01-01 01:00:00.000000000 +0100 +++ sushi-1.4.0+git20160822+dfsg/debian/patches/nigiri-00-fix-gobject-import.diff 2017-03-18 16:42:10.000000000 +0100 @@ -0,0 +1,42 @@ +# Description: fix following ImportError error: +# ImportError: When using gi.repository you must not import static modules +# like "gobject". Please change all occurrences of "import gobject" to +# "from gi.repository import GObject". +# See: https://bugzilla.gnome.org/show_bug.cgi?id=709183 +# Author: Devid Antonio Filoni +# Last-Update: 2017-03-18 +Index: sushi-1.4.0+git20160822+dfsg/nigiri/main.py.in +=================================================================== +--- sushi-1.4.0+git20160822+dfsg.orig/nigiri/main.py.in ++++ sushi-1.4.0+git20160822+dfsg/nigiri/main.py.in +@@ -32,7 +32,7 @@ import sys + import traceback + + import glib +-import gobject ++from gi.repository import GObject + + try: + import urwid +@@ -44,7 +44,7 @@ except ImportError, e: + from urwid import MetaSignals + + try: +- import gobject ++ from gi.repository import GObject + except ImportError: + print >> sys.stderr, "You need python-gobject installed." + sys.exit(1) +Index: sushi-1.4.0+git20160822+dfsg/nigiri/plugin_control.py +=================================================================== +--- sushi-1.4.0+git20160822+dfsg.orig/nigiri/plugin_control.py ++++ sushi-1.4.0+git20160822+dfsg/nigiri/plugin_control.py +@@ -38,7 +38,7 @@ unload(filename) + -> del plugins[filename] + """ + +-import gobject ++from gi.repository import GObject + import os + import imp + import sys diff -Nru sushi-1.4.0+git20160822+dfsg/debian/patches/nigiri-01-fix-urwid-indexerror.diff sushi-1.4.0+git20160822+dfsg/debian/patches/nigiri-01-fix-urwid-indexerror.diff --- sushi-1.4.0+git20160822+dfsg/debian/patches/nigiri-01-fix-urwid-indexerror.diff 1970-01-01 01:00:00.000000000 +0100 +++ sushi-1.4.0+git20160822+dfsg/debian/patches/nigiri-01-fix-urwid-indexerror.diff 2017-03-18 16:43:12.000000000 +0100 @@ -0,0 +1,16 @@ +# Description: fix following IndexError error: +# IndexError: No widget at position 1 +# Last-Update: 2017-03-18 +Index: sushi-1.4.0+git20160822+dfsg/nigiri/extends/ListBox.py +=================================================================== +--- sushi-1.4.0+git20160822+dfsg.orig/nigiri/extends/ListBox.py ++++ sushi-1.4.0+git20160822+dfsg/nigiri/extends/ListBox.py +@@ -71,7 +71,7 @@ class ExtendedListBox(urwid.ListBox): + + if self.auto_scroll: + # at bottom -> scroll down +- self.set_focus(len(self.body)) ++ self.set_focus(len(self.body)-1) + + + diff -Nru sushi-1.4.0+git20160822+dfsg/debian/patches/nigiri-02-none-has-no-auto_scroll.diff sushi-1.4.0+git20160822+dfsg/debian/patches/nigiri-02-none-has-no-auto_scroll.diff --- sushi-1.4.0+git20160822+dfsg/debian/patches/nigiri-02-none-has-no-auto_scroll.diff 1970-01-01 01:00:00.000000000 +0100 +++ sushi-1.4.0+git20160822+dfsg/debian/patches/nigiri-02-none-has-no-auto_scroll.diff 2017-03-18 16:43:40.000000000 +0100 @@ -0,0 +1,17 @@ +# Description: fix following AttributeError error: +# AttributeError: 'NoneType' object has no attribute 'auto_scroll' +# Last-Update: 2017-03-18 +Index: sushi-1.4.0+git20160822+dfsg/nigiri/main.py.in +=================================================================== +--- sushi-1.4.0+git20160822+dfsg.orig/nigiri/main.py.in ++++ sushi-1.4.0+git20160822+dfsg/nigiri/main.py.in +@@ -632,7 +632,8 @@ class MainWindow(object): + # Signal handlers + + def handle_body_auto_scroll(self, switch): +- self.current_tab.auto_scroll = switch ++ if self.current_tab: ++ self.current_tab.auto_scroll = switch + + def handle_server_remove(self, server): + self.remove_server(server) diff -Nru sushi-1.4.0+git20160822+dfsg/debian/patches/series sushi-1.4.0+git20160822+dfsg/debian/patches/series --- sushi-1.4.0+git20160822+dfsg/debian/patches/series 2016-08-22 21:36:52.000000000 +0200 +++ sushi-1.4.0+git20160822+dfsg/debian/patches/series 2017-03-18 16:37:47.000000000 +0100 @@ -1 +1,4 @@ maki-revert-3bb2b23.diff +nigiri-00-fix-gobject-import.diff +nigiri-01-fix-urwid-indexerror.diff +nigiri-02-none-has-no-auto_scroll.diff diff -Nru sushi-1.4.0+git20160822+dfsg/debian/rules sushi-1.4.0+git20160822+dfsg/debian/rules --- sushi-1.4.0+git20160822+dfsg/debian/rules 2016-08-22 21:36:52.000000000 +0200 +++ sushi-1.4.0+git20160822+dfsg/debian/rules 2017-03-18 16:56:26.000000000 +0100 @@ -29,7 +29,7 @@ cd maki && env LINKFLAGS='$(LDFLAGS)' $(WAF) configure --prefix /usr cd nigiri && env LINKFLAGS='$(LDFLAGS)' $(WAF) configure --prefix /usr cd tekka && env LINKFLAGS='$(LDFLAGS)' $(WAF) configure --prefix /usr - cd chirashi env LINKFLAGS='$(LDFLAGS)' && $(WAF) configure --prefix /usr + cd chirashi && env LINKFLAGS='$(LDFLAGS)' $(WAF) configure --prefix /usr override_dh_auto_build: cd maki && $(WAF) build