[Python-modules-commits] [sphinx-celery] 06/09: merge patched into master

[Christopher Stuart Hoskin]

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

mans0954 pushed a commit to branch master
in repository sphinx-celery.

commit 11838d08d5357c320b9e1014111352e1f38d109a
Merge: 8e40f9b 4afae2a
Author: Christopher Hoskin <christopher.hoskin at gmail.com>
Date:   Sun Feb 12 13:42:55 2017 +0000

    merge patched into master

 debian/.git-dpm                                        |  4 ++--
 ...-unnecessary-circular-test-dependancy-on-case.patch | 18 ++++++++++++++++++
 debian/patches/series                                  |  1 +
 requirements/test.txt                                  |  1 -
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 80d577b,0000000..158f098
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
- 2c702ed64a1cd879370ceb8abceb10afa10ec731
- 2c702ed64a1cd879370ceb8abceb10afa10ec731
++4afae2a5aa13c3d9d8cdb6a16d421af185f4612d
++4afae2a5aa13c3d9d8cdb6a16d421af185f4612d
 +2c702ed64a1cd879370ceb8abceb10afa10ec731
 +2c702ed64a1cd879370ceb8abceb10afa10ec731
 +sphinx-celery_1.3.1.orig.tar.gz
 +33f4ad81f53fbe7cb0882d8facd226c9dae96f4e
 +18750
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Remove-unnecessary-circular-test-dependancy-on-case.patch
index 0000000,0000000..e56d0d3
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Remove-unnecessary-circular-test-dependancy-on-case.patch
@@@ -1,0 -1,0 +1,18 @@@
++From 4afae2a5aa13c3d9d8cdb6a16d421af185f4612d Mon Sep 17 00:00:00 2001
++From: Christopher Hoskin <christopher.hoskin at gmail.com>
++Date: Sun, 12 Feb 2017 13:40:05 +0000
++Subject: Remove unnecessary circular test dependancy on case
++
++Forwarded: https://github.com/celery/sphinx_celery/pull/1
++Author: Christopher Hoskin <mans0954 at debian.org>
++Last-Update: 2017-02-12
++---
++ requirements/test.txt | 1 -
++ 1 file changed, 1 deletion(-)
++
++diff --git a/requirements/test.txt b/requirements/test.txt
++index 65c3149..e69de29 100644
++--- a/requirements/test.txt
+++++ b/requirements/test.txt
++@@ -1 +0,0 @@
++-case>=1.0.3
diff --cc debian/patches/series
index 0000000,0000000..38e2c5b
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Remove-unnecessary-circular-test-dependancy-on-case.patch

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