[Python-modules-commits] [parallax] 03/06: merge patched into master

[Valentin Vidic]

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

vvidic-guest pushed a commit to branch master
in repository parallax.

commit 7c532bf5a93391b2280a7192106b48329e87f201
Merge: dff68ab 628f08d
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date:   Mon Sep 18 19:11:59 2017 +0200

    merge patched into master

 MANIFEST.in                                        |  6 ++
 PKG-INFO                                           |  2 +-
 README                                             | 76 ++++++++++++++++++
 debian/.git-dpm                                    |  6 +-
 ...e-testsuite-exit-with-non-zero-on-failure.patch | 22 ------
 ...date-module-and-test-to-work-with-python3.patch | 91 ----------------------
 debian/patches/series                              |  2 -
 PKG-INFO => parallax.egg-info/PKG-INFO             |  2 +-
 parallax.egg-info/SOURCES.txt                      | 21 +++++
 parallax.egg-info/dependency_links.txt             |  1 +
 parallax.egg-info/top_level.txt                    |  1 +
 parallax/__init__.py                               | 12 +--
 parallax/version.py                                |  2 +-
 setup.cfg                                          |  4 +
 setup.py                                           |  2 +-
 15 files changed, 122 insertions(+), 128 deletions(-)

diff --cc debian/.git-dpm
index 42faea4,0000000..b0b9f5a
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,12 -1,0 +1,12 @@@
 +# see git-dpm(1) from git-dpm package
- da32530cca991ab29ea2e6d1295ef37a324ca245
- da32530cca991ab29ea2e6d1295ef37a324ca245
- fdf17ec903babd9f496782c607826b5482fc8247
++628f08d1bcf5e372db15017ef5adbcc4be05f901
++628f08d1bcf5e372db15017ef5adbcc4be05f901
++628f08d1bcf5e372db15017ef5adbcc4be05f901
 +628f08d1bcf5e372db15017ef5adbcc4be05f901
 +parallax_1.0.2.orig.tar.gz
 +9855a7532bb5bb98f929a60b8442e1a2212739db
 +16520
 +
 +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/parallax.git