[mate-terminal] 01/01: Add 0001_mate-terminal-wrapper.patch.

[Martin Wimpress]

This is an automated email from the git hooks/post-receive script.

flexiondotorg-guest pushed a commit to branch master
in repository mate-terminal.

commit ecf20eedf18273dc513c9ef0c3c72bb92b4f8ed5
Author: Martin Wimpress <code at flexion.org>
Date:   Tue May 19 15:37:17 2015 +0100

    Add 0001_mate-terminal-wrapper.patch.
---
 debian/changelog                                |   8 ++
 debian/patches/0001_mate-terminal-wrapper.patch | 132 ++++++++++++++++++++++++
 debian/patches/series                           |   1 +
 3 files changed, 141 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index fd6b235..17fec43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mate-terminal (1.8.1+dfsg1-5) UNRELEASED; urgency=medium
+
+  * debian/patches:
+   + Add 0001_mate-terminal-wrapper.patch. Adds support for double quoted
+     strings. Adapted from gnome-terminal.wrapper. (Closes: #783000).
+
+ -- Martin Wimpress <code at flexion.org>  Tue, 19 May 2015 01:42:46 +0100
+
 mate-terminal (1.8.1+dfsg1-4) unstable; urgency=medium
 
   * debian/mate-terminal.{postinst,prerm):
diff --git a/debian/patches/0001_mate-terminal-wrapper.patch b/debian/patches/0001_mate-terminal-wrapper.patch
new file mode 100644
index 0000000..d2c39e1
--- /dev/null
+++ b/debian/patches/0001_mate-terminal-wrapper.patch
@@ -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 <code at flexion.org>
+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 <profile> 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', at args);
diff --git a/debian/patches/series b/debian/patches/series
index 150ef5e..44f5c00 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+0001_mate-terminal-wrapper.patch
 1001_add-keywords-to-desktop-files.patch
 1002_fix-occasional-segfaults-at-session-startup.patch
 2001_omit-gfdl-licensed-help-files.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/mate-terminal.git