[Python-modules-commits] [python-docutils] 01/04: merge patched into master

[Dmitry Shachnev]

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

mitya57 pushed a commit to branch master
in repository python-docutils.

commit 0b7bbf5b7696680a1beb41eef3e9ca28f27dd6aa
Merge: 6877108 232d2ff
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Mon Oct 31 17:00:25 2016 +0300

    merge patched into master

 debian/.git-dpm                         |  4 ++--
 debian/patches/series                   |  1 -
 debian/patches/source-date-epoch.diff   | 28 ----------------------------
 docutils/parsers/rst/directives/misc.py |  5 +----
 4 files changed, 3 insertions(+), 35 deletions(-)

diff --cc debian/.git-dpm
index ebba03c,0000000..cc14ae5
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
- f4f5e6f3b61609d73325ceca08820f5a197b659d
- f4f5e6f3b61609d73325ceca08820f5a197b659d
++232d2fface018bdf1fdfaa7ff5fac637cec8337f
++232d2fface018bdf1fdfaa7ff5fac637cec8337f
 +10ac0263adc777de16afce461f3c64ec2ffa24a0
 +10ac0263adc777de16afce461f3c64ec2ffa24a0
 +python-docutils_0.12+dfsg.orig.tar.gz
 +a5bcbe5a5e330e2d780d22654abc2931c32638b6
 +1624713
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/series
index fa36071,0000000..a6db6ca
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,14 -1,0 +1,13 @@@
 +python3-pil-no-bytestrings.diff
 +iepngfix-license.diff
 +doc-debian-paths.diff
 +emacs-sensible-browser.diff
 +testall-no-stdout-stderr-redirect.diff
 +no-test-skipping.diff
 +parallel-2to3.diff
 +test-sys-path.diff
 +move-data-to-usr-share.diff
 +no-local-roman.diff
 +rst2odt_prepstyles-elementtree.diff
 +odt-writer-ascii-filenames.diff
 +static-help-message.diff
- source-date-epoch.diff

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