diff -Nru mate-terminal-1.8.1+dfsg1/debian/changelog mate-terminal-1.8.1+dfsg1/debian/changelog --- mate-terminal-1.8.1+dfsg1/debian/changelog 2015-01-06 09:19:42.000000000 +0000 +++ mate-terminal-1.8.1+dfsg1/debian/changelog 2015-04-21 14:20:36.000000000 +0000 @@ -1,3 +1,11 @@ +mate-terminal (1.8.1+dfsg1-4ubuntu1) vivid; urgency=medium + + * debian/patches: + + Add 0001_mate-terminal-wrapper.patch. Adds support for double quoted + strings. Adapted from gnome-terminal.wrapper. (LP: #1445198). + + -- Martin Wimpress Tue, 21 Apr 2015 01:42:46 +0100 + mate-terminal (1.8.1+dfsg1-4) unstable; urgency=medium * debian/mate-terminal.{postinst,prerm): diff -Nru mate-terminal-1.8.1+dfsg1/debian/control mate-terminal-1.8.1+dfsg1/debian/control --- mate-terminal-1.8.1+dfsg1/debian/control 2015-01-06 09:18:40.000000000 +0000 +++ mate-terminal-1.8.1+dfsg1/debian/control 2015-04-21 14:20:56.000000000 +0000 @@ -1,7 +1,8 @@ Source: mate-terminal Section: x11 Priority: optional -Maintainer: MATE Packaging Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: MATE Packaging Team Uploaders: John Paul Adrian Glaubitz , Stefano Karapetsas , Mike Gabriel , diff -Nru mate-terminal-1.8.1+dfsg1/debian/patches/0001_mate-terminal-wrapper.patch mate-terminal-1.8.1+dfsg1/debian/patches/0001_mate-terminal-wrapper.patch --- mate-terminal-1.8.1+dfsg1/debian/patches/0001_mate-terminal-wrapper.patch 1970-01-01 00:00:00.000000000 +0000 +++ mate-terminal-1.8.1+dfsg1/debian/patches/0001_mate-terminal-wrapper.patch 2015-04-21 14:20:36.000000000 +0000 @@ -0,0 +1,132 @@ +Description: Adds support for double quoted strings. + Add 0001_mate-terminal-wrapper.patch, adapted from gnome-termnal.wrapper, + that adds support for double quoted strings. (Closes LP: #1445198). +Author: Martin Wimpress +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1445198 + +--- mate-terminal-1.8.1+dfsg1.orig/mate-terminal.wrapper ++++ mate-terminal-1.8.1+dfsg1/mate-terminal.wrapper +@@ -1,44 +1,81 @@ +-#!/usr/bin/env python ++#!/usr/bin/perl -w + +-import sys +-import os +-import subprocess ++my $login=0; + +-newargs = ['mate-terminal'] +-oldargs = sys.argv[1:] +- +-while True: +- try: +- arg = oldargs.pop(0) +- +- if arg == '-display': +- os.environ['DISPLAY'] = oldargs.pop(0) +- elif arg == '-name': +- newargs.append('--window-with-profile=' + oldargs.pop(0)) +- elif arg == '-n': +- sys.stderr.write('Set an icon in your profile') +- elif arg == '-T' or arg == '-title': +- newargs.append('-t') +- newargs.append(oldargs.pop(0)) +- elif arg == '-ls' or arg == '+ls': +- sys.stderr.write('Login shell not supported. Set in your profile.') +- elif arg == '-geometry': +- newargs.append('--geometry=' + oldargs.pop(0)) +- elif arg == '-fn': +- newargs.append('--font=' + oldargs.pop(0)) +- elif arg == '-fg': +- newargs.append('--foreground=' + oldargs.pop(0)) +- elif arg == '-bg': +- newargs.append('--background=' + oldargs.pop(0)) +- elif arg == '-tn': +- newargs.append('--termname=' + oldargs.pop(0)) +- elif arg == '-h' or arg == '--help': +- newargs.append('--help') +- elif arg == '-e': +- newargs.append('-x') +- newargs += oldargs +- break +- except IndexError: +- break +- +-subprocess.call(newargs) ++while ($opt = shift(@ARGV)) ++{ ++ if ($opt eq '-display') ++ { ++ $ENV{'DISPLAY'} = shift(@ARGV); ++ } ++ elsif ($opt eq '-name') ++ { ++ $arg = shift(@ARGV); ++ push(@args, "--window-with-profile=$arg"); ++ } ++ elsif ($opt eq '-n') ++ { ++ # Accept but ignore ++ print STDERR "$0: to set an icon, please use -name and set a profile icon\n" ++ } ++ elsif ($opt eq '-T' || $opt eq '-title') ++ { ++ push(@args, '-t', shift(@ARGV)); ++ } ++ elsif ($opt eq '-ls') ++ { ++ $login = 1; ++ } ++ elsif ($opt eq '+ls') ++ { ++ $login = 0; ++ } ++ elsif ($opt eq '-geometry') ++ { ++ $arg = shift(@ARGV); ++ push(@args, "--geometry=$arg"); ++ } ++ elsif ($opt eq '-fn') ++ { ++ $arg = shift(@ARGV); ++ push(@args, "--font=$arg"); ++ } ++ elsif ($opt eq '-fg') ++ { ++ $arg = shift(@ARGV); ++ push(@args, "--foreground=$arg"); ++ } ++ elsif ($opt eq '-bg') ++ { ++ $arg = shift(@ARGV); ++ push(@args, "--background=$arg"); ++ } ++ elsif ($opt eq '-tn') ++ { ++ $arg = shift(@ARGV); ++ push(@args, "--termname=$arg"); ++ } ++ elsif ($opt eq '-e') ++ { ++ $arg = shift(@ARGV); ++ if (@ARGV) ++ { ++ push(@args, '-x', $arg, @ARGV); ++ last; ++ } ++ else ++ { ++ push(@args, '-e', $arg); ++ } ++ last; ++ } ++ elsif ($opt eq '-h' || $opt eq '--help') ++ { ++ push(@args, '--help'); ++ } ++} ++if ($login == 1) ++{ ++ @args = ('--login', @args); ++} ++exec('mate-terminal',@args); diff -Nru mate-terminal-1.8.1+dfsg1/debian/patches/1002_fix-occasional-segfaults-at-session-startup.patch mate-terminal-1.8.1+dfsg1/debian/patches/1002_fix-occasional-segfaults-at-session-startup.patch --- mate-terminal-1.8.1+dfsg1/debian/patches/1002_fix-occasional-segfaults-at-session-startup.patch 2014-11-30 19:20:32.000000000 +0000 +++ mate-terminal-1.8.1+dfsg1/debian/patches/1002_fix-occasional-segfaults-at-session-startup.patch 2015-04-21 14:20:04.000000000 +0000 @@ -30,3 +30,4 @@ + } return ret; } + diff -Nru mate-terminal-1.8.1+dfsg1/debian/patches/series mate-terminal-1.8.1+dfsg1/debian/patches/series --- mate-terminal-1.8.1+dfsg1/debian/patches/series 2014-11-30 19:21:29.000000000 +0000 +++ mate-terminal-1.8.1+dfsg1/debian/patches/series 2015-04-21 14:20:36.000000000 +0000 @@ -1,3 +1,4 @@ 1001_add-keywords-to-desktop-files.patch 1002_fix-occasional-segfaults-at-session-startup.patch 2001_omit-gfdl-licensed-help-files.patch +0001_mate-terminal-wrapper.patch