[Python-modules-commits] [ujson] 04/10: merge patched into master

[Sandro Tosi]

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

morph pushed a commit to branch master
in repository ujson.

commit 9e65b338f2d471514a6c9743805a3c00640226fa
Merge: 89334d1 24f6d7a
Author: Sandro Tosi <morph at debian.org>
Date:   Sun Jan 17 22:42:26 2016 +0000

    merge patched into master

 MANIFEST.in                                     |   0
 PKG-INFO                                        | 401 +++++-----
 README.rst                                      |  25 +-
 debian/.git-dpm                                 |   6 +-
 debian/patches/0001-dont-remove-build-dir.patch |   4 +-
 lib/ultrajson.h                                 |  73 +-
 lib/ultrajsondec.c                              |  52 +-
 lib/ultrajsonenc.c                              | 115 ++-
 python/JSONtoObj.c                              |  27 +-
 python/objToJSON.c                              | 947 ++++++++++++++----------
 python/py_defines.h                             |  21 +-
 python/ujson.c                                  |   9 +-
 python/version.h                                |  23 +-
 setup.cfg                                       |  10 +-
 setup.py                                        |   0
 tests/sample.json                               |   0
 tests/tests.py                                  | 438 +++++++----
 ujson.egg-info/PKG-INFO                         | 401 +++++-----
 ujson.egg-info/SOURCES.txt                      |   0
 ujson.egg-info/dependency_links.txt             |   0
 ujson.egg-info/top_level.txt                    |   0
 21 files changed, 1512 insertions(+), 1040 deletions(-)

diff --cc debian/.git-dpm
index 2ef0eed,0000000..0320e10
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
- a31beae6598d46bd88a6490ab98b358aeb666726
- a31beae6598d46bd88a6490ab98b358aeb666726
- 628970a053837ab149cfdecd022b5913c8e0d06b
++24f6d7a10b21ab89a5ed90888c8d5b1c0f742408
++24f6d7a10b21ab89a5ed90888c8d5b1c0f742408
++052e70ebfb6cb71249602030bfd4cf5b75d52439
 +052e70ebfb6cb71249602030bfd4cf5b75d52439
 +ujson_1.34.orig.tar.gz
 +bbb21a37e919e0ecfc08adf4e15cc620e978e7e6
 +188643
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-dont-remove-build-dir.patch
index 94eaa30,0000000..40216ef
mode 100644,000000..100644
--- a/debian/patches/0001-dont-remove-build-dir.patch
+++ b/debian/patches/0001-dont-remove-build-dir.patch
@@@ -1,25 -1,0 +1,25 @@@
- From a31beae6598d46bd88a6490ab98b358aeb666726 Mon Sep 17 00:00:00 2001
++From 24f6d7a10b21ab89a5ed90888c8d5b1c0f742408 Mon Sep 17 00:00:00 2001
 +From: Sandro Tosi <morph at debian.org>
 +Date: Wed, 4 Nov 2015 03:21:15 +0000
 +Subject: dont-remove-build-dir
 +
 +---
 + setup.py | 5 -----
 + 1 file changed, 5 deletions(-)
 +
 +diff --git a/setup.py b/setup.py
- index 0bc6985..edd934a 100644
++index 0bc6985..edd934a 100755
 +--- a/setup.py
 ++++ b/setup.py
 +@@ -22,11 +22,6 @@ Programming Language :: Python :: 3
 + Programming Language :: Python :: 3.2
 + """.splitlines()))
 + 
 +-try:
 +-    shutil.rmtree("./build")
 +-except(OSError):
 +-    pass
 +-
 + module1 = Extension('ujson',
 +                     sources = ['./python/ujson.c', 
 +                                './python/objToJSON.c', 

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