[Python-modules-commits] [cookiecutter] 08/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 926682667d3e5000cac7e7ca7e0bae08038695cd
Merge: 69d32a7 37e46a0
Author: Vincent Bernat <bernat at debian.org>
Date:   Mon Nov 16 00:08:42 2015 +0100

    merge patched into master

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

diff --cc debian/.git-dpm
index dcc072e,0000000..97fc3cb
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
- 8038fb88030e9529b5ca5176ac220c6a5f9000b3
- 8038fb88030e9529b5ca5176ac220c6a5f9000b3
++37e46a0dfe41ba2f506e7ff330cea44084eb6444
++37e46a0dfe41ba2f506e7ff330cea44084eb6444
 +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 3e27381,0000000..6567719
mode 100644,000000..100644
--- a/debian/patches/0001-Don-t-test-for-.DS_Store.patch
+++ b/debian/patches/0001-Don-t-test-for-.DS_Store.patch
@@@ -1,22 -1,0 +1,26 @@@
- From 8038fb88030e9529b5ca5176ac220c6a5f9000b3 Mon Sep 17 00:00:00 2001
++From 37e46a0dfe41ba2f506e7ff330cea44084eb6444 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(-)
++ tests/test_generate_files.py | 2 --
++ 1 file changed, 2 deletions(-)
 +
 +diff --git a/tests/test_generate_files.py b/tests/test_generate_files.py
- index f75b0db440ce..7ee2e3f346e7 100644
++index f75b0db440ce..9307af1e6327 100644
 +--- a/tests/test_generate_files.py
 ++++ b/tests/test_generate_files.py
- @@ -113,7 +113,6 @@ def test_generate_files_binaries():
++@@ -113,11 +113,9 @@ 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')
++-    assert os.path.isfile('inputbinary_files/binary_files/.DS_Store')
++     assert os.path.isfile('inputbinary_files/binary_files/readme.txt')
++     assert os.path.isfile('inputbinary_files/binary_files/some_font.otf')
++     assert os.path.isfile(

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