[Python-modules-commits] [epsilon] 04/15: merge patched into master

[Tristan Seligmann]

This is an automated email from the git hooks/post-receive script.

mithrandi pushed a commit to branch master
in repository epsilon.

commit d011f5a82ffe4c7d62a21a7fb9f3122dae7c58de
Merge: 813d70c 910d0b7
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Sat Oct 10 16:23:42 2015 +0200

    merge patched into master

 Epsilon.egg-info/PKG-INFO           |    8 +-
 Epsilon.egg-info/SOURCES.txt        |    3 +
 Epsilon.egg-info/requires.txt       |    2 +-
 MANIFEST.in                         |    2 +
 PKG-INFO                            |    8 +-
 bin/certcreate                      |    5 +
 debian/.git-dpm                     |    6 +-
 debian/patches/series               |    1 -
 debian/patches/use-proc-mounts.diff |   23 -
 epsilon/__init__.py                 |   10 +-
 epsilon/_version.py                 |   22 +-
 epsilon/extime.py                   |   14 +-
 epsilon/scripts/benchmark.py        |    2 +-
 epsilon/test/test_benchmark.py      |   21 +
 epsilon/test/test_caseless.py       |    4 +-
 epsilon/test/test_extime.py         |    8 +
 epsilon/test/test_structlike.py     |   18 +-
 setup.cfg                           |    8 +
 setup.py                            |   15 +-
 versioneer.py                       | 1699 +++++++++++++++++++++++++++++++++++
 20 files changed, 1819 insertions(+), 60 deletions(-)

diff --cc debian/.git-dpm
index 7d64ecb,0000000..e6c12bb
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 67953904e8ba4287b22d78a7de1e565fb0a96e34
- 67953904e8ba4287b22d78a7de1e565fb0a96e34
- bbba35d16f734229bfab0332d8dc08a075442fb8
++910d0b771c11ee8f7cdf229eaf5d4c478cf19976
++910d0b771c11ee8f7cdf229eaf5d4c478cf19976
++910d0b771c11ee8f7cdf229eaf5d4c478cf19976
 +910d0b771c11ee8f7cdf229eaf5d4c478cf19976
 +epsilon_0.7.1.orig.tar.gz
 +162e83031a29a8c4f705fe5cb02988717c35d8ba
 +96820
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/epsilon.git