[Python-modules-commits] [python-tzlocal] 04/05: merge patched into master

[Edward Betts]

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

edward pushed a commit to branch master
in repository python-tzlocal.

commit f566fc7b0b5326081b3b917427906a6b2c418d7e
Merge: 3e6f1f0 3206e67
Author: Edward Betts <edward at 4angle.com>
Date:   Fri Apr 21 07:44:58 2017 +0100

    merge patched into master

 CHANGES.txt                           |  27 +++++++
 LICENSE.txt                           | 140 +++++-----------------------------
 PKG-INFO                              |  42 ++++++++--
 README.rst                            |   4 +
 debian/.git-dpm                       |   6 +-
 debian/patches/dont-install-test-data |   2 +-
 setup.py                              |  12 ++-
 tzlocal.egg-info/PKG-INFO             |  42 ++++++++--
 tzlocal/darwin.py                     |  32 ++++++--
 tzlocal/tests.py                      |  37 +++++----
 tzlocal/windows_tz.py                 |  74 ++++++++++++++----
 11 files changed, 241 insertions(+), 177 deletions(-)

diff --cc debian/.git-dpm
index 49aa199,0000000..615a74b
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
- 34aab6785910e053a58a66742d29d0b7d27aa5da
- 34aab6785910e053a58a66742d29d0b7d27aa5da
- 5561ef5fdacdfb9a59c99f97e78a498aadfd91d0
++3206e67482cb088f1944de116ba50d689771472d
++3206e67482cb088f1944de116ba50d689771472d
++c31ec792ed24e1aab5238139271a1bbf9b698990
 +c31ec792ed24e1aab5238139271a1bbf9b698990
 +python-tzlocal_1.4.orig.tar.gz
 +98da003bd7e4aba02cfb6d1d62a8b5576c666310
 +15279
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/dont-install-test-data
index 87d3762,0000000..61f43b6
mode 100644,000000..100644
--- a/debian/patches/dont-install-test-data
+++ b/debian/patches/dont-install-test-data
@@@ -1,20 -1,0 +1,20 @@@
- From 34aab6785910e053a58a66742d29d0b7d27aa5da Mon Sep 17 00:00:00 2001
++From 3206e67482cb088f1944de116ba50d689771472d Mon Sep 17 00:00:00 2001
 +From: Edward Betts <edward at 4angle.com>
 +Date: Thu, 8 Oct 2015 13:18:22 -0700
 +Subject: There is no need to ship test data in binary packages
 +
 +Patch-Name: dont-install-test-data
 +---
 + MANIFEST.in | 1 -
 + 1 file changed, 1 deletion(-)
 +
 +diff --git a/MANIFEST.in b/MANIFEST.in
 +index f2bc65f..246e0ae 100644
 +--- a/MANIFEST.in
 ++++ b/MANIFEST.in
 +@@ -1,4 +1,3 @@
 + include *.py
 + include *.rst
 + include *.txt
 +-recursive-include tzlocal/test_data *
 +\ No newline at end of file

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