[Python-modules-commits] [fabulous] 06/15: merge patched into master
Ondřej Nový
onovy at moszumanska.debian.org
Sun Aug 14 10:40:06 UTC 2016
This is an automated email from the git hooks/post-receive script.
onovy pushed a commit to branch master
in repository fabulous.
commit e6d041df57ee0590bc827561aeaa25cee4341137
Merge: 029edf1 a631f40
Author: Ondřej Nový <onovy at debian.org>
Date: Sun Aug 14 11:51:08 2016 +0200
merge patched into master
.hgignore => .gitignore | 5 -
.hgtags | 7 -
.travis.yml | 35 +
AUTHORS | 13 +
CONTRIBUTORS | 11 +
COPYING | 20 -
LICENSE.txt | 202 ++
MANIFEST.in | 10 +
PKG-INFO | 169 --
README | 148 --
README.rst | 18 +
debian/.git-dpm | 6 +-
...ocal-objects.inv-for-intersphinx-mapping.patch} | 4 +-
debian/patches/build_xterm256_ext | 6 +-
debian/patches/fix_except | 47 -
debian/patches/remove_ez_setup | 26 -
debian/patches/series | 4 +-
docs/conf.py | 6 +-
docs/images/fabulous-demo.png | Bin 0 -> 94726 bytes
docs/index.rst | 269 ++-
ez_setup.py | 7 +-
fabulous.egg-info/PKG-INFO | 169 --
fabulous.egg-info/SOURCES.txt | 33 -
fabulous.egg-info/dependency_links.txt | 1 -
fabulous.egg-info/not-zip-safe | 1 -
fabulous.egg-info/requires.txt | 1 -
fabulous.egg-info/top_level.txt | 1 -
fabulous/__init__.py | 18 +-
fabulous/_xterm256.c | 16 +
fabulous/balls.png | Bin 0 -> 54588 bytes
fabulous/casts.py | 42 +
fabulous/color.py | 766 +++++++-
fabulous/compatibility.py | 30 +
fabulous/debug.py | 26 +-
fabulous/demo.py | 194 +-
fabulous/experimental/__init__.py | 13 +
fabulous/experimental/canvas.py | 13 +
fabulous/gotham.py | 54 +-
fabulous/grapefruit.py | 2053 ++++++++++++++++++++
fabulous/image.py | 52 +-
fabulous/logs.py | 34 +-
fabulous/prompt.py | 197 ++
fabulous/queries.py | 22 +
fabulous/rlcomplete.py | 131 ++
fabulous/rotating_cube.py | 35 +-
fabulous/term.py | 933 +++++++++
fabulous/test_transientlogging.py | 29 +-
fabulous/text.py | 205 +-
fabulous/utils.py | 56 +-
fabulous/widget.py | 223 +++
fabulous/xterm256.py | 37 +-
python-fabulous.spec | 65 +
setup.cfg | 5 -
setup.py | 54 +-
tests/casts_test.py | 36 +
tests/doctests.txt | 10 +
tests/manual/clear.py | 19 +
tests/manual/colors.py | 52 +
tests/manual/convulsions.py | 31 +
tests/manual/filechooser.py | 20 +
tests/manual/info.py | 23 +
tests/manual/longtimedprogressbar.py | 32 +
tests/manual/move.py | 32 +
tests/manual/progressbar.py | 36 +
tests/manual/spinner.py | 23 +
tests/manual/timedprogressbar.py | 25 +
tests/manual/title.py | 21 +
tests/rlcomplete_test.py | 40 +
tests/term_test.py | 66 +
update-gh-pages.sh | 35 +
70 files changed, 5950 insertions(+), 1073 deletions(-)
diff --cc debian/.git-dpm
index 35bee5e,0000000..fbb68c1
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
- 412300c7de54e47dd888ca1179bc8f1b0802fb88
- 412300c7de54e47dd888ca1179bc8f1b0802fb88
- 4f996274d5b20a7b59ef19d084aa47e89247322e
++a631f401c3eba33580501fd1e9bf94f54ee2effa
++a631f401c3eba33580501fd1e9bf94f54ee2effa
++36bec92535b9e9cb32d8898aae2cc3c527646fb7
+36bec92535b9e9cb32d8898aae2cc3c527646fb7
+fabulous_0.3.0+dfsg1.orig.tar.gz
+5c2757b58dae9e37837f1ef166ff223eb6c68c72
+203734
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Use-local-objects.inv-for-intersphinx-mapping.patch
index 4022a82,0000000..4c0bc66
mode 100644,000000..100644
--- a/debian/patches/0002-Use-local-objects.inv-for-intersphinx-mapping.patch
+++ b/debian/patches/0002-Use-local-objects.inv-for-intersphinx-mapping.patch
@@@ -1,21 -1,0 +1,21 @@@
- From 412300c7de54e47dd888ca1179bc8f1b0802fb88 Mon Sep 17 00:00:00 2001
++From a631f401c3eba33580501fd1e9bf94f54ee2effa Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ond=C5=99ej=20Nov=C3=BD?= <onovy at debian.org>
+Date: Sun, 14 Aug 2016 11:10:31 +0200
+Subject: Use local objects.inv for intersphinx mapping
+
+---
+ docs/conf.py | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
- index b0af172..3c520d3 100644
++index b97b6ad..d1c1664 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -196,4 +196,6 @@ latex_documents = [
+
+
+ # Example configuration for intersphinx: refer to the Python standard library.
+-intersphinx_mapping = {'http://docs.python.org/': None}
++intersphinx_mapping = {
++ 'python': ('/usr/share/doc/python3-doc/html', None),
++}
diff --cc debian/patches/build_xterm256_ext
index 08ded87,0000000..26fcc2e
mode 100644,000000..100644
--- a/debian/patches/build_xterm256_ext
+++ b/debian/patches/build_xterm256_ext
@@@ -1,32 -1,0 +1,32 @@@
- From 4ee09da74541cdc199bf1884c46411f8b9c1b101 Mon Sep 17 00:00:00 2001
++From 617afccea4564f7dd8a606f9841a9910dfb066ec Mon Sep 17 00:00:00 2001
+From: Simon Chopin <chopin.simon at gmail.com>
+Date: Thu, 8 Oct 2015 09:02:47 -0700
+Subject: Look for the default xterm256.so instead of building one's own
+
+Forwarded: not-needed
+Last-Update: 2013-04-24
+Patch-Name: build_xterm256_ext
+---
+ fabulous/xterm256.py | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/fabulous/xterm256.py b/fabulous/xterm256.py
- index 65ed75f..89eb42d 100644
++index 8561043..cc2d188 100644
+--- a/fabulous/xterm256.py
++++ b/fabulous/xterm256.py
- @@ -80,14 +80,13 @@ def compile_speedup():
++@@ -97,14 +97,13 @@ def compile_speedup():
+ You need:
+
+ - Python >= 2.5 for ctypes library
+- - gcc (``sudo apt-get install gcc``)
+
+ """
+ import os
+ import ctypes
+ from os.path import join, dirname, getmtime, exists, expanduser
+ # library = join(dirname(__file__), '_xterm256.so')
+- library = expanduser('~/.xterm256.so')
++ library = '/usr/lib/fabulous/xtermspeedup.so'
+ sauce = join(dirname(__file__), '_xterm256.c')
+ if not exists(library) or getmtime(sauce) > getmtime(library):
+ build = "gcc -fPIC -shared -o %s %s" % (library, sauce)
diff --cc debian/patches/series
index e1068ea,0000000..ce8ade4
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,0 +1,2 @@@
+build_xterm256_ext
- remove_ez_setup
- fix_except
- 0004-Use-local-objects.inv-for-intersphinx-mapping.patch
++0002-Use-local-objects.inv-for-intersphinx-mapping.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/fabulous.git
More information about the Python-modules-commits
mailing list