[Python-modules-commits] [python-tzlocal] 02/02: 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 bb6329d570d05f2ea58762ca3cb28183a404515f
Merge: 3dc981f 34aab67
Author: Edward Betts <edward at 4angle.com>
Date:   Sat Nov 19 07:53:52 2016 +0000

    merge patched into master

 CHANGES.txt                                     |  6 +++++
 PKG-INFO                                        |  8 +++++-
 debian/.git-dpm                                 |  6 ++---
 debian/patches/dont-install-test-data           |  2 +-
 setup.py                                        |  2 +-
 tzlocal.egg-info/PKG-INFO                       |  8 +++++-
 tzlocal.egg-info/SOURCES.txt                    |  1 +
 tzlocal/test_data/vardbzoneinfo/var/db/zoneinfo |  1 +
 tzlocal/tests.py                                |  6 +++++
 tzlocal/unix.py                                 | 33 +++++++++++++------------
 10 files changed, 50 insertions(+), 23 deletions(-)

diff --cc debian/.git-dpm
index 09b6bf8,0000000..e186b06
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
- efae35a0a1dc1ef1b7f21862d6680f792f84e48d
- efae35a0a1dc1ef1b7f21862d6680f792f84e48d
- 4bc7bb949483a2b060972d7d7c66f73d21df3070
++34aab6785910e053a58a66742d29d0b7d27aa5da
++34aab6785910e053a58a66742d29d0b7d27aa5da
++5561ef5fdacdfb9a59c99f97e78a498aadfd91d0
 +5561ef5fdacdfb9a59c99f97e78a498aadfd91d0
 +python-tzlocal_1.3.orig.tar.gz
 +730e9d7112335865a1dcfabec69c8c3086be424f
 +18352
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/dont-install-test-data
index c384368,0000000..87d3762
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 efae35a0a1dc1ef1b7f21862d6680f792f84e48d Mon Sep 17 00:00:00 2001
++From 34aab6785910e053a58a66742d29d0b7d27aa5da 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