[Python-modules-commits] [python-qtawesome] 06/09: merge patched into master

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch master
in repository python-qtawesome.

commit 82c89fc4c8777c7f11ae447ec2f30d9434093262
Merge: 37645a3 bd70c9f
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Thu Mar 16 12:49:21 2017 +0000

    merge patched into master

 CHANGELOG.md                                       | 14 ++++
 MANIFEST.in                                        |  1 +
 PKG-INFO                                           |  2 +-
 QtAwesome.egg-info/PKG-INFO                        |  2 +-
 QtAwesome.egg-info/SOURCES.txt                     |  4 +-
 debian/.git-dpm                                    |  6 +-
 ...ntersphinx-link-with-system-documentation.patch |  2 +-
 debian/patches/0002-Use-system-fonts.patch         |  6 +-
 qtawesome/_version.py                              |  2 +-
 qtawesome/iconic_font.py                           | 92 ++++++++++++----------
 qtawesome/tests/test_qtawesome.py                  | 16 ++++
 11 files changed, 95 insertions(+), 52 deletions(-)

diff --cc debian/.git-dpm
index 10a91b7,0000000..e3391c5
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
- a699b9288646c00802eaaa95c0d1e353decd6364
- a699b9288646c00802eaaa95c0d1e353decd6364
- 503eba56b88b7cb3cd3930dbb13ccc91ce5057ff
++bd70c9f1881f0a3bede47757db183a7a2ddc7cff
++bd70c9f1881f0a3bede47757db183a7a2ddc7cff
++1852c97f07a08c89330741387f9ea36dee74a8bf
 +1852c97f07a08c89330741387f9ea36dee74a8bf
 +python-qtawesome_0.4.4+ds1.orig.tar.gz
 +528605f1d2ba0e760508b73153d9bd45da88283e
 +158896
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Make-intersphinx-link-with-system-documentation.patch
index 76aafca,0000000..113f773
mode 100644,000000..100644
--- a/debian/patches/0001-Make-intersphinx-link-with-system-documentation.patch
+++ b/debian/patches/0001-Make-intersphinx-link-with-system-documentation.patch
@@@ -1,19 -1,0 +1,19 @@@
- From 797dd345de78a16bd7cf50b38cbabc4f494554d4 Mon Sep 17 00:00:00 2001
++From f63f0017409f13b480f535e07be54671f2a15048 Mon Sep 17 00:00:00 2001
 +From: Ghislain Antony Vaillant <ghisvail at gmail.com>
 +Date: Mon, 11 Jul 2016 15:12:19 +0100
 +Subject: Make intersphinx link with system documentation
 +
 +---
 + docs/source/conf.py | 2 +-
 + 1 file changed, 1 insertion(+), 1 deletion(-)
 +
 +diff --git a/docs/source/conf.py b/docs/source/conf.py
 +index e6196af..d6a0986 100644
 +--- a/docs/source/conf.py
 ++++ b/docs/source/conf.py
 +@@ -310,4 +310,4 @@ texinfo_documents = [
 + 
 + 
 + # Example configuration for intersphinx: refer to the Python standard library.
 +-intersphinx_mapping = {'https://docs.python.org/': None}
 ++intersphinx_mapping = {'https://docs.python.org/': '/usr/share/doc/python3/html/objects.inv'}
diff --cc debian/patches/0002-Use-system-fonts.patch
index 2ceb24a,0000000..9da1830
mode 100644,000000..100644
--- a/debian/patches/0002-Use-system-fonts.patch
+++ b/debian/patches/0002-Use-system-fonts.patch
@@@ -1,22 -1,0 +1,22 @@@
- From a699b9288646c00802eaaa95c0d1e353decd6364 Mon Sep 17 00:00:00 2001
++From bd70c9f1881f0a3bede47757db183a7a2ddc7cff Mon Sep 17 00:00:00 2001
 +From: Ghislain Antony Vaillant <ghisvail at gmail.com>
 +Date: Mon, 23 Jan 2017 23:31:11 +0000
 +Subject: Use system fonts
 +
 +---
 + qtawesome/iconic_font.py | 2 +-
 + 1 file changed, 1 insertion(+), 1 deletion(-)
 +
 +diff --git a/qtawesome/iconic_font.py b/qtawesome/iconic_font.py
- index 597bd59..704d957 100644
++index af67000..0ab618e 100644
 +--- a/qtawesome/iconic_font.py
 ++++ b/qtawesome/iconic_font.py
- @@ -28,7 +28,7 @@ from six import unichr
++@@ -30,7 +30,7 @@ from six import unichr
 + 
 + # Linux packagers, please set this to True if you want to make qtawesome
 + # use system fonts
 +-SYSTEM_FONTS = False
 ++SYSTEM_FONTS = True
 + 
 + 
 + _default_options = {

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