[Python-modules-commits] [fake-factory] 09/17: merge patched into master

[Christopher Baines]

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

cbaines-guest pushed a commit to branch master
in repository fake-factory.

commit 6cc434b98d1d721821b0d780046744ace788e535
Merge: 6f9efe4 e61f45f
Author: Christopher Baines <mail at cbaines.net>
Date:   Sat Mar 19 16:30:09 2016 +0000

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 ...-python-major-version-in-the-console-scri.patch | 31 ----------------------
 debian/patches/series                              |  1 -
 setup.py                                           |  3 +--
 4 files changed, 3 insertions(+), 36 deletions(-)

diff --cc debian/.git-dpm
index 6ae4922,0000000..adf4e37
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
- fbeba5d84ae427cdeb25ce833b08a5d15a6d7cda
- fbeba5d84ae427cdeb25ce833b08a5d15a6d7cda
++e61f45f8cefe1d94551e01fc8ed2a2da047408cd
++e61f45f8cefe1d94551e01fc8ed2a2da047408cd
 +e61f45f8cefe1d94551e01fc8ed2a2da047408cd
 +e61f45f8cefe1d94551e01fc8ed2a2da047408cd
 +fake-factory_0.5.3.orig.tar.gz
 +c978accad4f98fadfd7a8dfa3cc361c195914079
 +404483
 +debianTag="debian/%e%v"
 +patchedTag="patches/%e%v"
 +upstreamTag="upstream/%e%u"

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