[pybtex] 37/108: Get rid of build-dependency on bzr (closes: #593029).
Daniel Stender
stender at moszumanska.debian.org
Fri Jul 21 10:18:27 UTC 2017
This is an automated email from the git hooks/post-receive script.
stender pushed a commit to branch master
in repository pybtex.
commit 218f9325e4811c5bcd438727fe58ee201d83916d
Author: Jakub Wilk <jwilk at debian.org>
Date: Tue Aug 17 20:57:38 2010 +0000
Get rid of build-dependency on bzr (closes: #593029).
---
debian/changelog | 3 ++-
debian/control | 2 +-
debian/patches/no-bzr.diff | 33 +++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
4 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d0a847f..b1757c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,9 @@ pybtex (0.13.2-2) UNRELEASED; urgency=low
* 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
diff --git a/debian/control b/debian/control
index f4bf00e..3ed226a 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Jakub Wilk <jwilk at debian.org>
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
diff --git a/debian/patches/no-bzr.diff b/debian/patches/no-bzr.diff
new file mode 100644
index 0000000..59d37da
--- /dev/null
+++ b/debian/patches/no-bzr.diff
@@ -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()
+
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..c51cea7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+no-bzr.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pybtex.git
More information about the debian-science-commits
mailing list