[Python-modules-commits] [django-q] 08/11: merge patched into master

[Pierre-Elliott Bécue]

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

peb-guest pushed a commit to branch master
in repository django-q.

commit 9a55fe6bfa9d2ec33d97e92564a4d0022fe6768e
Merge: 3753ebd a90218d
Author: Pierre-Elliott Bécue <becue at crans.org>
Date:   Tue Dec 12 14:45:07 2017 +0100

    merge patched into master

 README.rst                                         |  2 --
 debian/.git-dpm                                    |  4 ++--
 ...emoves-.rst-call-to-now-inexistent-images.patch | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 25 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 244ac0e,0000000..8404df9
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
- b17a737c8c4527d0fcfeec68a929c2aad0137b90
- b17a737c8c4527d0fcfeec68a929c2aad0137b90
++a90218dd96508227c32cdab12af25e200a53ae42
++a90218dd96508227c32cdab12af25e200a53ae42
 +0c068a9f88c176063d9b8bf58b511cdd96737fe2
 +0c068a9f88c176063d9b8bf58b511cdd96737fe2
 +django-q_0.8.1.orig.tar.gz
 +70ac1b3a7f9f32975d5bb170af0c880ac80b95c0
 +517712
diff --cc debian/patches/0002-Removes-.rst-call-to-now-inexistent-images.patch
index 0000000,0000000..71008b2
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Removes-.rst-call-to-now-inexistent-images.patch
@@@ -1,0 -1,0 +1,22 @@@
++From a90218dd96508227c32cdab12af25e200a53ae42 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= <becue at crans.org>
++Date: Tue, 12 Dec 2017 14:44:48 +0100
++Subject: Removes .rst call to now inexistent images
++
++---
++ README.rst | 2 --
++ 1 file changed, 2 deletions(-)
++
++diff --git a/README.rst b/README.rst
++index af6faa5..d84f2de 100644
++--- a/README.rst
+++++ b/README.rst
++@@ -6,8 +6,6 @@
++ A multiprocessing distributed task queue for Django
++ ---------------------------------------------------
++ 
++-|image0| |image1| |docs| |image2|
++-
++ Features
++ ~~~~~~~~
++ 
diff --cc debian/patches/series
index 2e158c9,0000000..8ef3012
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-Removes-all-links-that-trigger-a-privacy-breach.patch
++0002-Removes-.rst-call-to-now-inexistent-images.patch

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