[Python-modules-commits] [simplejson] 02/03: record new upstream branch created by importing simplejson_3.8.1.orig.tar.gz and merge it

[Piotr Ożarowski]

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

piotr pushed a commit to branch master
in repository simplejson.

commit 7b5f669e491311fb91183fc4977dc4b3613fe836
Merge: 0d04a90 fdf035d
Author: Piotr Ożarowski <piotr at debian.org>
Date:   Sun Dec 27 10:20:39 2015 +0100

    record new upstream branch created by importing simplejson_3.8.1.orig.tar.gz and merge it

 CHANGES.txt                       | 12 ++++++++++++
 PKG-INFO                          |  2 +-
 conf.py                           |  4 ++--
 debian/.git-dpm                   | 14 +++++++-------
 index.rst                         | 28 +++++++++++++++++++++++++---
 setup.py                          |  2 +-
 simplejson.egg-info/PKG-INFO      |  2 +-
 simplejson.egg-info/SOURCES.txt   |  1 +
 simplejson/__init__.py            | 31 +++++++++++++++++++++----------
 simplejson/_speedups.c            | 20 ++++++++++++++++----
 simplejson/encoder.py             | 35 ++++++++++++++++++++++++++++-------
 simplejson/tests/__init__.py      |  1 +
 simplejson/tests/test_iterable.py | 31 +++++++++++++++++++++++++++++++
 simplejson/tests/test_tuple.py    |  4 ----
 14 files changed, 147 insertions(+), 40 deletions(-)

diff --cc debian/.git-dpm
index ba6dd75,0000000..1e78f76
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
- 3ced9412a3258b644bc8652bfc3482392014d59d
- 3ced9412a3258b644bc8652bfc3482392014d59d
- 3ced9412a3258b644bc8652bfc3482392014d59d
- 3ced9412a3258b644bc8652bfc3482392014d59d
- simplejson_3.7.3.orig.tar.gz
- ac62202f9101100d8a28cb19862fac68e008931d
- 74974
++fdf035dd39f923902a7243bdbd8649b72f00a3dd
++fdf035dd39f923902a7243bdbd8649b72f00a3dd
++fdf035dd39f923902a7243bdbd8649b72f00a3dd
++fdf035dd39f923902a7243bdbd8649b72f00a3dd
++simplejson_3.8.1.orig.tar.gz
++73cc425d34c5bb3fa884982d46753bda39300e26
++76033
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"

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