[Python-modules-commits] [python-axiom] 12/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 9d5675aaa729a1e0556d6bd47d8f360a0e54e6ac
Merge: 29b7dab 7c1d2c2
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Sat Sep 10 17:10:02 2016 +0200

    merge patched into master

 MANIFEST.in                              |  2 +-
 debian/.git-dpm                          |  4 ++--
 debian/patches/0002-Prune-examples.patch | 24 ++++++++++++++++++++++++
 debian/patches/series                    |  1 +
 4 files changed, 28 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 9f284d8,0000000..5eb3308
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
++7c1d2c23794c78462d0c6a2773e0437b981be346
++7c1d2c23794c78462d0c6a2773e0437b981be346
 +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-Prune-examples.patch
index 0000000,0000000..a3f1249
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Prune-examples.patch
@@@ -1,0 -1,0 +1,24 @@@
++From 7c1d2c23794c78462d0c6a2773e0437b981be346 Mon Sep 17 00:00:00 2001
++From: Tristan Seligmann <mithrandi at debian.org>
++Date: Sat, 10 Sep 2016 17:09:28 +0200
++Subject: Prune examples.
++
++We ship these separately in the Debian package, so no need to install
++them into the Python package directory.
++
++Author: Tristan Seligmann <mithrandi at debian.org>
++Forwarded: not-needed
++---
++ MANIFEST.in | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/MANIFEST.in b/MANIFEST.in
++index bf0c542..cecc722 100644
++--- a/MANIFEST.in
+++++ b/MANIFEST.in
++@@ -2,4 +2,4 @@ include LICENSE
++ include NAME.txt
++ recursive-include axiom/test/historic *.tbz2
++ include axiom/batch.tac
++-graft axiom/examples
+++prune axiom/examples
diff --cc debian/patches/series
index 6fd328e,0000000..604c27c
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-Prune-examples.patch

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