[Python-modules-commits] [python-confluent-kafka] 05/05: merge patched into master

[Christos Trochalakis]

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

ctrochalakis-guest pushed a commit to branch master
in repository python-confluent-kafka.

commit 491d950394c584e42baf8045a9a85d436e7edcc6
Merge: db7389a b5895e2
Author: Christos Trochalakis <yatiohi at ideopolis.gr>
Date:   Mon Sep 12 15:11:37 2016 +0300

    merge patched into master

 debian/.git-dpm                                     |  4 ++--
 .../patches/0001-Switch-to-trove-classifiers.patch  | 21 +++++++++++++++++++++
 debian/patches/series                               |  1 +
 setup.py                                            |  3 ++-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 7472f3e,0000000..4208cf2
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
- ab89e71fb2d0fda472a811916c3e9f5fc0520286
- ab89e71fb2d0fda472a811916c3e9f5fc0520286
++b5895e22067a690fd5bc65a37cd555cdbb0697ac
++b5895e22067a690fd5bc65a37cd555cdbb0697ac
 +ab89e71fb2d0fda472a811916c3e9f5fc0520286
 +ab89e71fb2d0fda472a811916c3e9f5fc0520286
 +python-confluent-kafka_0.9.1.2.orig.tar.gz
 +d96c2a06eaf17383540d22e3806c1d8369dfd294
 +25489
diff --cc debian/patches/0001-Switch-to-trove-classifiers.patch
index 0000000,0000000..26c9274
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Switch-to-trove-classifiers.patch
@@@ -1,0 -1,0 +1,21 @@@
++From b5895e22067a690fd5bc65a37cd555cdbb0697ac Mon Sep 17 00:00:00 2001
++From: Christos Trochalakis <yatiohi at ideopolis.gr>
++Date: Wed, 7 Sep 2016 12:04:59 +0300
++Subject: Switch to trove classifiers
++
++This avoids shipping a license file in the top directory.
++---
++ setup.py | 3 ++-
++ 1 file changed, 2 insertions(+), 1 deletion(-)
++
++diff --git a/setup.py b/setup.py
++index dec7d93..27b59fc 100755
++--- a/setup.py
+++++ b/setup.py
++@@ -18,4 +18,5 @@ setup(name='confluent-kafka',
++       url='https://github.com/confluentinc/confluent-kafka-python',
++       ext_modules=[module],
++       packages=find_packages(),
++-      data_files = [('', ['LICENSE'])])
+++      classifiers=['License :: OSI Approved :: Apache Software License']
+++)
diff --cc debian/patches/series
index 0000000,0000000..63467fc
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Switch-to-trove-classifiers.patch

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