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

[Ondřej Nový]

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

onovy-guest pushed a commit to branch master
in repository simplejson.

commit 6de5cdedddda671f7eb41c6430cc6c80bad27b4b
Merge: 7e2eaf0 a236fe4
Author: Ondřej Nový <novy at ondrej.org>
Date:   Thu Apr 14 21:33:56 2016 +0200

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

 CHANGES.txt                     |  9 ++++++++
 PKG-INFO                        |  2 +-
 conf.py                         |  2 +-
 debian/.git-dpm                 | 14 ++++++------
 scripts/artifacts.py            | 48 +++++++++++++++++++++++++++++++++++++++++
 setup.py                        |  2 +-
 simplejson.egg-info/PKG-INFO    |  2 +-
 simplejson.egg-info/SOURCES.txt |  1 +
 simplejson/__init__.py          |  2 +-
 simplejson/_speedups.c          |  2 +-
 10 files changed, 71 insertions(+), 13 deletions(-)

diff --cc debian/.git-dpm
index 1e78f76,0000000..01cc00e
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
- fdf035dd39f923902a7243bdbd8649b72f00a3dd
- fdf035dd39f923902a7243bdbd8649b72f00a3dd
- fdf035dd39f923902a7243bdbd8649b72f00a3dd
- fdf035dd39f923902a7243bdbd8649b72f00a3dd
- simplejson_3.8.1.orig.tar.gz
- 73cc425d34c5bb3fa884982d46753bda39300e26
- 76033
++a236fe4ff484fbba9c65e84fd555cd46dc7227ed
++a236fe4ff484fbba9c65e84fd555cd46dc7227ed
++a236fe4ff484fbba9c65e84fd555cd46dc7227ed
++a236fe4ff484fbba9c65e84fd555cd46dc7227ed
++simplejson_3.8.2.orig.tar.gz
++bdc7526f83172210a2916ea433ecda782d0715de
++76578
 +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