[adios] 69/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 7185fab2808b77cb210046317fec74f5f57f6bf1
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Dec 9 18:38:42 2013 +0000

    Fix paths
---
 debian/patches/debian_paths.patch | 44 +++++++++++++++++++++++++++++++++++++++
 debian/patches/series             |  1 +
 2 files changed, 45 insertions(+)

diff --git a/debian/patches/debian_paths.patch b/debian/patches/debian_paths.patch
new file mode 100644
index 0000000..dc34ac8
--- /dev/null
+++ b/debian/patches/debian_paths.patch
@@ -0,0 +1,44 @@
+Author: Alastair McKinstry <mckinstry at debian.org>
+Description: Change paths to match Debian and FHS
+Forwarded: no
+Last-Updated: 2013-12-09
+
+Index: adios-1.5.0/utils/skel/lib/skel_makefile.py
+===================================================================
+--- adios-1.5.0.orig/utils/skel/lib/skel_makefile.py	2013-12-09 17:27:34.000000000 +0000
++++ adios-1.5.0/utils/skel/lib/skel_makefile.py	2013-12-09 18:35:34.000000000 +0000
+@@ -32,7 +32,7 @@
+     makefile_template_name = '~/.skel/templates/Makefile.default.tpl'
+     makefile_template = open(os.path.expanduser(makefile_template_name), 'r')
+ 
+-    include_statement = "" + os.path.dirname (sys.argv[0]) + '/../etc/skel/compiler_fragment.mk'
++    include_statement = '/etc/adios/skel/compiler_fragment.mk'
+ 
+     for template_line in makefile_template:
+ 
+@@ -70,10 +70,10 @@
+ 
+     # Makefile generation no longer depends on the target, just using default here.
+     #makefile_template_name = os.path.dirname (sys.argv[0]) + '/../etc/skel/templates/Makefile.' + platform + '.tpl'
+-    makefile_template_name = os.path.dirname (sys.argv[0]) + '/../etc/skel/templates/Makefile.default.tpl'
++    makefile_template_name =  '/etc/adios/skel/templates/Makefile.default.tpl'
+     makefile_template = open(os.path.expanduser(makefile_template_name), 'r')
+ 
+-    include_statement = "" + os.path.dirname (sys.argv[0]) + '/../etc/skel/compiler_fragment.mk'
++    include_statement = "" + '/etc/adios/skel/compiler_fragment.mk'
+ 
+     for template_line in makefile_template:
+ 
+Index: adios-1.5.0/utils/skel/lib/skel_settings.py
+===================================================================
+--- adios-1.5.0.orig/utils/skel/lib/skel_settings.py	2013-12-09 17:27:34.000000000 +0000
++++ adios-1.5.0/utils/skel/lib/skel_settings.py	2013-12-09 18:36:28.000000000 +0000
+@@ -54,7 +54,7 @@
+     skel_settings_dir_name = os.path.expanduser ('~/.skel')
+     if not os.path.exists (skel_settings_dir_name):
+         bindir = os.path.dirname (sys.argv[0])
+-        shutil.copytree (bindir + '/../etc/skel', skel_settings_dir_name)
++        shutil.copytree ('/etc/adios/skel', skel_settings_dir_name)
+         print 'Created ' + skel_settings_dir_name
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 8edb265..2101a62 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ mpi_in_place.patch
 security.patch
 netcdf-fix.patch
 python3.patch
+debian_paths.patch

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