[Python-modules-commits] [python3-proselint] 06/09: merge patched into master

[Víctor Cuadrado Juan]

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

viccuad-guest pushed a commit to branch master
in repository python3-proselint.

commit 6be5f5d022c8f8bd603d17626fb77caee160a15a
Merge: 73de561 51447d8
Author: Víctor Cuadrado Juan <me at viccuad.me>
Date:   Mon Feb 27 20:05:49 2017 +0100

    merge patched into master

 debian/.git-dpm                                       |  4 ++--
 ...-Add-missing-illegal-chars.txt-file-to-tests.patch | 19 +++++++++++++++++++
 debian/patches/series                                 |  1 +
 tests/illegal-chars.txt                               |  2 ++
 4 files changed, 24 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index 2fda390,0000000..4161c6a
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
- d8286825636271f2c37ca893ba9ace905f87b53a
- d8286825636271f2c37ca893ba9ace905f87b53a
++51447d86c0137f4a7d82e524aad84d93f1e222e6
++51447d86c0137f4a7d82e524aad84d93f1e222e6
 +0824c24ca19e0f659e501a88f524f9372d0a901c
 +0824c24ca19e0f659e501a88f524f9372d0a901c
 +python3-proselint_0.8.0.orig.tar.gz
 +d3f6237e979166b74ac7b451063a5788795499ce
 +94169
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Add-missing-illegal-chars.txt-file-to-tests.patch
index 0000000,0000000..0674753
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Add-missing-illegal-chars.txt-file-to-tests.patch
@@@ -1,0 -1,0 +1,19 @@@
++From 51447d86c0137f4a7d82e524aad84d93f1e222e6 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?V=C3=ADctor=20Cuadrado=20Juan?= <me at viccuad.me>
++Date: Mon, 27 Feb 2017 20:04:17 +0100
++Subject: Add missing illegal-chars.txt file to tests
++
++This allows test_illegal_chars.py to pass.
++---
++ tests/illegal-chars.txt | 2 ++
++ 1 file changed, 2 insertions(+)
++ create mode 100644 tests/illegal-chars.txt
++
++diff --git a/tests/illegal-chars.txt b/tests/illegal-chars.txt
++new file mode 100644
++index 0000000..300d06d
++--- /dev/null
+++++ b/tests/illegal-chars.txt
++@@ -0,0 +1,2 @@
+++This file contains an illegal character on the next line...
+++don�
diff --cc debian/patches/series
index feac9df,0000000..74c8f5a
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-Remove-debug-clearcache-functionality.patch
++0002-Add-missing-illegal-chars.txt-file-to-tests.patch

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