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

[Orestis Ioannou]

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

oorestisime-guest pushed a commit to branch master
in repository python-sdnotify.

commit adc72684439e649915732b341f18f0cb2a463872
Merge: 12ed335 ae236ee
Author: Orestis Ioannou <orestis at oioannou.com>
Date:   Sat Jul 16 22:52:54 2016 +0200

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 .../0001-Don-t-install-the-license-file.patch      | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 setup.py                                           |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index fc2e416,0000000..c629387
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
- cac674e7fd5bb16737bbe24030d9f5ab237149d0
- cac674e7fd5bb16737bbe24030d9f5ab237149d0
++ae236eecdc39e6055e080514da06ef01eef30e0e
++ae236eecdc39e6055e080514da06ef01eef30e0e
 +cac674e7fd5bb16737bbe24030d9f5ab237149d0
 +cac674e7fd5bb16737bbe24030d9f5ab237149d0
 +python-sdnotify_0.3.1.orig.tar.gz
 +8600af62286ba2b1635015e82a00b50454666af9
 +2513
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Don-t-install-the-license-file.patch
index 0000000,0000000..aba09d3
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Don-t-install-the-license-file.patch
@@@ -1,0 -1,0 +1,22 @@@
++From ae236eecdc39e6055e080514da06ef01eef30e0e Mon Sep 17 00:00:00 2001
++From: Orestis Ioannou <orestis at oioannou.com>
++Date: Sat, 16 Jul 2016 22:52:50 +0200
++Subject: Don't install the license file
++
++---
++ setup.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/setup.py b/setup.py
++index 7a37dc5..69cdc59 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -21,7 +21,7 @@ setup(
++         "Operating System :: POSIX :: Linux",
++         "Topic :: Software Development :: Libraries :: Python Modules",
++     ],
++-    data_files = [("", ["LICENSE.txt"])],
+++    # data_files = [("", ["LICENSE.txt"])],
++     long_description = """\
++ systemd Service Notification
++ 
diff --cc debian/patches/series
index 0000000,0000000..7a9bb2a
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Don-t-install-the-license-file.patch

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