[Python-modules-commits] [python-axiom] 10/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 29b7dab9a186dadf6ad2db3b097bada862046be4
Merge: 7feff50 7116337
Author: Tristan Seligmann <mithrandi at debian.org>
Date:   Sat Sep 10 17:07:46 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, 3 insertions(+), 26 deletions(-)

diff --cc debian/.git-dpm
index f675d99,0000000..9f284d8
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
- 21610f2932920c703017bc4d44906c5656f6d527
- 21610f2932920c703017bc4d44906c5656f6d527
++71163374b01a6c24653d6e7fa646a9c95dfb3e23
++71163374b01a6c24653d6e7fa646a9c95dfb3e23
 +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/series
index a8a37e1,0000000..6fd328e
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
 +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