r44183 - /packages/code-aster/astk/trunk/debian/patches/debian-install.patch

[trophime-guest at users.alioth.debian.org]

Author: trophime-guest
Date: Fri Dec 16 09:19:43 2011
New Revision: 44183

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44183
Log:
fix aster build

Modified:
    packages/code-aster/astk/trunk/debian/patches/debian-install.patch

Modified: packages/code-aster/astk/trunk/debian/patches/debian-install.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/patches/debian-install.patch?rev=44183&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/patches/debian-install.patch (original)
+++ packages/code-aster/astk/trunk/debian/patches/debian-install.patch Fri Dec 16 09:19:43 2011
@@ -1,7 +1,7 @@
 Index: astk-1.10.0/ASTK_SERV/asrun/maintenance.py
 ===================================================================
---- astk-1.10.0.orig/ASTK_SERV/asrun/maintenance.py	2011-12-15 17:16:14.000000000 +0100
-+++ astk-1.10.0/ASTK_SERV/asrun/maintenance.py	2011-12-15 17:40:08.000000000 +0100
+--- astk-1.10.0.orig/ASTK_SERV/asrun/maintenance.py	2011-12-15 17:41:44.000000000 +0100
++++ astk-1.10.0/ASTK_SERV/asrun/maintenance.py	2011-12-16 09:15:22.000000000 +0100
 @@ -768,13 +768,19 @@
                  subject = subject)
  
@@ -132,8 +132,8 @@
                          '|^'+conf['SRCF90'][0]+'/', f):
 Index: astk-1.10.0/setup.py
 ===================================================================
---- astk-1.10.0.orig/setup.py	2011-12-15 17:16:14.000000000 +0100
-+++ astk-1.10.0/setup.py	2011-12-15 17:26:37.000000000 +0100
+--- astk-1.10.0.orig/setup.py	2011-12-15 17:41:44.000000000 +0100
++++ astk-1.10.0/setup.py	2011-12-16 09:15:22.000000000 +0100
 @@ -78,7 +78,7 @@
      data_files.extend(build_data_files(osp.join(confdir, "astkrc"), 'ASTK_CLIENT/etc/astkrc'))
      data_files.extend(build_data_files('lib/astk', 'ASTK_CLIENT/lib'))
@@ -145,9 +145,9 @@
  
 Index: astk-1.10.0/ASTK_SERV/asrun/installation.py
 ===================================================================
---- astk-1.10.0.orig/ASTK_SERV/asrun/installation.py	2011-12-15 17:16:14.000000000 +0100
-+++ astk-1.10.0/ASTK_SERV/asrun/installation.py	2011-12-15 17:40:33.000000000 +0100
-@@ -18,10 +18,7 @@
+--- astk-1.10.0.orig/ASTK_SERV/asrun/installation.py	2011-12-15 17:41:44.000000000 +0100
++++ astk-1.10.0/ASTK_SERV/asrun/installation.py	2011-12-16 09:19:22.000000000 +0100
+@@ -18,17 +18,14 @@
  
  # directory for configuration files (profile.sh, config)
  # alternative to /etc/code_aster for non-root install
@@ -159,3 +159,12 @@
  
  # confdir contains plugins directory
  if confdir not in sys.path:
+     sys.path.append(confdir)
+ 
+ # directory containing data files
+-datadir = osp.join(aster_root, 'share', 'codeaster', 'asrun', 'data')
++datadir = osp.join('/usr', 'lib', 'codeaster', 'asrun', 'data')
+ 
+ # directory for internationalization
+-localedir = osp.join(aster_root, 'share', 'locale')
++localedir = osp.join('/usr', 'share', 'locale')