[Python-modules-commits] [cookiecutter] 07/09: merge patched into master

[Vincent Bernat]

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

bernat pushed a commit to branch master
in repository cookiecutter.

commit 69d32a72ce6d5b9e447ee900f75e9c20b8b2942f
Merge: 78b5a35 8038fb8
Author: Vincent Bernat <bernat at debian.org>
Date:   Mon Nov 16 00:03:34 2015 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 debian/patches/0001-Don-t-test-for-.DS_Store.patch | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 tests/test_generate_files.py                       |  1 -
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 2293d45,0000000..dcc072e
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
- db64feff584643eec95fb180dd7e84f2a7c4ba8a
- db64feff584643eec95fb180dd7e84f2a7c4ba8a
++8038fb88030e9529b5ca5176ac220c6a5f9000b3
++8038fb88030e9529b5ca5176ac220c6a5f9000b3
 +db64feff584643eec95fb180dd7e84f2a7c4ba8a
 +db64feff584643eec95fb180dd7e84f2a7c4ba8a
 +cookiecutter_1.2.1.orig.tar.gz
 +82e1dacab7adc0b6453b3c81c0c9acc5eaf4114e
 +215412
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Don-t-test-for-.DS_Store.patch
index 0000000,0000000..3e27381
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Don-t-test-for-.DS_Store.patch
@@@ -1,0 -1,0 +1,22 @@@
++From 8038fb88030e9529b5ca5176ac220c6a5f9000b3 Mon Sep 17 00:00:00 2001
++From: Vincent Bernat <vincent at bernat.im>
++Date: Mon, 16 Nov 2015 00:02:17 +0100
++Subject: Don't test for ".DS_Store"
++
++This file is excluded during extraction by dpkg-source.
++---
++ tests/test_generate_files.py | 1 -
++ 1 file changed, 1 deletion(-)
++
++diff --git a/tests/test_generate_files.py b/tests/test_generate_files.py
++index f75b0db440ce..7ee2e3f346e7 100644
++--- a/tests/test_generate_files.py
+++++ b/tests/test_generate_files.py
++@@ -113,7 +113,6 @@ def test_generate_files_binaries():
++     )
++ 
++     assert os.path.isfile('inputbinary_files/logo.png')
++-    assert os.path.isfile('inputbinary_files/.DS_Store')
++     assert os.path.isfile('inputbinary_files/readme.txt')
++     assert os.path.isfile('inputbinary_files/some_font.otf')
++     assert os.path.isfile('inputbinary_files/binary_files/logo.png')
diff --cc debian/patches/series
index 0000000,0000000..5fd9ecc
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Don-t-test-for-.DS_Store.patch

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