[adios] 193/207: WIP: try fix python3 patch

[Alastair McKinstry]

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

mckinstry pushed a commit to branch master
in repository adios.

commit bc0f0bec69f847f10cb2599b7f573518c42d2ba6
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Sun May 3 12:52:32 2015 +0100

    WIP: try fix python3 patch
---
 debian/patches/python3.patch | 30 ++++++++----------------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/debian/patches/python3.patch b/debian/patches/python3.patch
index 0360bc5..56e8a1c 100644
--- a/debian/patches/python3.patch
+++ b/debian/patches/python3.patch
@@ -1,29 +1,8 @@
 Author: Alastair McKinstry <mckinstry at debian.org>
 Description: Make the python code python2-3 agnostic.
-Last-Updated:2014-06-14
+Last-Updated:2015-05-02
 Forwarded: no
 
-Index: adios-1.8.0/utils/skel/bin/skel
-===================================================================
---- adios-1.8.0.orig/utils/skel/bin/skel
-+++ adios-1.8.0/utils/skel/bin/skel
-@@ -1,5 +1,7 @@
- #!/usr/bin/env python
- 
-+from __future__ import absolute_import, division, print_function, unicode_literals
-+
- import sys
- import os.path
- 
-@@ -56,7 +58,7 @@ def main(argv=None):
-     skel_settings.create_settings_dir_if_needed()
-     parser = get_parser()
- 
--    # Look for skel help (or no args), and print the list of subcommands...
-+    # Look fo( skel help (or no args), and print the list of subcommands...
-     if (len(sys.argv) == 1) or (sys.argv[1] == 'help' and len(sys.argv) == 2):
-         print parser.description 
-         return 0
 Index: adios-1.8.0/utils/skel/bin/skel_extract.py
 ===================================================================
 --- adios-1.8.0.orig/utils/skel/bin/skel_extract.py
@@ -805,6 +784,13 @@ Index: adios-1.8.0/utils/skel/bin/skel
 ===================================================================
 --- adios-1.8.0.orig/utils/skel/bin/skel
 +++ adios-1.8.0/utils/skel/bin/skel
+@@ -1,5 +1,7 @@
+ #!/usr/bin/env python
+
++from __future__ import absolute_import, division, print_function, unicode_literals
++
+ import sys
+ import os.path
 @@ -60,7 +60,7 @@ def main(argv=None):
  
      # Look fo( skel help (or no args), and print the list of subcommands...

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/adios.git