[Python-modules-commits] [python-mpegdash] 04/05: merge patched into master

[Ondrej Koblizek]

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

kobla-guest pushed a commit to branch master
in repository python-mpegdash.

commit 554f77e3ef6aa52fa2d3fb601e53967b2f888e3f
Merge: 1038c24 bc34a4e
Author: Ondřej Kobližek <ondrej.koblizek at firma.seznam.cz>
Date:   Tue Oct 18 07:05:51 2016 +0200

    merge patched into master

 README.md                                                 |  3 +++
 debian/.git-dpm                                           |  6 +++---
 debian/patches/0001-Prevent-internet-access-in-test.patch |  2 +-
 setup.py                                                  | 11 ++++++++++-
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --cc debian/.git-dpm
index f51345b,0000000..2e9e864
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
- 1021a799524c4b3c0940e6ec4b8fa1e15ed4fa5b
- 1021a799524c4b3c0940e6ec4b8fa1e15ed4fa5b
- 3c76510490e17c427b7f54e3d106ba2efee697a6
++bc34a4e56eba89e7dd176711664e2902297bcb70
++bc34a4e56eba89e7dd176711664e2902297bcb70
++1c4931dc0a0678346c43ba78f072d42949019ae5
 +1c4931dc0a0678346c43ba78f072d42949019ae5
 +python-mpegdash_0.1.5.orig.tar.gz
 +224afcc881249f259bb8ed3cd6a900d2300f8496
 +12973
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Prevent-internet-access-in-test.patch
index 6e7c20b,0000000..477e96c
mode 100644,000000..100644
--- a/debian/patches/0001-Prevent-internet-access-in-test.patch
+++ b/debian/patches/0001-Prevent-internet-access-in-test.patch
@@@ -1,21 -1,0 +1,21 @@@
- From 1021a799524c4b3c0940e6ec4b8fa1e15ed4fa5b Mon Sep 17 00:00:00 2001
++From bc34a4e56eba89e7dd176711664e2902297bcb70 Mon Sep 17 00:00:00 2001
 +From: Ondrej Koblizek <ondrej.koblizek at firma.seznam.cz>
 +Date: Wed, 18 May 2016 15:29:38 +0200
 +Subject: Prevent internet access in test
 +
 +---
 + tests/test_xmltompd.py | 1 +
 + 1 file changed, 1 insertion(+)
 +
 +diff --git a/tests/test_xmltompd.py b/tests/test_xmltompd.py
 +index decda3d..dc877b8 100644
 +--- a/tests/test_xmltompd.py
 ++++ b/tests/test_xmltompd.py
 +@@ -32,6 +32,7 @@ class XML2MPDTestCase(unittest.TestCase):
 +         self.assert_mpd(MPEGDASHParser.parse('./tests/mpd-samples/oops-20120802-manifest.mpd'))
 +         self.assert_mpd(MPEGDASHParser.parse('./tests/mpd-samples/360p_speciment_dash.mpd'))
 + 
 ++    @unittest.skip("Prevent internet access")
 +     def test_xml2mpd_from_url(self):
 +         mpd_url = 'http://yt-dash-mse-test.commondatastorage.googleapis.com/media/motion-20120802-manifest.mpd'
 +         self.assert_mpd(MPEGDASHParser.parse(mpd_url))

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