[Python-modules-commits] [cookiecutter] 04/04: Refresh patches after git-dpm to gbp pq conversion

[Vincent Bernat]

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

bernat pushed a commit to branch debian/master
in repository cookiecutter.

commit e10a1ab0d9a24e00ce9e91ff49ee18c175ad82ba
Author: Vincent Bernat <bernat at debian.org>
Date:   Sat Sep 16 16:38:15 2017 +0200

    Refresh patches after git-dpm to gbp pq conversion
---
 debian/changelog                                                    | 6 ++++++
 debian/patches/0001-Don-t-test-for-.DS_Store.patch                  | 3 +--
 debian/patches/0002-Use-PyYAML-instead-of-poyo.patch                | 5 ++---
 .../0003-Remove-all-privacy-breach-images-from-documentation.patch  | 5 ++---
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a5a7d38..d186fa7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cookiecutter (1.5.0-3) UNRELEASED; urgency=medium
+
+  * Refresh patches after git-dpm to gbp pq conversion
+
+ -- Vincent Bernat <bernat at debian.org>  Sat, 16 Sep 2017 16:37:39 +0200
+
 cookiecutter (1.5.0-2) unstable; urgency=medium
 
   [ Ben Finney ]
diff --git a/debian/patches/0001-Don-t-test-for-.DS_Store.patch b/debian/patches/0001-Don-t-test-for-.DS_Store.patch
index 678d737..42b78a6 100644
--- a/debian/patches/0001-Don-t-test-for-.DS_Store.patch
+++ b/debian/patches/0001-Don-t-test-for-.DS_Store.patch
@@ -1,4 +1,3 @@
-From 102437a5cc04d234eb7c62aa050088f2ec14ea7f 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"
@@ -9,7 +8,7 @@ This file is excluded during extraction by dpkg-source.
  1 file changed, 2 deletions(-)
 
 diff --git a/tests/test_generate_files.py b/tests/test_generate_files.py
-index f71192f1a6d4..b425fc6d8000 100644
+index f71192f..b425fc6 100644
 --- a/tests/test_generate_files.py
 +++ b/tests/test_generate_files.py
 @@ -112,11 +112,9 @@ def test_generate_files_binaries():
diff --git a/debian/patches/0002-Use-PyYAML-instead-of-poyo.patch b/debian/patches/0002-Use-PyYAML-instead-of-poyo.patch
index 669bbe3..f983f72 100644
--- a/debian/patches/0002-Use-PyYAML-instead-of-poyo.patch
+++ b/debian/patches/0002-Use-PyYAML-instead-of-poyo.patch
@@ -1,4 +1,3 @@
-From 10b3508bd3aad4a5dc3e37f3b7bcd143ddad9c43 Mon Sep 17 00:00:00 2001
 From: Vincent Bernat <vincent at bernat.im>
 Date: Sat, 28 May 2016 15:06:44 +0200
 Subject: Use PyYAML instead of poyo
@@ -11,7 +10,7 @@ to switch to poyo (a pure YAMLish parser).
  2 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/cookiecutter/config.py b/cookiecutter/config.py
-index 060e6ca98a82..cd3bd23481e9 100644
+index 060e6ca..cd3bd23 100644
 --- a/cookiecutter/config.py
 +++ b/cookiecutter/config.py
 @@ -13,7 +13,7 @@ import logging
@@ -35,7 +34,7 @@ index 060e6ca98a82..cd3bd23481e9 100644
                  'Unable to parse YAML file {}. Error: {}'
                  ''.format(config_path, e)
 diff --git a/setup.py b/setup.py
-index 5a45b5c3df0f..2805cd0a858e 100644
+index 5a45b5c..2805cd0 100644
 --- a/setup.py
 +++ b/setup.py
 @@ -28,7 +28,7 @@ requirements = [
diff --git a/debian/patches/0003-Remove-all-privacy-breach-images-from-documentation.patch b/debian/patches/0003-Remove-all-privacy-breach-images-from-documentation.patch
index 883ed33..3356bb7 100644
--- a/debian/patches/0003-Remove-all-privacy-breach-images-from-documentation.patch
+++ b/debian/patches/0003-Remove-all-privacy-breach-images-from-documentation.patch
@@ -1,4 +1,3 @@
-From 3105ab76eb8f09bc974e42fc17ce859e453e2062 Mon Sep 17 00:00:00 2001
 From: Vincent Bernat <vincent at bernat.im>
 Date: Tue, 25 Oct 2016 09:00:50 +0200
 Subject: Remove all privacy-breach images from documentation
@@ -10,7 +9,7 @@ Subject: Remove all privacy-breach images from documentation
  create mode 120000 docs/cookiecutter_medium.png
 
 diff --git a/README.rst b/README.rst
-index 23b67be52f0c..15afbb9bff52 100644
+index 23b67be..15afbb9 100644
 --- a/README.rst
 +++ b/README.rst
 @@ -2,33 +2,6 @@
@@ -58,7 +57,7 @@ index 23b67be52f0c..15afbb9bff52 100644
  
 diff --git a/docs/cookiecutter_medium.png b/docs/cookiecutter_medium.png
 new file mode 120000
-index 000000000000..a643810a7e7f
+index 0000000..a643810
 --- /dev/null
 +++ b/docs/cookiecutter_medium.png
 @@ -0,0 +1 @@

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