[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 979e67b01b2c9a181e90aef7d2f489581292a92c
Merge: 502ba79 efae35a
Author: Edward Betts <edward at 4angle.com>
Date:   Tue Mar 22 10:05:15 2016 +0000

    merge patched into master

 CHANGES.txt                           | 15 +++++++++++++++
 PKG-INFO                              | 23 +++++++++++++++++++++--
 README.rst                            |  5 ++++-
 debian/.git-dpm                       |  6 +++---
 debian/patches/dont-install-test-data |  2 +-
 setup.py                              |  3 ++-
 tzlocal.egg-info/PKG-INFO             | 23 +++++++++++++++++++++--
 tzlocal.egg-info/SOURCES.txt          |  1 -
 tzlocal.egg-info/pbr.json             |  1 -
 tzlocal.egg-info/requires.txt         |  2 +-
 tzlocal/darwin.py                     | 14 ++++++++++++--
 tzlocal/tests.py                      |  3 +++
 tzlocal/windows_tz.py                 | 20 +++++++++++++-------
 13 files changed, 96 insertions(+), 22 deletions(-)

diff --cc debian/.git-dpm
index 1d2c75f,0000000..6cad436
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
- 1a095bfd851e3cac764750933fc62e6f700a196d
- 1a095bfd851e3cac764750933fc62e6f700a196d
- b502b354ffb04307a2e77682e6d2266679924dab
++efae35a0a1dc1ef1b7f21862d6680f792f84e48d
++efae35a0a1dc1ef1b7f21862d6680f792f84e48d
++4bc7bb949483a2b060972d7d7c66f73d21df3070
 +4bc7bb949483a2b060972d7d7c66f73d21df3070
 +python-tzlocal_1.2.2.orig.tar.gz
 +9a1d479954e423fdab119bb139ca9a7e8f5f7346
 +18198
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/dont-install-test-data
index 5805e51,0000000..c384368
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 1a095bfd851e3cac764750933fc62e6f700a196d Mon Sep 17 00:00:00 2001
++From efae35a0a1dc1ef1b7f21862d6680f792f84e48d 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