[Python-modules-commits] [pythondialog] 04/06: merge patched into master

[Tristan Seligmann]

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

mithrandi pushed a commit to branch master
in repository pythondialog.

commit a391d75d9f6b1bb6ce219aee12642c0a7bf55afc
Merge: f05d019 a90d985
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Thu Jun 23 23:01:17 2016 +0200

    merge patched into master

 ChangeLog                                          |  55 ++++++++++++++
 PKG-INFO                                           |  17 +++--
 README.rst                                         |  13 ++--
 debian/.git-dpm                                    |   6 +-
 .../use-local-python3-doc-for-cross-references     |   6 +-
 dialog.py                                          |  79 ++++++++++++++++++++-
 doc/conf.py                                        |   9 ++-
 doc/screenshots/snapshots.debian.net/buildlist.png | Bin 54845 -> 0 bytes
 doc/screenshots/snapshots.debian.net/calendar.png  | Bin 28331 -> 0 bytes
 doc/screenshots/snapshots.debian.net/checklist.png | Bin 23278 -> 0 bytes
 doc/screenshots/snapshots.debian.net/editbox.png   | Bin 49883 -> 0 bytes
 doc/screenshots/snapshots.debian.net/form.png      | Bin 44187 -> 0 bytes
 doc/screenshots/snapshots.debian.net/fselect.png   | Bin 26774 -> 0 bytes
 doc/screenshots/snapshots.debian.net/inputbox.png  | Bin 13036 -> 0 bytes
 doc/screenshots/snapshots.debian.net/menu.png      | Bin 59289 -> 0 bytes
 doc/screenshots/snapshots.debian.net/msgbox.png    | Bin 36198 -> 0 bytes
 .../snapshots.debian.net/passwordbox.png           | Bin 12762 -> 0 bytes
 doc/screenshots/snapshots.debian.net/radiolist.png | Bin 30790 -> 0 bytes
 doc/screenshots/snapshots.debian.net/scrollbox.png | Bin 43274 -> 0 bytes
 doc/screenshots/snapshots.debian.net/treeview.png  | Bin 43748 -> 0 bytes
 doc/screenshots/snapshots.debian.net/yesno.png     | Bin 13806 -> 0 bytes
 doc/widgets.rst                                    |   2 +
 examples/demo.py                                   |  22 ++++--
 examples/with-autowidgetsize/demo.py               |  22 ++++--
 24 files changed, 200 insertions(+), 31 deletions(-)

diff --cc debian/.git-dpm
index e1ea73a,0000000..40718ce
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
- f519a948173bfd4e9700a4ebc60bc54bf3455018
- f519a948173bfd4e9700a4ebc60bc54bf3455018
- 5c6fded8c72aa64304ec6fe01c2bc6dca4452535
++a90d985ce6a7ab9e1fb5f22d2505c5f971b8954c
++a90d985ce6a7ab9e1fb5f22d2505c5f971b8954c
++9049159d92c34ae67dbb3693648ce0fbe0b22041
 +9049159d92c34ae67dbb3693648ce0fbe0b22041
 +pythondialog_3.4.0.orig.tar.bz2
 +b1f754f28fb87de0d274c88df9d5dc523694d3f4
 +1415324
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/use-local-python3-doc-for-cross-references
index 50b2559,0000000..f7d68a6
mode 100644,000000..100644
--- a/debian/patches/use-local-python3-doc-for-cross-references
+++ b/debian/patches/use-local-python3-doc-for-cross-references
@@@ -1,27 -1,0 +1,27 @@@
- From f519a948173bfd4e9700a4ebc60bc54bf3455018 Mon Sep 17 00:00:00 2001
++From a90d985ce6a7ab9e1fb5f22d2505c5f971b8954c Mon Sep 17 00:00:00 2001
 +From: Florent Rougon <f.rougon at free.fr>
 +Date: Thu, 8 Oct 2015 13:28:35 -0700
 +Subject: Use local doc from python3-doc for cross references
 +
 +Forwarded: not-needed
 +Last-Update: 2014-10-17
 +
 +Patch-Name: use-local-python3-doc-for-cross-references
 +---
 + doc/conf.py | 3 ++-
 + 1 file changed, 2 insertions(+), 1 deletion(-)
 +
 +diff --git a/doc/conf.py b/doc/conf.py
- index 728397d..18461c9 100644
++index f6544a5..4b0f4fb 100644
 +--- a/doc/conf.py
 ++++ b/doc/conf.py
- @@ -35,7 +35,8 @@ extensions = [
++@@ -41,7 +41,8 @@ extensions = [
 +     'sphinx.ext.viewcode',
 + ]
 + 
 +-intersphinx_mapping = {'python': ('http://docs.python.org/3', None)}
 ++intersphinx_mapping = {'python': ('file:///usr/share/doc/python3/html',
 ++                                  '/usr/share/doc/python3/html/objects.inv')}
 + 
 + # Add any paths that contain templates here, relative to this directory.
 + templates_path = ['_templates']

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