[Python-modules-commits] [python-odoorpc] 04/05: merge patched into master
Wolfgang Borgert
debacle at moszumanska.debian.org
Sun Nov 29 00:29:40 UTC 2015
This is an automated email from the git hooks/post-receive script.
debacle pushed a commit to branch master
in repository python-odoorpc.
commit 67ccb37dcc18f94be0f72fc15bf367e6019b1af8
Merge: d6028fa 8bc4a1d
Author: W. Martin Borgert <debacle at debian.org>
Date: Sat Nov 28 01:11:50 2015 +0100
merge patched into master
.travis.yml | 27 +++++++++----
CHANGELOG | 13 ++++++
README.rst | 17 ++++----
bump_version.sh | 9 +++++
debian/.git-dpm | 6 +--
.../0001-replace-remote-GIFs-with-local-ones.patch | 6 +--
doc/source/index.rst | 17 ++++----
doc/source/ref_env.rst | 2 +-
odoorpc/__init__.py | 2 +-
odoorpc/db.py | 10 +++--
odoorpc/env.py | 14 ++++++-
odoorpc/fields.py | 2 +-
odoorpc/models.py | 2 +-
odoorpc/odoo.py | 31 ++++++---------
odoorpc/report.py | 14 ++++---
odoorpc/rpc/__init__.py | 2 +-
odoorpc/rpc/jsonrpclib.py | 12 ++++--
odoorpc/session.py | 2 +-
odoorpc/tests/__init__.py | 10 +++--
odoorpc/tests/test_env.py | 4 ++
odoorpc/tests/test_field_integer.py | 46 +++++++++++-----------
odoorpc/tests/test_field_reference.py | 20 +++++-----
odoorpc/tests/test_report.py | 6 ++-
odoorpc/tests/test_timeout.py | 2 +-
odoorpc/tests/test_workflow.py | 2 +
setup.py | 3 +-
26 files changed, 172 insertions(+), 109 deletions(-)
diff --cc debian/.git-dpm
index 8ca0827,0000000..2e5af3a
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
- b61757d7169b0bad7d44d762d1ff85af455cf916
- b61757d7169b0bad7d44d762d1ff85af455cf916
- 1202b9a1ced24384d0cd6faa5514520ec68c0aba
++8bc4a1d9e8c4f590691626c42f31833a059acb42
++8bc4a1d9e8c4f590691626c42f31833a059acb42
++8b193f3b4d3c8c9b20f0b80ec6ce2ea28df03fbc
+8b193f3b4d3c8c9b20f0b80ec6ce2ea28df03fbc
+python-odoorpc_0.4.1.orig.tar.gz
+9c732d0b116f70a08adf2386c6a0190755be9460
+59645
+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 2a5615f,0000000..9683543
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 b61757d7169b0bad7d44d762d1ff85af455cf916 Mon Sep 17 00:00:00 2001
++From 8bc4a1d9e8c4f590691626c42f31833a059acb42 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 a8e82b1..5b9900f 100644
++index 4910266..636b014 100644
+--- a/doc/source/index.rst
++++ b/doc/source/index.rst
- @@ -109,8 +109,8 @@ support this project, it is possible to make a donation through `PayPal`:
++@@ -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
More information about the Python-modules-commits
mailing list