[Python-modules-commits] [python-odoorpc] 05/06: merge patched into master

[Wolfgang Borgert]

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

debacle pushed a commit to branch master
in repository python-odoorpc.

commit cf749b6001e5218e967864f43ee20aa3dfa7bbb2
Merge: e074c5e d137998
Author: W. Martin Borgert <debacle at debian.org>
Date:   Sun Jan 22 13:26:23 2017 +0000

    merge patched into master

 .travis.yml                                        | 13 +++---
 CHANGELOG                                          | 21 ++++++++++
 README.rst                                         |  4 +-
 debian/.git-dpm                                    |  6 +--
 .../0001-replace-remote-GIFs-with-local-ones.patch |  4 +-
 doc/source/conf.py                                 |  5 ++-
 doc/source/download_install.rst                    |  2 +-
 doc/source/faq.rst                                 | 12 +++---
 doc/source/index.rst                               |  6 +--
 doc/source/tuto_browse.rst                         |  4 +-
 doc/source/tuto_browse_methods.rst                 |  2 +-
 doc/source/tuto_browse_update.rst                  | 47 +++++++++++----------
 doc/source/tuto_login.rst                          |  8 ++--
 doc/source/tuto_report.rst                         | 10 ++---
 doc/source/tuto_rpc_queries.rst                    |  4 +-
 doc/source/tuto_session.rst                        |  2 +-
 doc/source/tutorials.rst                           |  5 +++
 odoorpc/__init__.py                                |  2 +-
 odoorpc/error.py                                   | 15 +++++--
 odoorpc/models.py                                  |  4 ++
 odoorpc/odoo.py                                    | 13 +++---
 odoorpc/rpc/__init__.py                            | 49 ++++++++++++++++------
 odoorpc/session.py                                 |  4 +-
 odoorpc/tests/__init__.py                          | 16 ++++---
 odoorpc/tests/test_db.py                           |  1 +
 odoorpc/tests/test_field_binary.py                 | 38 +++++++++++++++++
 odoorpc/tests/test_field_many2many.py              | 47 +++++++++++----------
 odoorpc/tests/test_field_reference.py              | 44 ++++++++++++-------
 odoorpc/tests/test_init.py                         | 10 +++++
 setup.py                                           |  2 +-
 30 files changed, 270 insertions(+), 130 deletions(-)

diff --cc debian/.git-dpm
index 983fd68,0000000..2864593
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
- 8bc4a1d9e8c4f590691626c42f31833a059acb42
- 8bc4a1d9e8c4f590691626c42f31833a059acb42
- 8b193f3b4d3c8c9b20f0b80ec6ce2ea28df03fbc
++d137998470fed7dce8a62afe681172ba02c7caea
++d137998470fed7dce8a62afe681172ba02c7caea
++30a2f6f1f9bab0404ebcb9347711f70b56afa68e
 +30a2f6f1f9bab0404ebcb9347711f70b56afa68e
 +python-odoorpc_0.5.1.orig.tar.gz
 +29e6f1895727006bf31654aab2f1b16f62bd5185
 +61058
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-replace-remote-GIFs-with-local-ones.patch
index 9683543,0000000..560efcb
mode 100644,000000..100644
--- a/debian/patches/0001-replace-remote-GIFs-with-local-ones.patch
+++ b/debian/patches/0001-replace-remote-GIFs-with-local-ones.patch
@@@ -1,26 -1,0 +1,26 @@@
- From 8bc4a1d9e8c4f590691626c42f31833a059acb42 Mon Sep 17 00:00:00 2001
++From d137998470fed7dce8a62afe681172ba02c7caea Mon Sep 17 00:00:00 2001
 +From: "W. Martin Borgert" <debacle at debian.org>
 +Date: Mon, 12 Oct 2015 00:14:38 +0200
 +Subject: replace remote GIFs with local ones
 +
 +Origin: vendor
 +Last-Update: 2014-10-25
 +---
 + doc/source/index.rst | 4 ++--
 + 1 file changed, 2 insertions(+), 2 deletions(-)
 +
 +diff --git a/doc/source/index.rst b/doc/source/index.rst
- index 4910266..636b014 100644
++index c04bb86..eeb0831 100644
 +--- a/doc/source/index.rst
 ++++ b/doc/source/index.rst
 +@@ -110,8 +110,8 @@ support this project, it is possible to make a donation through `PayPal`:
 +         <form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
 +             <input type="hidden" name="cmd" value="_s-xclick">
 +             <input type="hidden" name="hosted_button_id" value="RCVMUNS5LK5K6">
 +-            <input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donate_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
 +-            <img alt="" border="0" src="https://www.paypalobjects.com/fr_FR/i/scr/pixel.gif" width="1" height="1">
 ++            <input type="image" src="btn_donate_LG.gif" border="0" name="submit" alt="PayPal - The safer, easier way to pay online!">
 ++            <img alt="" border="0" src="pixel.gif" width="1" height="1">
 +         </form>
 +     </div>
 + 

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