diff options
| author | Tony Garnock-Jones <tonyg@lshift.net> | 2008-12-02 16:43:56 +0000 |
|---|---|---|
| committer | Tony Garnock-Jones <tonyg@lshift.net> | 2008-12-02 16:43:56 +0000 |
| commit | 7949ac7cbb8587a54fb16bf97e877d08533f9b84 (patch) | |
| tree | d4d49d3fe270ab39945cfda96ef16fb80cd9071b | |
| parent | bfd5cd9845bb9d75ae29b8c2f125e0ebba843c85 (diff) | |
| parent | efdd39fbdaa819c4a2fe8e7083978fd3c25b1565 (diff) | |
| download | rabbitmq-server-7949ac7cbb8587a54fb16bf97e877d08533f9b84.tar.gz | |
merged bug19841 into default
| -rw-r--r-- | codegen.py | 3 | ||||
| -rw-r--r-- | packaging/RPMS/Fedora/rabbitmq-server.spec | 2 | ||||
| -rw-r--r-- | packaging/debs/Debian/debian/control | 2 |
3 files changed, 4 insertions, 3 deletions
@@ -58,7 +58,8 @@ erlangDefaultValueTypeConvMap = { str : lambda x: "<<\"" + x + "\">>", int : lambda x: str(x), float : lambda x: str(x), - dict: convertTable + dict: convertTable, + unicode: lambda x: "<<\"" + x.encode("utf-8") + "\">>" } def erlangize(s): diff --git a/packaging/RPMS/Fedora/rabbitmq-server.spec b/packaging/RPMS/Fedora/rabbitmq-server.spec index 23ebecef..9067a844 100644 --- a/packaging/RPMS/Fedora/rabbitmq-server.spec +++ b/packaging/RPMS/Fedora/rabbitmq-server.spec @@ -11,7 +11,7 @@ URL: http://www.rabbitmq.com/ Vendor: LShift Ltd., Cohesive Financial Technologies LLC., Rabbit Technlogies Ltd. %if 0%{?debian} %else -BuildRequires: erlang, python-json +BuildRequires: erlang, python-simplejson %endif Requires: erlang, logrotate Packager: Hubert Plociniczak <hubert@lshift.net> diff --git a/packaging/debs/Debian/debian/control b/packaging/debs/Debian/debian/control index a0d858be..f6761713 100644 --- a/packaging/debs/Debian/debian/control +++ b/packaging/debs/Debian/debian/control @@ -2,7 +2,7 @@ Source: rabbitmq-server Section: net Priority: extra Maintainer: Tony Garnock-Jones <tonyg@rabbitmq.com> -Build-Depends: cdbs, debhelper (>= 5), erlang-nox, erlang-dev, python-json +Build-Depends: cdbs, debhelper (>= 5), erlang-nox, erlang-dev, python-simplejson Standards-Version: 3.7.2 Package: rabbitmq-server |