[Python-modules-commits] [fake-factory] 12/13: 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 b1e4149bf46cc5bfc6453b1cabe2bf8119d91c8d
Merge: bfd4daa fbeba5d
Author: Christopher Baines <mail at cbaines.net>
Date:   Sun Feb 7 20:49:16 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, 36 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 20e5d18,0000000..15bab0c
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- e61f45f8cefe1d94551e01fc8ed2a2da047408cd
- e61f45f8cefe1d94551e01fc8ed2a2da047408cd
++fbeba5d84ae427cdeb25ce833b08a5d15a6d7cda
++fbeba5d84ae427cdeb25ce833b08a5d15a6d7cda
 +e61f45f8cefe1d94551e01fc8ed2a2da047408cd
 +e61f45f8cefe1d94551e01fc8ed2a2da047408cd
 +fake-factory_0.5.3.orig.tar.gz
 +c978accad4f98fadfd7a8dfa3cc361c195914079
 +404483
diff --cc debian/patches/0001-Include-the-python-major-version-in-the-console-scri.patch
index 0000000,0000000..5bf3b5b
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Include-the-python-major-version-in-the-console-scri.patch
@@@ -1,0 -1,0 +1,31 @@@
++From fbeba5d84ae427cdeb25ce833b08a5d15a6d7cda Mon Sep 17 00:00:00 2001
++From: Christopher Baines <mail at cbaines.net>
++Date: Sun, 7 Feb 2016 20:48:34 +0000
++Subject: Include the python major version in the console script name
++
++To avoid a conflict between the binary packages.
++---
++ setup.py | 3 ++-
++ 1 file changed, 2 insertions(+), 1 deletion(-)
++
++diff --git a/setup.py b/setup.py
++index d89f76f..ae671f7 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -3,6 +3,7 @@
++ 
++ import os
++ import io
+++import sys
++ from setuptools import setup, find_packages
++ 
++ here = os.path.abspath(os.path.dirname(__file__))
++@@ -28,7 +29,7 @@ setup(
++     description="Faker is a Python package that generates fake data for you.",
++     long_description=README + '\n\n' + NEWS,
++     entry_points={
++-        'console_scripts': ['faker=faker.cli:execute_from_command_line'],
+++        'console_scripts': ['faker%d=faker.cli:execute_from_command_line' % sys.version_info[:1]],
++     },
++     classifiers=[
++         # See https://pypi.python.org/pypi?%3Aaction=list_classifiers
diff --cc debian/patches/series
index 0000000,0000000..d9df657
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Include-the-python-major-version-in-the-console-scri.patch

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