[Python-apps-commits] r5983 - in packages/pybtex/tags (11 files)
jwilk at users.alioth.debian.org
jwilk at users.alioth.debian.org
Tue Aug 17 22:13:09 UTC 2010
Date: Tuesday, August 17, 2010 @ 22:13:08
Author: jwilk
Revision: 5983
[svn-buildpackage] Tagging pybtex 0.13.2-2
Added:
packages/pybtex/tags/0.13.2-2/
packages/pybtex/tags/0.13.2-2/debian/changelog
(from rev 5982, packages/pybtex/trunk/debian/changelog)
packages/pybtex/tags/0.13.2-2/debian/control
(from rev 5981, packages/pybtex/trunk/debian/control)
packages/pybtex/tags/0.13.2-2/debian/lintian-overrides
(from rev 5695, packages/pybtex/trunk/debian/lintian-overrides)
packages/pybtex/tags/0.13.2-2/debian/patches/no-bzr.diff
(from rev 5979, packages/pybtex/trunk/debian/patches/no-bzr.diff)
packages/pybtex/tags/0.13.2-2/debian/patches/series
(from rev 5979, packages/pybtex/trunk/debian/patches/series)
packages/pybtex/tags/0.13.2-2/debian/rules
(from rev 5134, packages/pybtex/trunk/debian/rules)
Deleted:
packages/pybtex/tags/0.13.2-2/debian/changelog
packages/pybtex/tags/0.13.2-2/debian/control
packages/pybtex/tags/0.13.2-2/debian/patches/series
packages/pybtex/tags/0.13.2-2/debian/rules
Deleted: packages/pybtex/tags/0.13.2-2/debian/changelog
===================================================================
--- packages/pybtex/trunk/debian/changelog 2010-03-26 13:51:57 UTC (rev 5023)
+++ packages/pybtex/tags/0.13.2-2/debian/changelog 2010-08-17 22:13:08 UTC (rev 5983)
@@ -1,41 +0,0 @@
-pybtex (0.13.2-1) unstable; urgency=low
-
- * New upstream release.
- * Run tests for all supported Python versions.
- + Build-depend on python-all.
- * Fix watch file to accept more than one dot in version number.
- * Work around the fact that different PKG-INFO files can be generated for
- different Python versions.
-
- -- Jakub Wilk <jwilk at debian.org> Thu, 04 Mar 2010 14:56:58 +0100
-
-pybtex (0.13.1-1) unstable; urgency=low
-
- * New upstream release:
- + Drop Python 2.5 compatibility patch, applied upstream.
- * Bump standards version to 3.8.4 (no changes needed).
- * Update my e-mail address.
- * Remove requires.txt (dpkg is better at handling dependencies).
- * Respect the ‘nocheck’ build option.
- * Update debian/copyright.
-
- -- Jakub Wilk <jwilk at debian.org> Thu, 18 Feb 2010 19:54:23 +0100
-
-pybtex (0.12-2) unstable; urgency=low
-
- * Don't remove alternatives in prerm/upgrade.
- * Replace Breaks with Conflicts.
- * Install alternative for /usr/bin/bibtex (closes: #560376).
- Conflict with TeX Live packages, which installed this file.
- * Update debian/copyright in accordance to the latest DEP-5 version.
- * Switch to source format 3.0 (quilt).
- * Make tests/run_bibtex.py compatible with Python 2.5.
- * Run unit-tests at build time.
-
- -- Jakub Wilk <ubanus at users.sf.net> Tue, 29 Dec 2009 14:07:07 +0100
-
-pybtex (0.12-1) unstable; urgency=low
-
- * Initial release (closes: #535116).
-
- -- Jakub Wilk <ubanus at users.sf.net> Sat, 05 Dec 2009 15:35:02 +0100
Copied: packages/pybtex/tags/0.13.2-2/debian/changelog (from rev 5982, packages/pybtex/trunk/debian/changelog)
===================================================================
--- packages/pybtex/tags/0.13.2-2/debian/changelog (rev 0)
+++ packages/pybtex/tags/0.13.2-2/debian/changelog 2010-08-17 22:13:08 UTC (rev 5983)
@@ -0,0 +1,53 @@
+pybtex (0.13.2-2) unstable; urgency=low
+
+ * Fix a typo in debian/rules. Thanks to Michael Fladischer for spotting
+ that.
+ * Drop work-around for bug #575377.
+ * Bump standards version to 3.9.1.
+ + Override lintian's conflicts-with-version (Breaks is not sufficient for
+ pybtex).
+ * Get rid of build-dependency on bzr (closes: #593029).
+
+ -- Jakub Wilk <jwilk at debian.org> Tue, 17 Aug 2010 23:58:25 +0200
+
+pybtex (0.13.2-1) unstable; urgency=low
+
+ * New upstream release.
+ * Run tests for all supported Python versions.
+ + Build-depend on python-all.
+ * Fix watch file to accept more than one dot in version number.
+ * Work around the fact that different PKG-INFO files can be generated for
+ different Python versions.
+
+ -- Jakub Wilk <jwilk at debian.org> Thu, 04 Mar 2010 14:56:58 +0100
+
+pybtex (0.13.1-1) unstable; urgency=low
+
+ * New upstream release:
+ + Drop Python 2.5 compatibility patch, applied upstream.
+ * Bump standards version to 3.8.4 (no changes needed).
+ * Update my e-mail address.
+ * Remove requires.txt (dpkg is better at handling dependencies).
+ * Respect the ‘nocheck’ build option.
+ * Update debian/copyright.
+
+ -- Jakub Wilk <jwilk at debian.org> Thu, 18 Feb 2010 19:54:23 +0100
+
+pybtex (0.12-2) unstable; urgency=low
+
+ * Don't remove alternatives in prerm/upgrade.
+ * Replace Breaks with Conflicts.
+ * Install alternative for /usr/bin/bibtex (closes: #560376).
+ Conflict with TeX Live packages, which installed this file.
+ * Update debian/copyright in accordance to the latest DEP-5 version.
+ * Switch to source format 3.0 (quilt).
+ * Make tests/run_bibtex.py compatible with Python 2.5.
+ * Run unit-tests at build time.
+
+ -- Jakub Wilk <ubanus at users.sf.net> Tue, 29 Dec 2009 14:07:07 +0100
+
+pybtex (0.12-1) unstable; urgency=low
+
+ * Initial release (closes: #535116).
+
+ -- Jakub Wilk <ubanus at users.sf.net> Sat, 05 Dec 2009 15:35:02 +0100
Deleted: packages/pybtex/tags/0.13.2-2/debian/control
===================================================================
--- packages/pybtex/trunk/debian/control 2010-03-26 13:51:57 UTC (rev 5023)
+++ packages/pybtex/tags/0.13.2-2/debian/control 2010-08-17 22:13:08 UTC (rev 5983)
@@ -1,35 +0,0 @@
-Source: pybtex
-Section: tex
-Priority: optional
-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-docutils, python-jinja2, python-pygments,
- elinks-lite | elinks
-XS-Python-Version: >= 2.5
-Standards-Version: 3.8.4
-Homepage: http://pybtex.sourceforge.net/
-Vcs-Svn: svn://svn.debian.org/python-apps/packages/pybtex/trunk/
-Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/pybtex/trunk/
-
-Package: pybtex
-Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-pyparsing
-Conflicts: pybliographer (<< 1.2.12-3.1~), texlive-binaries (<< 2009-5~), texlive-base-bin (<< 2009-5~)
-Recommends: python-yaml
-Description: BibTeX-compatible bibliography processor
- Pybtex reads citation information from a file and produces a formatted
- bibliography. BibTeX style files are supported. Alternatively it is
- possible to write styles in Python.
- .
- Pybtex currently understands the following bibliography formats:
- * BibTeX
- * BibTeXML
- * YAML-based format
- .
- The resulting bibliography may be output in one of the following formats:
- * LaTeX
- * HTML
- * plain text
Copied: packages/pybtex/tags/0.13.2-2/debian/control (from rev 5981, packages/pybtex/trunk/debian/control)
===================================================================
--- packages/pybtex/tags/0.13.2-2/debian/control (rev 0)
+++ packages/pybtex/tags/0.13.2-2/debian/control 2010-08-17 22:13:08 UTC (rev 5983)
@@ -0,0 +1,35 @@
+Source: pybtex
+Section: tex
+Priority: optional
+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,
+ python-docutils, python-jinja2, python-pygments,
+ elinks-lite | elinks
+XS-Python-Version: >= 2.5
+Standards-Version: 3.9.1
+Homepage: http://pybtex.sourceforge.net/
+Vcs-Svn: svn://svn.debian.org/python-apps/packages/pybtex/trunk/
+Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/pybtex/trunk/
+
+Package: pybtex
+Architecture: all
+Depends: ${misc:Depends}, ${python:Depends}, python-pyparsing
+Conflicts: pybliographer (<< 1.2.12-3.1~), texlive-binaries (<< 2009-5~), texlive-base-bin (<< 2009-5~)
+Recommends: python-yaml
+Description: BibTeX-compatible bibliography processor
+ Pybtex reads citation information from a file and produces a formatted
+ bibliography. BibTeX style files are supported. Alternatively it is
+ possible to write styles in Python.
+ .
+ Pybtex currently understands the following bibliography formats:
+ * BibTeX
+ * BibTeXML
+ * YAML-based format
+ .
+ The resulting bibliography may be output in one of the following formats:
+ * LaTeX
+ * HTML
+ * plain text
Copied: packages/pybtex/tags/0.13.2-2/debian/lintian-overrides (from rev 5695, packages/pybtex/trunk/debian/lintian-overrides)
===================================================================
--- packages/pybtex/tags/0.13.2-2/debian/lintian-overrides (rev 0)
+++ packages/pybtex/tags/0.13.2-2/debian/lintian-overrides 2010-08-17 22:13:08 UTC (rev 5983)
@@ -0,0 +1,4 @@
+# Breaks is not sufficient for pybtex.
+pybtex: conflicts-with-version pybliographer (<< 1.2.12-3.1~)
+pybtex: conflicts-with-version texlive-base-bin (<< 2009-5~)
+pybtex: conflicts-with-version texlive-binaries (<< 2009-5~)
Copied: packages/pybtex/tags/0.13.2-2/debian/patches/no-bzr.diff (from rev 5979, packages/pybtex/trunk/debian/patches/no-bzr.diff)
===================================================================
--- packages/pybtex/tags/0.13.2-2/debian/patches/no-bzr.diff (rev 0)
+++ packages/pybtex/tags/0.13.2-2/debian/patches/no-bzr.diff 2010-08-17 22:13:08 UTC (rev 5983)
@@ -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()
+
Copied: packages/pybtex/tags/0.13.2-2/debian/patches/series (from rev 5979, packages/pybtex/trunk/debian/patches/series)
===================================================================
--- packages/pybtex/tags/0.13.2-2/debian/patches/series (rev 0)
+++ packages/pybtex/tags/0.13.2-2/debian/patches/series 2010-08-17 22:13:08 UTC (rev 5983)
@@ -0,0 +1 @@
+no-bzr.diff
Deleted: packages/pybtex/tags/0.13.2-2/debian/rules
===================================================================
--- packages/pybtex/trunk/debian/rules 2010-03-26 13:51:57 UTC (rev 5023)
+++ packages/pybtex/tags/0.13.2-2/debian/rules 2010-08-17 22:13:08 UTC (rev 5983)
@@ -1,47 +0,0 @@
-#!/usr/bin/make -f
-
-.PHONY: override_dh_auto_install
-override_dh_auto_install:
- dh_auto_install
- cd debian/pybtex/usr/bin && mv pybtex bibtex.pybtex
- for module in tests docgen; do \
- rm -Rf debian/pybtex/usr/lib/python*/*-packages/pybtex/$$module/; \
- done
- rm -f debian/pybtex/usr/lib/python*/*-packages/*.egg-info/requires.txt
-
-.PHONY: override_dh_installman
-override_dh_installman:
- dh_installman
- cd debian/pybtex/ && rename.ul pybtex bibtex.pybtex usr/share/man/man*/pybtex.[0-9]
-
-.PHONY: override_dh_auto_test
-override_dh_auto_test:
-ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
- set -e; \
- for python in $(shell pyversions -r); do \
- $$python setup.py nosetests; \
- done
-endif
-
-.PHONY: override_dh_installchangelog
-override_dh_installchangelogs:
- elinks -config-file /dev/null -dump -no-numbering -no-references docs/html/history.html \
- | grep -A1000 ^Version \
- | sed -e '/ *-\{50,\}- *$$/ { s///; q }' \
- > docs/changelog
- dh_installchangelogs docs/changelog
-
-.PHONY: override_dh_pysupport
-override_dh_pysupport:
-# For some reason PKG-INFO files differ between Python versions.
-# Let's leave only ony copy.
- find debian/ -name PKG-INFO | tail -n +2 | xargs -r -n1 cp -vf $(shell find debian/ -name PKG-INFO | head -n 1)
- dh_pysupport
-
-.PHONY: build build-arch build-indep binary binary-arch binary-indep clean
-build build-arch build-indep binary binary-indep clean:
- dh $(@)
-# In order not to confuse lintian, binary-arch is a separate target:
-binary-arch:
-
-# vim:ts=4 sw=4 noet
Copied: packages/pybtex/tags/0.13.2-2/debian/rules (from rev 5134, packages/pybtex/trunk/debian/rules)
===================================================================
--- packages/pybtex/tags/0.13.2-2/debian/rules (rev 0)
+++ packages/pybtex/tags/0.13.2-2/debian/rules 2010-08-17 22:13:08 UTC (rev 5983)
@@ -0,0 +1,40 @@
+#!/usr/bin/make -f
+
+.PHONY: override_dh_auto_install
+override_dh_auto_install:
+ dh_auto_install
+ cd debian/pybtex/usr/bin && mv pybtex bibtex.pybtex
+ for module in tests docgen; do \
+ rm -Rf debian/pybtex/usr/lib/python*/*-packages/pybtex/$$module/; \
+ done
+ rm -f debian/pybtex/usr/lib/python*/*-packages/*.egg-info/requires.txt
+
+.PHONY: override_dh_installman
+override_dh_installman:
+ dh_installman
+ cd debian/pybtex/ && rename.ul pybtex bibtex.pybtex usr/share/man/man*/pybtex.[0-9]
+
+.PHONY: override_dh_auto_test
+override_dh_auto_test:
+ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
+ set -e; \
+ for python in $(shell pyversions -r); do \
+ $$python setup.py nosetests; \
+ done
+endif
+
+.PHONY: override_dh_installchangelogs
+override_dh_installchangelogs:
+ elinks -config-file /dev/null -dump -no-numbering -no-references docs/html/history.html \
+ | grep -A1000 ^Version \
+ | sed -e '/ *-\{50,\}- *$$/ { s///; q }' \
+ > docs/changelog
+ dh_installchangelogs docs/changelog
+
+.PHONY: build build-arch build-indep binary binary-arch binary-indep clean
+build build-arch build-indep binary binary-indep clean:
+ dh $(@)
+# In order not to confuse lintian, binary-arch is a separate target:
+binary-arch:
+
+# vim:ts=4 sw=4 noet
More information about the Python-apps-commits
mailing list