[bzr] Remove offending debug statement breaking the texinfo sphinx builder

[Henrik Nordström]

commit 50df114f7132bb63b7a80cc1e88c5e906c5cf15e
Author: Henrik Nordstrom <henrik at henriknordstrom.net>
Date:   Thu Mar 8 16:29:49 2012 +0100

    Remove offending debug statement breaking the texinfo sphinx builder

 .gitignore |    1 +
 bzr.spec   |    4 +++-
 sources    |    1 +
 3 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 027414e..eeca53d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,4 @@ bzr-2.2b4.tar.gz.asc
 /bzr-2.5b6.tar.gz.sig
 /bzr-2.5.0.tar.gz
 /bzr-2.5.0.tar.gz.sig
+/6481
diff --git a/bzr.spec b/bzr.spec
index a3b0ab1..6258a5a 100644
--- a/bzr.spec
+++ b/bzr.spec
@@ -27,6 +27,7 @@ Source0:        https://launchpad.net/%{name}/%{bzrmajor}/%{version}%{?bzrrc}/+d
 Source1:        https://launchpad.net/%{name}/%{bzrmajor}/%{version}%{?bzrrc}/+download/%{name}-%{version}%{?bzrrc}.tar.gz.sig
 Source2:        bzr-icon-64.png
 Patch0:         bzr-2.5b5-fix_sphinx11_texinfo.patch
+Patch1:		http://bazaar.launchpad.net/~vila/bzr/2.5-integration/diff/6481
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel zlib-devel
@@ -62,7 +63,8 @@ This package contains the documentation for the Bazaar version control system.
 
 %prep
 %setup -q -n %{name}-%{version}%{?bzrrc}
-#patch0 -p1 -b .fix_sphinx11_texinfo
+%patch0 -p1 -b .fix_sphinx11_texinfo
+%patch1 -p0 -b .sphinx_no_debug_trace
 
 
 sed -i '1{/#![[:space:]]*\/usr\/bin\/\(python\|env\)/d}' bzrlib/_patiencediff_py.py
diff --git a/sources b/sources
index 3f06fab..e7a2a9b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
 44eb47b77995098a28f017e2daa606b6  bzr-2.5.0.tar.gz
 b0d4a26a3dde94f30e142868b896fed5  bzr-2.5.0.tar.gz.sig
+20a8870c63319bb259c29517e4e7d359  6481