[Python-modules-commits] [python-olefile] 06/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 182a849d3726d0dc21eeafcfca1516a3c0211c78
Merge: 266d1a0 e9d89b8
Author: Marcos Fouces <mfouces at yahoo.es>
Date:   Tue Nov 29 00:00:50 2016 +0100

    merge patched into master

 OleFileIO_PL.py                                    |  2 +-
 debian/.git-dpm                                    |  4 +-
 .../patches/0001-Fix-Wrong-Interpreter-Path.patch  | 52 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 olefile/__init__.py                                |  2 +-
 olefile/olefile.py                                 |  2 +-
 olefile/olefile2.py                                |  2 +-
 7 files changed, 59 insertions(+), 6 deletions(-)

diff --cc debian/.git-dpm
index ef0809c,0000000..814baf7
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
- f6ef91330069e7ae6b58de886853a6465298430e
- f6ef91330069e7ae6b58de886853a6465298430e
++e9d89b87cfc7af0ee8712d02ee02cf9df19e8663
++e9d89b87cfc7af0ee8712d02ee02cf9df19e8663
 +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/0001-Fix-Wrong-Interpreter-Path.patch
index 0000000,0000000..0504066
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Fix-Wrong-Interpreter-Path.patch
@@@ -1,0 -1,0 +1,52 @@@
++From e9d89b87cfc7af0ee8712d02ee02cf9df19e8663 Mon Sep 17 00:00:00 2001
++From: Marcos Fouces <mfouces at yahoo.es>
++Date: Tue, 29 Nov 2016 00:00:28 +0100
++Subject: Fix Wrong Interpreter Path
++
++---
++ OleFileIO_PL.py     | 2 +-
++ olefile/__init__.py | 2 +-
++ olefile/olefile.py  | 2 +-
++ olefile/olefile2.py | 2 +-
++ 4 files changed, 4 insertions(+), 4 deletions(-)
++
++diff --git a/OleFileIO_PL.py b/OleFileIO_PL.py
++index 6070b37..c2786c1 100644
++--- a/OleFileIO_PL.py
+++++ b/OleFileIO_PL.py
++@@ -1,4 +1,4 @@
++-#!/usr/local/bin/python
+++#!/usr/bin/python
++ # -*- coding: latin-1 -*-
++ """
++ olefile (formerly OleFileIO_PL)
++diff --git a/olefile/__init__.py b/olefile/__init__.py
++index a0c3512..03bc00d 100644
++--- a/olefile/__init__.py
+++++ b/olefile/__init__.py
++@@ -1,4 +1,4 @@
++-#!/usr/local/bin/python
+++#!/usr/bin/python
++ # -*- coding: latin-1 -*-
++ """
++ olefile (formerly OleFileIO_PL)
++diff --git a/olefile/olefile.py b/olefile/olefile.py
++index 4efb8a6..6a3cad6 100644
++--- a/olefile/olefile.py
+++++ b/olefile/olefile.py
++@@ -1,4 +1,4 @@
++-#!/usr/bin/env python
+++#!/usr/bin/python
++ 
++ # olefile (formerly OleFileIO_PL)
++ #
++diff --git a/olefile/olefile2.py b/olefile/olefile2.py
++index 7f5ab0e..b3e4f51 100644
++--- a/olefile/olefile2.py
+++++ b/olefile/olefile2.py
++@@ -1,4 +1,4 @@
++-#!/usr/local/bin/python
+++#!/usr/bin/python
++ # -*- coding: latin-1 -*-
++ """
++ olefile2 (formerly OleFileIO_PL2) version 0.40py2 2014-10-01
diff --cc debian/patches/series
index 0000000,0000000..7364883
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Fix-Wrong-Interpreter-Path.patch

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