[Python-modules-commits] [simplejson] 02/07: record new upstream branch created by importing simplejson_3.12.0.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 a0096fe87c71d0f33e3a1a8a79d3a8db36934065
Merge: 4590a74 9aad395
Author: Piotr Ożarowski <piotr at debian.org>
Date:   Mon Nov 13 21:47:17 2017 +0100

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

 CHANGES.txt                     |  9 ++++++-
 PKG-INFO                        |  2 +-
 conf.py                         |  4 ++--
 debian/.git-dpm                 | 14 +++++------
 setup.py                        |  4 ++--
 simplejson.egg-info/PKG-INFO    |  2 +-
 simplejson.egg-info/SOURCES.txt |  2 ++
 simplejson/__init__.py          |  9 +++----
 simplejson/_speedups.c          | 42 ++++++++++++++++----------------
 simplejson/encoder.py           | 11 ++-------
 simplejson/errors.py            | 53 +++++++++++++++++++++++++++++++++++++++++
 simplejson/raw_json.py          |  9 +++++++
 simplejson/scanner.py           | 52 ++--------------------------------------
 13 files changed, 115 insertions(+), 98 deletions(-)

diff --cc debian/.git-dpm
index 05abcb2,0000000..5926d44
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
- ef376a1883d20da067c78a1a2397cbef3b098551
- ef376a1883d20da067c78a1a2397cbef3b098551
- ef376a1883d20da067c78a1a2397cbef3b098551
- ef376a1883d20da067c78a1a2397cbef3b098551
- simplejson_3.11.1.orig.tar.gz
- cc963d0a59d5250ed2a6c09e2c787c513348e786
- 78145
++9aad39531ba75eb24ca6e3ca3c33f2ade48cd084
++9aad39531ba75eb24ca6e3ca3c33f2ade48cd084
++9aad39531ba75eb24ca6e3ca3c33f2ade48cd084
++9aad39531ba75eb24ca6e3ca3c33f2ade48cd084
++simplejson_3.12.0.orig.tar.gz
++0de9e43973a315c98b7308c65416d4bae6074cc4
++77969
 +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