[Python-modules-commits] [python-pygraphviz] 04/12: merge patched into master

[Sandro Tosi]

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

morph pushed a commit to branch master
in repository python-pygraphviz.

commit 2f50ab03c02ee3ea2f84c5befc52719142273137
Merge: 11322e4 2ede535
Author: Sandro Tosi <morph at debian.org>
Date:   Sun Jan 3 01:09:20 2016 +0000

    merge patched into master

 INSTALL.txt                              |  18 +-
 LICENSE                                  |  34 ++++
 MANIFEST.in                              |  13 +-
 Makefile                                 |  14 ++
 PKG-INFO                                 |   6 +-
 README.txt => README.rst                 |   2 +-
 debian/.git-dpm                          |   6 +-
 debian/patches/dont_install_data.patch   |  10 +-
 doc/source/index.rst                     |   1 +
 doc/source/reference/news.rst            |  12 +-
 doc/source/static/contents.png           | Bin 0 -> 202 bytes
 doc/source/static/navigation.png         | Bin 0 -> 218 bytes
 doc/source/static/sphinxdoc.css          | 328 +++++++++++++++++++++++++++++++
 PKG-INFO => pygraphviz.egg-info/PKG-INFO |   6 +-
 pygraphviz.egg-info/SOURCES.txt          |  70 +++++++
 pygraphviz.egg-info/dependency_links.txt |   1 +
 pygraphviz.egg-info/top_level.txt        |   1 +
 pygraphviz/__init__.py                   |   5 +-
 pygraphviz/agraph.py                     |  57 +++---
 pygraphviz/graphviz.i                    | 302 ++++++++++++++++++++++++++++
 pygraphviz/graphviz.py                   |   2 +-
 pygraphviz/graphviz_wrap.c               |  16 +-
 pygraphviz/release.py                    |   7 +-
 pygraphviz/tests/test_clear.py           |  31 +++
 pygraphviz/tests/test_edge_attributes.py |  23 +++
 pygraphviz/tests/test_graph.py           |   2 +-
 pygraphviz/tests/test_node_attributes.py |  23 +++
 pygraphviz/tests/test_string.py          |   7 +-
 pygraphviz/tests/test_subgraph.py        |  15 ++
 pygraphviz/version.py                    |   4 +-
 pystrings.swg                            |  86 ++++++++
 setup.cfg                                |  21 +-
 setup.py                                 | 127 +++---------
 setup_commands.py                        |  65 ++++++
 setup_egg.py                             |  61 ------
 setup_extra.py                           | 165 ++++++++++++----
 tox.ini                                  |   9 +
 37 files changed, 1277 insertions(+), 273 deletions(-)

diff --cc debian/.git-dpm
index 52ce367,0000000..1cc7d3b
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
- efdfa1143690468e8672e8e70a2be5723d807cad
- efdfa1143690468e8672e8e70a2be5723d807cad
- 8db6874aee55f61b913a65d8b4b53b6c781cdcde
++2ede535d2e2d7ea31f47e0cd55efd74fb3c59da2
++2ede535d2e2d7ea31f47e0cd55efd74fb3c59da2
++52fefaeba987b9d80c1473e9431c06b160ea3af4
 +52fefaeba987b9d80c1473e9431c06b160ea3af4
 +python-pygraphviz_1.3.1.orig.tar.gz
 +1ecd96727d0c160e1d00519c56dc4672af929ca7
 +103336
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/dont_install_data.patch
index d279ab9,0000000..3f44e41
mode 100644,000000..100644
--- a/debian/patches/dont_install_data.patch
+++ b/debian/patches/dont_install_data.patch
@@@ -1,22 -1,0 +1,22 @@@
- From efdfa1143690468e8672e8e70a2be5723d807cad Mon Sep 17 00:00:00 2001
++From 2ede535d2e2d7ea31f47e0cd55efd74fb3c59da2 Mon Sep 17 00:00:00 2001
 +From: SVN-Git Migration <python-modules-team at lists.alioth.debian.org>
 +Date: Thu, 8 Oct 2015 12:46:32 -0700
 +Subject: dont_install_data
 +
 +Patch-Name: dont_install_data.patch
 +---
 + setup.py | 1 -
 + 1 file changed, 1 deletion(-)
 +
 +diff --git a/setup.py b/setup.py
- index 235307d..fb8c692 100644
++index fc0a96f..cde50c4 100644
 +--- a/setup.py
 ++++ b/setup.py
- @@ -147,7 +147,6 @@ if __name__ == "__main__":
++@@ -75,7 +75,6 @@ if __name__ == "__main__":
 +         download_url=release.download_url,
 +         classifiers=release.classifiers,
 +         packages=packages,
 +-        data_files=data,
 +         ext_modules=extension,
-          package_data=package_data
-      )
++         cmdclass={
++             'install': AddExtensionInstallCommand,

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