[Python-modules-commits] [python-patch] 07/07: merge patched into master

[Paolo Greppi]

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

paolog-guest pushed a commit to branch master
in repository python-patch.

commit 8913453fc81a35866ad5a80a1f16b368159b3217
Merge: 427e432 5f8bb5f
Author: Paolo Greppi <paolo.greppi at libpf.com>
Date:   Tue Nov 29 07:02:33 2016 +0000

    merge patched into master

 debian/.git-dpm                                 |  4 +--
 debian/patches/0001-add-the-setup.py-file.patch | 34 +++++++++++++++++++++++++
 debian/patches/series                           |  1 +
 setup.py                                        | 18 +++++++++++++
 4 files changed, 55 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index 15e80d1,0000000..698000f
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
- c7ed1e26d7dd02d725bdea622948f8e4a601df29
- c7ed1e26d7dd02d725bdea622948f8e4a601df29
++5f8bb5fe0bc27821d20dc9821be21c6089df6a65
++5f8bb5fe0bc27821d20dc9821be21c6089df6a65
 +c7ed1e26d7dd02d725bdea622948f8e4a601df29
 +c7ed1e26d7dd02d725bdea622948f8e4a601df29
 +python-patch_1.16.orig.tar.gz
 +083d93169c712c94e6efc5faa09fe3285bd93bb3
 +160286
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-add-the-setup.py-file.patch
index 0000000,0000000..c7a6218
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-add-the-setup.py-file.patch
@@@ -1,0 -1,0 +1,34 @@@
++From 5f8bb5fe0bc27821d20dc9821be21c6089df6a65 Mon Sep 17 00:00:00 2001
++From: Paolo Greppi <paolo.greppi at libpf.com>
++Date: Tue, 29 Nov 2016 07:02:27 +0000
++Subject: add the setup.py file
++
++---
++ setup.py | 18 ++++++++++++++++++
++ 1 file changed, 18 insertions(+)
++ create mode 100644 setup.py
++
++diff --git a/setup.py b/setup.py
++new file mode 100644
++index 0000000..0307afd
++--- /dev/null
+++++ b/setup.py
++@@ -0,0 +1,18 @@
+++from distutils.core import setup
+++
+++setup(
+++    name='patch',
+++    version='1.16',
+++    author='anatoly techtonik <techtonik at gmail.com>',
+++    url='https://github.com/techtonik/python-patch/',
+++
+++    description='Patch utility to apply unified diffs',
+++    license='MIT',
+++
+++    py_modules=['patch'],
+++
+++    classifiers=[
+++        'Classifier: Programming Language :: Python :: 2',
+++        'Classifier: Programming Language :: Python :: 3',
+++    ],
+++)
diff --cc debian/patches/series
index 0000000,0000000..1e93866
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-add-the-setup.py-file.patch

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