~ubuntu-branches/ubuntu/trusty/pyx/trusty

« back to all changes in this revision

Viewing changes to debian/patches/pyxrc-load.patch

  • Committer: Bazaar Package Importer
  • Author(s): Stuart Prescott
  • Date: 2011-05-20 00:13:52 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20110520001352-7jfc1unuvduxji05
Tags: 0.11.1-1
* New upstream release.
* Change documentation build system to sphinx in line with new upstream docs.
* Rebuild lfs files as part of build process.
* Refresh patchs for new version:
  - drop manual-latex-define.patch no longer needed with sphinx.
  - drop siteconfig-static.patch: not needed with new build system
  - drop pyx-text-warnings26.patch: warnings fixed upstream
* Add patch sphinx-mathjax.patch to use pngmath in sphinx rather than mathjax
  which is not yet in Debian.
* Add patch createlfs-no-foiltex.patch to skip generation of foiltex-based
  lfs files that would require non-free components.
* Switch to dpkg-source 3.0 (quilt) format.
* Switch from python-support to dh_python2 as build helper.
* Update copyright format to newer DEP-5 specification.
* Add new files to copyright file.
* Bump standards version to 3.9.2 (no changes required).
* Set DM-Upload-Allowed: yes

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
Description: Include /etc/pyxrc in the list of config files read
 
2
Author: Stuart Prescott <stuart+debian@nanonanonano.net>
 
3
 
 
4
--- a/pyx/config.py
 
5
+++ b/pyx/config.py
 
6
@@ -27,6 +27,7 @@
 
7
 
 
8
 config = ConfigParser.ConfigParser()
 
9
 config.readfp(filelocator.locator_classes["internal"]().openers("pyxrc", [], [""], "r")[0]())
 
10
+config.read("/etc/pyxrc")
 
11
 config.read(os.path.expanduser("~/.pyxrc"))
 
12
 
 
13
 def get(section, option, default=_marker):