[Python-modules-commits] [python-soco] 06/07: merge patched into master

[Ruben Undheim]

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

rubund-guest pushed a commit to branch master
in repository python-soco.

commit 723d999b6d9ca2be51af7acce00c234a97953cf0
Merge: dcb388f e0eaba1
Author: Ruben Undheim <ruben.undheim at gmail.com>
Date:   Sun Dec 11 19:36:24 2016 +0100

    merge patched into master

 debian/.git-dpm                       |  4 ++--
 debian/patches/0001-removed-one.patch | 20 ++++++++++++++++++++
 debian/patches/series                 |  1 +
 requirements-dev.txt                  |  1 -
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 7ccd9f9,0000000..7c84a69
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 8249c94b02bec986251eeb8819fb79a44472dcd1
- 8249c94b02bec986251eeb8819fb79a44472dcd1
++e0eaba11f6cd7d78e0805b7a094b7f4f53ffffff
++e0eaba11f6cd7d78e0805b7a094b7f4f53ffffff
 +8249c94b02bec986251eeb8819fb79a44472dcd1
 +8249c94b02bec986251eeb8819fb79a44472dcd1
 +python-soco_0.12.orig.tar.gz
 +9c6e6e7de455b4c55c3dcd3e0a0ef9f10a3f5f4b
 +638708
diff --cc debian/patches/0001-removed-one.patch
index 0000000,0000000..c5b11b5
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-removed-one.patch
@@@ -1,0 -1,0 +1,20 @@@
++From e0eaba11f6cd7d78e0805b7a094b7f4f53ffffff Mon Sep 17 00:00:00 2001
++From: Ruben Undheim <ruben.undheim at gmail.com>
++Date: Sun, 11 Dec 2016 19:36:20 +0100
++Subject: removed one
++
++---
++ requirements-dev.txt | 1 -
++ 1 file changed, 1 deletion(-)
++
++diff --git a/requirements-dev.txt b/requirements-dev.txt
++index 1bbcf48..41b7b80 100644
++--- a/requirements-dev.txt
+++++ b/requirements-dev.txt
++@@ -5,6 +5,5 @@ mock >= 1.0.1
++ graphviz
++ flake8
++ pylint >= 1.4
++-coveralls
++ pytest-cov
++ wheel
diff --cc debian/patches/series
index 0000000,0000000..a2203cc
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-removed-one.patch

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