[Python-modules-commits] [python-axiom] 09/16: 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 python-axiom.

commit 7feff5056128c21b40349e41cc500869a0f0df09
Merge: dfd59c5 21610f2
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Sat Sep 10 17:06:28 2016 +0200

    merge patched into master

 MANIFEST.in                                        |  1 -
 debian/.git-dpm                                    |  4 ++--
 ...-Stop-installing-examples-with-setuptools.patch | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 9f284d8,0000000..f675d99
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
- 71163374b01a6c24653d6e7fa646a9c95dfb3e23
- 71163374b01a6c24653d6e7fa646a9c95dfb3e23
++21610f2932920c703017bc4d44906c5656f6d527
++21610f2932920c703017bc4d44906c5656f6d527
 +9fba2622ce4ed3c88d401dbd4aa56ab9444f5c63
 +9fba2622ce4ed3c88d401dbd4aa56ab9444f5c63
 +python-axiom_0.7.5.orig.tar.gz
 +1678d81871e2c2d75938d7bc546e55c7c78123b4
 +203526
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Stop-installing-examples-with-setuptools.patch
index 0000000,0000000..e97366c
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Stop-installing-examples-with-setuptools.patch
@@@ -1,0 -1,0 +1,23 @@@
++From 21610f2932920c703017bc4d44906c5656f6d527 Mon Sep 17 00:00:00 2001
++From: Tristan Seligmann <mithrandi at debian.org>
++Date: Sat, 10 Sep 2016 17:05:44 +0200
++Subject: Stop installing examples with setuptools.
++
++These are shipped separately in the Debian package, we don't need to
++install them to the package directory.
++
++Author: Tristan Seligmann <mithrandi at debian.org>
++Forwarded: not-needed
++---
++ MANIFEST.in | 1 -
++ 1 file changed, 1 deletion(-)
++
++diff --git a/MANIFEST.in b/MANIFEST.in
++index bf0c542..64c471f 100644
++--- a/MANIFEST.in
+++++ b/MANIFEST.in
++@@ -2,4 +2,3 @@ include LICENSE
++ include NAME.txt
++ recursive-include axiom/test/historic *.tbz2
++ include axiom/batch.tac
++-graft axiom/examples
diff --cc debian/patches/series
index 6fd328e,0000000..a8a37e1
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-Remove-post-install-plugin-cache-regeneration.patch
++0002-Stop-installing-examples-with-setuptools.patch

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