[Python-modules-commits] [simplejson] 02/04: record new upstream branch created by importing simplejson_3.11.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 18db983ea400a535cb8a2d3227bd6dd6ab4a4c09
Merge: d49b237 ef376a1
Author: Piotr Ożarowski <piotr at debian.org>
Date:   Thu Jun 22 22:34:57 2017 +0200

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

 CHANGES.txt                            |  28 +++++
 PKG-INFO                               |   4 +-
 conf.py                                |   6 +-
 debian/.git-dpm                        |  14 +--
 index.rst                              |   2 +-
 scripts/artifacts.py                   |   2 -
 scripts/make_docs.py                   |   1 -
 setup.py                               |   4 +-
 simplejson.egg-info/PKG-INFO           |   4 +-
 simplejson/__init__.py                 |   2 +-
 simplejson/_speedups.c                 | 214 ++++++++++++++-------------------
 simplejson/decoder.py                  |   8 +-
 simplejson/encoder.py                  |   2 +-
 simplejson/ordered_dict.py             |  18 +--
 simplejson/tests/__init__.py           |  38 ++----
 simplejson/tests/test_item_sort_key.py |   7 ++
 simplejson/tests/test_speedups.py      |  53 +++++++-
 17 files changed, 211 insertions(+), 196 deletions(-)

diff --cc debian/.git-dpm
index 215b280,0000000..05abcb2
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
- bde323c3b6be4d4a636c4050389953ba6d8cd260
- bde323c3b6be4d4a636c4050389953ba6d8cd260
- bde323c3b6be4d4a636c4050389953ba6d8cd260
- bde323c3b6be4d4a636c4050389953ba6d8cd260
- simplejson_3.10.0.orig.tar.gz
- dffc85c6851430578acf138c2a1193bc89a3eb0f
- 77953
++ef376a1883d20da067c78a1a2397cbef3b098551
++ef376a1883d20da067c78a1a2397cbef3b098551
++ef376a1883d20da067c78a1a2397cbef3b098551
++ef376a1883d20da067c78a1a2397cbef3b098551
++simplejson_3.11.1.orig.tar.gz
++cc963d0a59d5250ed2a6c09e2c787c513348e786
++78145
 +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