[Python-apps-commits] r5979 - in packages/pybtex/trunk/debian (4 files)

[jwilk at users.alioth.debian.org]

    Date: Tuesday, August 17, 2010 @ 20:57:38
  Author: jwilk
Revision: 5979

Get rid of build-dependency on bzr (closes: #593029).

Added:
  packages/pybtex/trunk/debian/patches/no-bzr.diff
Modified:
  packages/pybtex/trunk/debian/changelog
  packages/pybtex/trunk/debian/control
  packages/pybtex/trunk/debian/patches/series

Modified: packages/pybtex/trunk/debian/changelog
===================================================================
--- packages/pybtex/trunk/debian/changelog	2010-08-13 16:14:00 UTC (rev 5978)
+++ packages/pybtex/trunk/debian/changelog	2010-08-17 20:57:38 UTC (rev 5979)
@@ -5,8 +5,9 @@
   * Drop work-around for bug #575377.
   * Bump standards version to 3.9.0.
     + Override conflicts-with-version (Breaks is not sufficient for pybtex).
+  * Get rid of build-dependency on bzr (closes: #593029).
 
- -- Jakub Wilk <jwilk at debian.org>  Mon, 28 Jun 2010 14:52:11 +0200
+ -- Jakub Wilk <jwilk at debian.org>  Tue, 17 Aug 2010 22:43:14 +0200
 
 pybtex (0.13.2-1) unstable; urgency=low
 

Modified: packages/pybtex/trunk/debian/control
===================================================================
--- packages/pybtex/trunk/debian/control	2010-08-13 16:14:00 UTC (rev 5978)
+++ packages/pybtex/trunk/debian/control	2010-08-17 20:57:38 UTC (rev 5979)
@@ -5,7 +5,7 @@
 Uploaders: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Build-Depends: debhelper (>= 7.0.50~),
   python-all (>= 2.5), python-support (>= 0.90), python-setuptools,
-  python-nose, python-pyparsing, python-yaml, bzr,
+  python-nose, python-pyparsing, python-yaml,
   python-docutils, python-jinja2, python-pygments,
   elinks-lite | elinks
 XS-Python-Version: >= 2.5

Added: packages/pybtex/trunk/debian/patches/no-bzr.diff
===================================================================
--- packages/pybtex/trunk/debian/patches/no-bzr.diff	                        (rev 0)
+++ packages/pybtex/trunk/debian/patches/no-bzr.diff	2010-08-17 20:57:38 UTC (rev 5979)
@@ -0,0 +1,33 @@
+Description: Import bzrlib only if it is actually needed.
+Author: Jakub Wilk <jwilk at debian.org>
+Bug-Debian: http://bugs.debian.org/593029
+Forwarded: not-needed
+
+--- a/pybtex/docgen/html.py
++++ b/pybtex/docgen/html.py
+@@ -37,9 +37,6 @@
+ from pygments.lexers import get_lexer_by_name
+ from pygments.formatters import HtmlFormatter
+ 
+-from bzrlib import workingtree
+-from bzrlib.osutils import format_date
+-
+ from pybtex.__version__ import version
+ from .mystyle import MyHiglightStyle
+ 
+@@ -54,6 +51,7 @@
+ 
+ 
+ def get_bzr_timestamp(filename):
++    from bzrlib import workingtree
+     if os.path.basename(filename) == 'history.rst':
+         root_dir = os.path.dirname(os.path.dirname(os.path.dirname(filename)))
+         filename = os.path.join(root_dir, 'CHANGES')
+@@ -214,6 +212,7 @@
+ 
+ 
+ def handle_file(filename, fp, dst, for_site):
++    from bzrlib.osutils import format_date
+     title = os.path.splitext(os.path.basename(filename))[0]
+     content = fp.read()
+ 

Modified: packages/pybtex/trunk/debian/patches/series
===================================================================
--- packages/pybtex/trunk/debian/patches/series	2010-08-13 16:14:00 UTC (rev 5978)
+++ packages/pybtex/trunk/debian/patches/series	2010-08-17 20:57:38 UTC (rev 5979)
@@ -0,0 +1 @@
+no-bzr.diff