[adios] 74/207: Fix paths

[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 eed3591ed2f50e06e353df626b5273f857d22b6a
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Dec 9 20:56:41 2013 +0000

    Fix paths
---
 debian/patches/debian_paths.patch | 44 +++++++++++++++++++++++++++++++++------
 1 file changed, 38 insertions(+), 6 deletions(-)

diff --git a/debian/patches/debian_paths.patch b/debian/patches/debian_paths.patch
index 0f44283..f5fb82c 100644
--- a/debian/patches/debian_paths.patch
+++ b/debian/patches/debian_paths.patch
@@ -3,10 +3,10 @@ Description: Change paths to match Debian and FHS
 Forwarded: no
 Last-Updated: 2013-12-09
 
-Index: adios.git/utils/skel/lib/skel_makefile.py
+Index: adios-1.5.0/utils/skel/lib/skel_makefile.py
 ===================================================================
---- adios.git.orig/utils/skel/lib/skel_makefile.py	2013-12-09 19:19:02.000000000 +0000
-+++ adios.git/utils/skel/lib/skel_makefile.py	2013-12-09 19:19:02.000000000 +0000
+--- adios-1.5.0.orig/utils/skel/lib/skel_makefile.py	2013-12-09 20:26:51.000000000 +0000
++++ adios-1.5.0/utils/skel/lib/skel_makefile.py	2013-12-09 20:26:51.000000000 +0000
 @@ -34,7 +34,7 @@
      makefile_template_name = '~/.skel/templates/Makefile.default.tpl'
      makefile_template = open(os.path.expanduser(makefile_template_name), 'r')
@@ -29,10 +29,10 @@ Index: adios.git/utils/skel/lib/skel_makefile.py
  
      for template_line in makefile_template:
  
-Index: adios.git/utils/skel/lib/skel_settings.py
+Index: adios-1.5.0/utils/skel/lib/skel_settings.py
 ===================================================================
---- adios.git.orig/utils/skel/lib/skel_settings.py	2013-12-09 19:19:02.000000000 +0000
-+++ adios.git/utils/skel/lib/skel_settings.py	2013-12-09 19:19:40.000000000 +0000
+--- adios-1.5.0.orig/utils/skel/lib/skel_settings.py	2013-12-09 20:26:51.000000000 +0000
++++ adios-1.5.0/utils/skel/lib/skel_settings.py	2013-12-09 20:26:51.000000000 +0000
 @@ -54,7 +54,7 @@
      skel_settings_dir_name = os.path.expanduser ('~/.skel')
      if not os.path.exists (skel_settings_dir_name):
@@ -42,3 +42,35 @@ Index: adios.git/utils/skel/lib/skel_settings.py
          print('Created ' + skel_settings_dir_name)
  
  
+Index: adios-1.5.0/utils/gpp/ad_config.py
+===================================================================
+--- adios-1.5.0.orig/utils/gpp/ad_config.py	2013-12-09 20:26:49.000000000 +0000
++++ adios-1.5.0/utils/gpp/ad_config.py	2013-12-09 20:27:16.000000000 +0000
+@@ -1,3 +1,4 @@
++#!/usr/bin/env python
+ from __future__ import absolute_import, division, print_function, unicode_literals
+ import xml.dom.minidom
+ import type_mapper
+Index: adios-1.5.0/utils/gpp/type_mapper.py
+===================================================================
+--- adios-1.5.0.orig/utils/gpp/type_mapper.py	2013-12-09 20:02:59.000000000 +0000
++++ adios-1.5.0/utils/gpp/type_mapper.py	2013-12-09 20:28:56.000000000 +0000
+@@ -1,4 +1,4 @@
+-
++#!/usr/bin/env python
+ 
+ c_types = {
+     'string' : 'string',
+Index: adios-1.5.0/utils/skel/bin/skel_extract.py
+===================================================================
+--- adios-1.5.0.orig/utils/skel/bin/skel_extract.py	2013-12-09 20:26:49.000000000 +0000
++++ adios-1.5.0/utils/skel/bin/skel_extract.py	2013-12-09 20:56:22.000000000 +0000
+@@ -113,7 +113,7 @@
+     # check the selected fields
+     for field in selected_fields:
+         if not field in keys:
+-            print 'Invalid selection, field ' + field
++            print('Invalid selection, field ' + field)
+             return
+ 
+     #Print the header

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