[SCM] laditools/master: Drop patches as they've been applied upstream

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Sun Sep 13 23:26:49 UTC 2015


The following commit has been merged in the master branch:
commit 65751f03dd78d01632486fd8cf640303df34a488
Author: Alessio Treglia <alessio.treglia at smartodds.co.uk>
Date:   Sun Sep 13 22:45:21 2015 +0100

    Drop patches as they've been applied upstream

diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index fdd4a9b..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-vte-feed
diff --git a/debian/patches/vte-feed b/debian/patches/vte-feed
deleted file mode 100644
index d7b095e..0000000
--- a/debian/patches/vte-feed
+++ /dev/null
@@ -1,24 +0,0 @@
-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



More information about the pkg-multimedia-commits mailing list