[adios] 175/207: refresh patches

[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 5aa043407eb82d3fdb86823d0230b09b3d694844
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Jun 16 18:36:41 2014 +0100

    refresh patches
---
 debian/patches/debian_paths.patch | 75 +++++++++++----------------------------
 1 file changed, 20 insertions(+), 55 deletions(-)

diff --git a/debian/patches/debian_paths.patch b/debian/patches/debian_paths.patch
index cab6836..9a45479 100644
--- a/debian/patches/debian_paths.patch
+++ b/debian/patches/debian_paths.patch
@@ -3,22 +3,11 @@ Description: Change paths to match Debian and FHS
 Forwarded: no
 Last-Updated: 2013-12-09
 
-Index: adios-1.6.0/utils/skel/lib/skel_makefile.py
+Index: adios-1.7.0/utils/skel/lib/skel_makefile.py
 ===================================================================
---- adios-1.6.0.orig/utils/skel/lib/skel_makefile.py	2014-02-17 09:37:11.833940953 +0000
-+++ adios-1.6.0/utils/skel/lib/skel_makefile.py	2014-02-17 09:38:51.492140048 +0000
-@@ -41,8 +41,8 @@
-         try:
-             params = skelconf.skelConfig (args.project + '_params.xml')
-         except (IOError):
--            print "Error reading " + args.project + "_params.xml. Try running skel params " + args.project + " first,"
--            print "then check that " + args.project + "_params.xml exists."
-+            print( "Error reading " + args.project + "_params.xml. Try running skel params " + args.project + " first,")
-+            print("then check that " + args.project + "_params.xml exists.")
-             return
- 
-         generate_makefiles (params, config)
-@@ -57,7 +57,7 @@
+--- adios-1.7.0.orig/utils/skel/lib/skel_makefile.py
++++ adios-1.7.0/utils/skel/lib/skel_makefile.py
+@@ -67,7 +67,7 @@ def generate_makefile_from_yaml (args):
  
      # Only proceed if outfilename does not already exist, or if -f was used
      if os.path.exists (outfilename) and not args.force:
@@ -27,7 +16,7 @@ Index: adios-1.6.0/utils/skel/lib/skel_makefile.py
          return 999
  
      skel_file = open (outfilename, 'w')
-@@ -97,7 +97,7 @@
+@@ -108,7 +108,7 @@ def generate_makefiles_fortran (params):
      makefile_template_name = '~/.skel/templates/Makefile.default.tpl'
      makefile_template = open(os.path.expanduser(makefile_template_name), 'r')
  
@@ -36,11 +25,11 @@ Index: adios-1.6.0/utils/skel/lib/skel_makefile.py
  
      bindir = os.path.abspath(os.path.dirname(sys.argv[0]))        
  
-Index: adios-1.6.0/utils/skel/lib/skel_settings.py
+Index: adios-1.7.0/utils/skel/lib/skel_settings.py
 ===================================================================
---- adios-1.6.0.orig/utils/skel/lib/skel_settings.py	2014-02-17 09:37:11.833940953 +0000
-+++ adios-1.6.0/utils/skel/lib/skel_settings.py	2014-02-17 09:37:11.829942393 +0000
-@@ -54,7 +54,7 @@
+--- adios-1.7.0.orig/utils/skel/lib/skel_settings.py
++++ adios-1.7.0/utils/skel/lib/skel_settings.py
+@@ -54,7 +54,7 @@ def create_settings_dir_if_needed():
      skel_settings_dir_name = os.path.expanduser ('~/.skel')
      if not os.path.exists (skel_settings_dir_name):
          bindir = os.path.dirname (sys.argv[0])
@@ -49,16 +38,16 @@ Index: adios-1.6.0/utils/skel/lib/skel_settings.py
          print('Created ' + skel_settings_dir_name)
  
  
-Index: adios-1.6.0/utils/gpp/ad_config.py
+Index: adios-1.7.0/utils/gpp/ad_config.py
 ===================================================================
---- adios-1.6.0.orig/utils/gpp/ad_config.py	2014-02-17 09:37:11.833940953 +0000
-+++ adios-1.6.0/utils/gpp/ad_config.py	2014-02-17 09:42:05.467456558 +0000
+--- adios-1.7.0.orig/utils/gpp/ad_config.py
++++ adios-1.7.0/utils/gpp/ad_config.py
 @@ -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
-@@ -104,7 +105,7 @@
+@@ -104,7 +105,7 @@ class adiosGroup:
      # Returns the variable from this group with the specified name, or None
      def get_var (self, varfullpath):
          #print '          get_var('+varfullpath+')'
@@ -67,21 +56,21 @@ Index: adios-1.6.0/utils/gpp/ad_config.py
              return self.vardict [varfullpath]
  
          return None
-Index: adios-1.6.0/utils/gpp/type_mapper.py
+Index: adios-1.7.0/utils/gpp/type_mapper.py
 ===================================================================
---- adios-1.6.0.orig/utils/gpp/type_mapper.py	2014-02-17 09:37:11.833940953 +0000
-+++ adios-1.6.0/utils/gpp/type_mapper.py	2014-02-17 09:37:11.829942393 +0000
+--- adios-1.7.0.orig/utils/gpp/type_mapper.py
++++ adios-1.7.0/utils/gpp/type_mapper.py
 @@ -1,4 +1,4 @@
 -
 +#!/usr/bin/env python
  
  c_types = {
      'string' : 'string',
-Index: adios-1.6.0/utils/skel/bin/skel_extract.py
+Index: adios-1.7.0/utils/skel/bin/skel_extract.py
 ===================================================================
---- adios-1.6.0.orig/utils/skel/bin/skel_extract.py	2014-02-17 09:37:11.833940953 +0000
-+++ adios-1.6.0/utils/skel/bin/skel_extract.py	2014-02-17 09:37:11.829942393 +0000
-@@ -113,7 +113,7 @@
+--- adios-1.7.0.orig/utils/skel/bin/skel_extract.py
++++ adios-1.7.0/utils/skel/bin/skel_extract.py
+@@ -113,7 +113,7 @@ def extract_R (skel_output, select, rank
      # check the selected fields
      for field in selected_fields:
          if not field in keys:
@@ -90,27 +79,3 @@ Index: adios-1.6.0/utils/skel/bin/skel_extract.py
              return
  
      #Print the header
-Index: adios-1.6.0/utils/skel/lib/skel_source.py
-===================================================================
---- adios-1.6.0.orig/utils/skel/lib/skel_source.py	2014-02-17 09:37:08.575116968 +0000
-+++ adios-1.6.0/utils/skel/lib/skel_source.py	2014-02-17 09:41:14.801181900 +0000
-@@ -681,7 +681,7 @@
- 
-     # Only proceed if outfilename does not already exist, or if -f was used
-     if os.path.exists (outfilename) and not args.force:
--        print "%s exists, aborting. Delete the file or use -f to overwrite." % outfilename
-+        print( "%s exists, aborting. Delete the file or use -f to overwrite." % outfilename)
-         return 999
- 
-     skel_file = open (outfilename, 'w')
-@@ -712,8 +712,8 @@
-     try:
-         params = skelconf.skelConfig (args.project + '_params.xml')
-     except (IOError):
--        print "Error reading " + args.project + "_params.xml. Try running skel params " + args.project + " first,"
--        print "then check that " + args.project + "_params.xml exists."
-+        print("Error reading " + args.project + "_params.xml. Try running skel params " + args.project + " first,")
-+        print("then check that " + args.project + "_params.xml exists.")
-         return  
- 
-     # Determine the target language

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