[Python-modules-commits] [python-cement] 02/06: merge patched into master

[Michael Fladischer]

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

fladi pushed a commit to branch master
in repository python-cement.

commit c13291c5b1c0c515cbdb88a0f00d54777a86c23d
Merge: b239218 61784ba
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date:   Tue Jul 12 10:30:57 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 .../0003-Do-not-install-examples-package.patch     | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 setup.py                                           |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index c4e0854,0000000..3a76c77
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
- 36c633c0cfa25d9f9ef65c6b6e264d647f1ecf69
- 36c633c0cfa25d9f9ef65c6b6e264d647f1ecf69
++61784ba9ca4fac6a63f00dfb82a4d15b57187f99
++61784ba9ca4fac6a63f00dfb82a4d15b57187f99
 +71b6945457b2a54e3bbda057f92942fcadb82305
 +71b6945457b2a54e3bbda057f92942fcadb82305
 +python-cement_2.8.2.orig.tar.gz
 +ec56a0785c21c41bc0bce39abc1021a0ecafe8af
 +165697
diff --cc debian/patches/0003-Do-not-install-examples-package.patch
index 0000000,0000000..78690ef
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-Do-not-install-examples-package.patch
@@@ -1,0 -1,0 +1,22 @@@
++From 61784ba9ca4fac6a63f00dfb82a4d15b57187f99 Mon Sep 17 00:00:00 2001
++From: Michael Fladischer <FladischerMichael at fladi.at>
++Date: Tue, 12 Jul 2016 10:30:37 +0200
++Subject: Do not install examples package.
++
++---
++ setup.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/setup.py b/setup.py
++index d1318e7..784988c 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -40,7 +40,7 @@ setup(name='cement',
++     author_email='team at datafolklabs.com',
++     url='http://builtoncement.org',
++     license='BSD',
++-    packages=find_packages(exclude=['ez_setup', 'tests*']),
+++    packages=find_packages(exclude=['ez_setup', 'tests*', 'examples*']),
++     include_package_data=True,
++     zip_safe=False,
++     test_suite='nose.collector',
diff --cc debian/patches/series
index d515b82,0000000..e15ee3f
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +0001-Remove-badges-and-mailinglist-signup-form-from-docum.patch
 +0002-Don-t-use-license-text-in-documentation.patch
++0003-Do-not-install-examples-package.patch

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