~ubuntu-branches/ubuntu/oneiric/bzrtools/oneiric

« back to all changes in this revision

Viewing changes to debian/patches/debian-changes-2.3.0-1

  • Committer: Bazaar Package Importer
  • Author(s): Jelmer Vernooij
  • Date: 2011-02-02 10:08:51 UTC
  • mfrom: (1.3.8 upstream)
  • Revision ID: james.westby@ubuntu.com-20110202100851-2jqk6a3t38vcdmbn
Tags: 2.3.1-1
* Update watch file to use new location on Launchpad.
 + Fixes compatibility with Python 2.7. LP: #708268
* New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
Description: Upstream changes introduced in version 2.3.0-1
2
 
 This patch has been created by dpkg-source during the package build.
3
 
 Here's the last changelog entry, hopefully it gives details on why
4
 
 those changes were made:
5
 
 .
6
 
 bzrtools (2.3.0-1) unstable; urgency=low
7
 
 .
8
 
   * New upstream release.
9
 
 .
10
 
 The person named in the Author field signed this changelog entry.
11
 
Author: Jelmer Vernooij <jelmer@debian.org>
12
 
 
13
 
---
14
 
The information above should follow the Patch Tagging Guidelines, please
15
 
checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
16
 
are templates for supplementary fields that you might want to add:
17
 
 
18
 
Origin: <vendor|upstream|other>, <url of original patch>
19
 
Bug: <url in upstream bugtracker>
20
 
Bug-Debian: http://bugs.debian.org/<bugnumber>
21
 
Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
22
 
Forwarded: <no|not-needed|url proving that it has been forwarded>
23
 
Reviewed-By: <name and email of someone who approved the patch>
24
 
Last-Update: <YYYY-MM-DD>
25
 
 
26
 
--- bzrtools-2.3.0.orig/colordiff.py
27
 
+++ bzrtools-2.3.0/colordiff.py
28
 
@@ -130,6 +130,10 @@ class DiffWriter(object):
29
 
             self.chunks = []
30
 
         self.chunks = [newstuff[-1]]
31
 
 
32
 
+    def writelines(self, lines):
33
 
+        for line in lines:
34
 
+            self.write(line)
35
 
+
36
 
     def _writeline(self, line):
37
 
         item = self.lp.parse_line(line)
38
 
         bad_ws_match = None