diff -Nru powerline-2.5/debian/changelog powerline-2.5/debian/changelog
--- powerline-2.5/debian/changelog	2017-01-24 14:47:26.000000000 +0000
+++ powerline-2.5/debian/changelog	2017-11-09 17:15:00.000000000 +0000
@@ -1,3 +1,10 @@
+powerline (2.5-1.1ubuntu0) artful; urgency=medium
+
+  * bindings_fish_function_on-variable.patch: fix Fish function name/arguments
+    order (LP: #1728441)
+
+ -- Tj <ubuntu@iam.tj>  Wed, 09 Nov 2017 17:15:00 +0000
+
 powerline (2.5-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru powerline-2.5/debian/control powerline-2.5/debian/control
--- powerline-2.5/debian/control	2017-01-24 14:44:06.000000000 +0000
+++ powerline-2.5/debian/control	2017-11-09 17:15:00.000000000 +0000
@@ -1,7 +1,8 @@
 Source: powerline
 Section: shells
 Priority: optional
-Maintainer: Jerome Charaoui <jerome@riseup.net>
+XSBC-Original-Maintainer: Jerome Charaoui <jerome@riseup.net>
+Maintainer: Tj <ubuntu@iam.tj>
 Build-Depends: debhelper (>= 9), dh-python, python-all (>= 2.7), python-setuptools, python-sphinx, python-psutil, python3-all, python3-setuptools, python3-sphinx, python3-psutil
 Standards-Version: 3.9.8
 Homepage: https://github.com/Lokaltog/powerline
diff -Nru powerline-2.5/debian/patches/bindings_fish_function_on-variable.patch powerline-2.5/debian/patches/bindings_fish_function_on-variable.patch
--- powerline-2.5/debian/patches/bindings_fish_function_on-variable.patch	1970-01-01 00:00:00.000000000 +0000
+++ powerline-2.5/debian/patches/bindings_fish_function_on-variable.patch	2017-11-09 17:15:00.000000000 +0000
@@ -0,0 +1,52 @@
+commit 21ea62db56eaec619374e83e28458a86303d58de
+Author: Foo <kp-pav@yandex.ru>
+Date:   Wed Dec 14 22:24:25 2016 +0300
+
+    Move -- function command arguments after function name
+    
+    Fish 2.4.0-231-gd885f00 cannot handle current variant and fish 2.2.0 is still
+    fine with new variant.
+
+Index: powerline-2.5/powerline/bindings/fish/powerline-setup.fish
+===================================================================
+--- powerline-2.5.orig/powerline/bindings/fish/powerline-setup.fish
++++ powerline-2.5/powerline/bindings/fish/powerline-setup.fish
+@@ -33,14 +33,14 @@ function powerline-setup
+ 		if test -z "$POWERLINE_COMMAND"
+ 			set -g POWERLINE_COMMAND (env $POWERLINE_CONFIG_COMMAND shell command)
+ 		end
+-		function --on-variable fish_key_bindings _powerline_set_default_mode
++		function _powerline_set_default_mode --on-variable fish_key_bindings
+ 			if test x$fish_key_bindings != xfish_vi_key_bindings
+ 				set -g _POWERLINE_DEFAULT_MODE default
+ 			else
+ 				set -g -e _POWERLINE_DEFAULT_MODE
+ 			end
+ 		end
+-		function --on-variable POWERLINE_COMMAND _powerline_update
++		function _powerline_update --on-variable POWERLINE_COMMAND
+ 			set -l addargs "--last-exit-code=\$status"
+ 			set -l addargs "$addargs --last-pipe-status=\$status"
+ 			set -l addargs "$addargs --jobnum=(jobs -p | wc -l)"
+@@ -70,7 +70,7 @@ function powerline-setup
+ 				env \$POWERLINE_COMMAND $POWERLINE_COMMAND_ARGS shell right $addargs
+ 				$rpromptpast
+ 			end
+-			function --on-signal WINCH _powerline_set_columns
++			function _powerline_set_columns --on-signal WINCH
+ 				set -g _POWERLINE_COLUMNS $columnsexpr
+ 			end
+ 			"
+@@ -86,10 +86,10 @@ function powerline-setup
+ 					tmux setenv -g TMUX_$argv[1]_(tmux display -p "#D" | tr -d "%") "$argv[2]"
+ 					tmux refresh -S
+ 				end
+-				function --on-variable PWD _powerline_tmux_set_pwd
++				function _powerline_tmux_set_pwd --on-variable PWD
+ 					_powerline_tmux_setenv PWD "$PWD"
+ 				end
+-				function --on-signal WINCH _powerline_tmux_set_columns
++				function _powerline_tmux_set_columns --on-signal WINCH
+ 					_powerline_tmux_setenv COLUMNS (_powerline_columns)
+ 				end
+ 				_powerline_tmux_set_columns
diff -Nru powerline-2.5/debian/patches/series powerline-2.5/debian/patches/series
--- powerline-2.5/debian/patches/series	2017-01-24 14:39:21.000000000 +0000
+++ powerline-2.5/debian/patches/series	2017-11-09 17:15:00.000000000 +0000
@@ -1,3 +1,4 @@
 bindings_path.patch
 config_files_path.patch
 add_powerline_compile_flags.patch
+bindings_fish_function_on-variable.patch