[Python-modules-commits] [python-olefile] 08/08: merge patched into master

[Marcos Fouces]

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

mfouces-guest pushed a commit to branch master
in repository python-olefile.

commit 8043de5c27d34f636e501c11fa13c1f29839979a
Merge: 182a849 2b2bb68
Author: Marcos Fouces <mfouces at yahoo.es>
Date:   Tue Nov 29 00:03:12 2016 +0100

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 .../0002-Avoid-Doc-Install-In-Wrong-Path.patch     | 33 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 setup.py                                           |  8 +++---
 4 files changed, 40 insertions(+), 6 deletions(-)

diff --cc debian/.git-dpm
index 814baf7,0000000..8604f1a
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
- e9d89b87cfc7af0ee8712d02ee02cf9df19e8663
- e9d89b87cfc7af0ee8712d02ee02cf9df19e8663
++2b2bb68f6c2269446d32b77af0ff1ed80e1a9c78
++2b2bb68f6c2269446d32b77af0ff1ed80e1a9c78
 +f6ef91330069e7ae6b58de886853a6465298430e
 +f6ef91330069e7ae6b58de886853a6465298430e
 +python-olefile_0.43.orig.tar.gz
 +1d7883eb926e1066911e8c9d0c7b2e958b76b09d
 +99723
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Avoid-Doc-Install-In-Wrong-Path.patch
index 0000000,0000000..34f9eb9
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Avoid-Doc-Install-In-Wrong-Path.patch
@@@ -1,0 -1,0 +1,33 @@@
++From 2b2bb68f6c2269446d32b77af0ff1ed80e1a9c78 Mon Sep 17 00:00:00 2001
++From: Marcos Fouces <mfouces at yahoo.es>
++Date: Tue, 29 Nov 2016 00:03:07 +0100
++Subject: Avoid Doc Install In Wrong Path
++
++---
++ setup.py | 8 ++++----
++ 1 file changed, 4 insertions(+), 4 deletions(-)
++
++diff --git a/setup.py b/setup.py
++index 00be983..f19c5f7 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -142,15 +142,15 @@ package_data={
++     'olefile': [
++         'README.rst',
++         'README.html',
++-        'LICENSE.txt',
+++#        'LICENSE.txt',
++         'CONTRIBUTORS.txt',
++         'olefile.html',
++         'olefile2.html',
++         ]
++         # doc folder: md, html, png
++-        + rglob('olefile/doc', 'doc', '*.html')
++-        + rglob('olefile/doc', 'doc', '*.md')
++-        + rglob('olefile/doc', 'doc', '*.png'),
+++#        + rglob('olefile/doc', 'doc', '*.html')
+++#        + rglob('olefile/doc', 'doc', '*.md')
+++#        + rglob('olefile/doc', 'doc', '*.png'),
++     }
++ 
++ 
diff --cc debian/patches/series
index 7364883,0000000..801956f
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-Fix-Wrong-Interpreter-Path.patch
++0002-Avoid-Doc-Install-In-Wrong-Path.patch

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