[SCM] laditools/master: Apply patches from Ubuntu

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9c02c41c6242e3b04a6e4759bbe5fcc837d6dd82
Author: Sebastian Ramacher <sebastian at ramacher.at>
Date:   Mon Sep 7 20:30:02 2015 +0200

    Apply patches from Ubuntu
    
    Closes: #770076, #788033

diff --git a/debian/control b/debian/control
index 33467f2..384fb3c 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/laditools.git
 Package: laditools
 Architecture: all
 Depends:
- gir1.2-vte-2.90,
+ gir1.2-vte-2.91,
  python-gi,
  python-gi-cairo,
  python-laditools,
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..fdd4a9b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+vte-feed
diff --git a/debian/patches/vte-feed b/debian/patches/vte-feed
new file mode 100644
index 0000000..d7b095e
--- /dev/null
+++ b/debian/patches/vte-feed
@@ -0,0 +1,24 @@
+Description: feed() only takes one parameter
+Author: Iain Lane <iain.lane at canonical.com>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=770076
+
+--- laditools-1.0.1.orig/ladi-system-log
++++ laditools-1.0.1/ladi-system-log
+@@ -160,7 +160,7 @@ class LadiSystemLog(LadiApp):
+                 lines = read_last(log['log_file'], self.max_lines)
+                 for line in lines:
+                     line = line.strip('\r\n') + '\r\n'
+-                    log["term"].feed(line, -1)
++                    log["term"].feed(line)
+             except ValueError:
+                 sys.stderr.write( _("You called Popen with invalid arguments... dumbass\n") )
+             except:
+@@ -175,7 +175,7 @@ class LadiSystemLog(LadiApp):
+         for log in self.log_files:
+             line = log['log_file'].readline()
+             while line:
+-                log["term"].feed(line + '\r', -1)
++                log["term"].feed(line + '\r')
+                 line = log['log_file'].readline()
+             log['log_file'].seek(log['log_file'].tell())
+         return True

-- 
laditools packaging