[Python-modules-commits] [python-mpegdash] 01/02: Merge tag 'debian/0.1.5-1' into jessie-backports

[Ondřej Nový]

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

onovy pushed a commit to branch jessie-backports
in repository python-mpegdash.

commit b096de9b0742630de4f9880bb6f4bed12e94f5b1
Merge: 3c99b6d c6a2631
Author: Ondřej Nový <onovy at debian.org>
Date:   Mon Nov 21 16:28:12 2016 +0100

    Merge tag 'debian/0.1.5-1' into jessie-backports

 README.md                                          |   3 +
 debian/.git-dpm                                    |  14 +-
 debian/CHANGELOG                                   | 195 +++++++++++++++++++++
 debian/changelog                                   |  13 +-
 debian/control                                     |   4 +-
 .../0001-Prevent-internet-access-in-test.patch     |   2 +-
 debian/rules                                       |   3 +
 setup.py                                           |  11 +-
 8 files changed, 231 insertions(+), 14 deletions(-)

diff --cc debian/changelog
index ce5e123,a37a026..b130a76
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,14 +1,15 @@@
- python-mpegdash (0.1.0-1~bpo8+1) jessie-backports; urgency=medium
+ python-mpegdash (0.1.5-1) unstable; urgency=medium
  
-   * Rebuild for jessie-backports.
+   [ Ondřej Nový ]
+   * Removed version from python-all build dependency
+   * d/{control,copyright}: Use my @debian.org email address
  
-  -- Ondřej Kobližek <koblizeko at gmail.com>  Mon, 30 May 2016 12:21:30 +0200
+   [ Ondřej Kobližek ]
+   * New upstream release
+   * Add upstream CHANGELOG
+ 
+  -- Ondřej Kobližek <koblizeko at gmail.com>  Wed, 19 Oct 2016 12:40:05 +0200
++>>>>>>> debian/0.1.5-1
  
  python-mpegdash (0.1.0-1) unstable; urgency=medium
  

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