r44150 - in /packages/code-aster/astk/trunk/debian: README.Debian changelog code-aster-gui.install code-aster-run.install control patches/config.patch patches/debian-install.patch patches/series patches/tcl_fixpath.patch rules
trophime-guest at users.alioth.debian.org
trophime-guest at users.alioth.debian.org
Tue Dec 13 15:40:11 UTC 2011
Author: trophime-guest
Date: Tue Dec 13 15:40:11 2011
New Revision: 44150
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44150
Log:
update to 1.10.0-1
Added:
packages/code-aster/astk/trunk/debian/README.Debian
packages/code-aster/astk/trunk/debian/code-aster-gui.install
packages/code-aster/astk/trunk/debian/code-aster-run.install
packages/code-aster/astk/trunk/debian/patches/tcl_fixpath.patch
Modified:
packages/code-aster/astk/trunk/debian/changelog
packages/code-aster/astk/trunk/debian/control
packages/code-aster/astk/trunk/debian/patches/config.patch
packages/code-aster/astk/trunk/debian/patches/debian-install.patch
packages/code-aster/astk/trunk/debian/patches/series
packages/code-aster/astk/trunk/debian/rules
Added: packages/code-aster/astk/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/README.Debian?rev=44150&op=file
==============================================================================
--- packages/code-aster/astk/trunk/debian/README.Debian (added)
+++ packages/code-aster/astk/trunk/debian/README.Debian Tue Dec 13 15:40:11 2011
@@ -1,0 +1,13 @@
+astk for Debian
+---------------
+
+To test astk aka codeaster-run goto th
+
+export ASTER_ROOT=/usr/lib/codeaster
+cd $ASTER_ROOT/asrun/unittest
+python run_test.py --all
+
+Note codeaster-engine should be installed to get
+some tests working.
+
+ -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr> Tue, 13 Dec 2011 09:01:13 +0100
Modified: packages/code-aster/astk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/changelog?rev=44150&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/changelog (original)
+++ packages/code-aster/astk/trunk/debian/changelog Tue Dec 13 15:40:11 2011
@@ -1,3 +1,15 @@
+astk (1.10.0-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/rules: simply install targets
+ - add debian/codeaster-run.install
+ - add debian/codeaster-gui.install
+ * debian/control: add tkpg to Depends
+ * Add tcl_fixpath.patch to fix as_run path in tcl scripts
+ * Add README.Debian
+
+ -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr> Tue, 13 Dec 2011 09:01:13 +0100
+
astk (1.8.4-5) unstable; urgency=low
[Andrea Palazzi]
Added: packages/code-aster/astk/trunk/debian/code-aster-gui.install
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/code-aster-gui.install?rev=44150&op=file
==============================================================================
--- packages/code-aster/astk/trunk/debian/code-aster-gui.install (added)
+++ packages/code-aster/astk/trunk/debian/code-aster-gui.install Tue Dec 13 15:40:11 2011
@@ -1,0 +1,28 @@
+debian/tmp/usr/bin/codeaster-gui usr/bin
+debian/tmp/usr/bin/astk usr/bin
+
+debian/tmp/usr/lib/astk/*.tcl usr/share/astk
+debian/tmp/usr/lib/astk/BWidget-1.7.0 usr/share/astk
+debian/tmp/usr/lib/astk/DOC usr/share/astk
+debian/tmp/usr/lib/astk/HELP usr/share/astk
+debian/tmp/usr/lib/astk/icons usr/share/astk
+debian/tmp/usr/lib/astk/locales.txt usr/share/astk
+debian/tmp/usr/lib/astk/RELNOTES* usr/share/astk
+
+# config
+debian/tmp/etc/codeaster/astkrc/* etc/codeaster/astkrc
+
+# menu
+debian/code-aster-gui.desktop usr/share/applications
+debian/astk.xpm usr/share/pixmaps
+
+#links in $ASTER_ROOT/outils
+#usr/lib/codeaster/outils/eficas
+#usr/lib/codeaster/outils/eficasQt
+#usr/lib/codeaster/outils/gmsh
+#usr/lib/codeaster/outils/xmgrace
+
+#install manpages
+debian/astk.1 usr/share/man/man1
+debian/codeaster-gui.1 usr/share/man/man1
+debian/bsf.1 usr/share/man/man1
Added: packages/code-aster/astk/trunk/debian/code-aster-run.install
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/code-aster-run.install?rev=44150&op=file
==============================================================================
--- packages/code-aster/astk/trunk/debian/code-aster-run.install (added)
+++ packages/code-aster/astk/trunk/debian/code-aster-run.install Tue Dec 13 15:40:11 2011
@@ -1,0 +1,32 @@
+# executables
+debian/tmp/usr/bin/codeaster usr/bin
+debian/tmp/usr/bin/as_run usr/bin
+debian/tmp/usr/bin/codeaster-get usr/bin
+debian/tmp/usr/bin/codeaster-parallel_cp usr/bin
+
+# config
+ASTK_SERV/etc/profile.sh etc/codeaster
+ASTK_SERV/etc/config_nodename etc/codeaster
+ASTK_SERV/etc/aster etc/codeaster
+ASTK_SERV/etc/profile.csh etc/codeaster
+ASTK_SERV/etc/asrun etc/codeaster
+debian/aster-mpihosts etc/codeaster
+
+# ASTER_ROOT
+debian/tmp/usr/lib/codeaster usr/lib
+debian/tmp/usr/lib/codeaster/bin usr/lib/codeaster
+
+# data
+ASTK_SERV/share/codeaster/asrun/data/mpirun_template usr/lib/codeaster/asrun/data
+
+#install manpages
+debian/as_run.1 usr/share/man/man1
+debian/codeaster.1 usr/share/man/man1
+debian/codeaster-get.1 usr/share/man/man1
+debian/codeaster-parallel_cp.1 usr/share/man/man1
+
+# locale
+debian/tmp/usr/share/locale/* usr/share/locale
+
+# lintian-overrides
+debian/code-aster-run.lintian-overrides usr/share/lintian/overrides
Modified: packages/code-aster/astk/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/control?rev=44150&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/control (original)
+++ packages/code-aster/astk/trunk/debian/control Tue Dec 13 15:40:11 2011
@@ -4,7 +4,8 @@
Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>, "Adam C. Powell, IV" <hazelsct at debian.org>
Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 7), cdbs (>= 0.4.49), quilt, python-all (>= 2.5.4-9), python-support (>= 1.0.7),
+Build-Depends: debhelper (>= 7), cdbs (>= 0.4.90~), quilt, python-all (>= 2.6.6-3~),
+ python-support (>= 1.0.7),
po-debconf, gmsh, grace, eficas
Homepage: http://www.code-aster.org/
Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/code-aster/astk/
@@ -15,7 +16,7 @@
Architecture: all
Section: science
Depends: tk8.5 | wish, tcl8.5 | tclsh, debconf (>= 1.5.30), ${misc:Depends},
- dpkg-dev
+ dpkg-dev, tkpng
Recommends: code-aster-run
Replaces: astk, astk-server
Conflicts: astk, astk-server
Modified: packages/code-aster/astk/trunk/debian/patches/config.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/patches/config.patch?rev=44150&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/patches/config.patch (original)
+++ packages/code-aster/astk/trunk/debian/patches/config.patch Tue Dec 13 15:40:11 2011
@@ -1,7 +1,7 @@
-Index: astk-1.8.1/ASTK_CLIENT/etc/astkrc/outils
-===================================================================
---- astk-1.8.1.orig/ASTK_CLIENT/etc/astkrc/outils 2010-07-07 18:18:07.000000000 +0200
-+++ astk-1.8.1/ASTK_CLIENT/etc/astkrc/outils 2010-07-13 17:48:59.000000000 +0200
+Index: astk-1.10.0/ASTK_CLIENT/etc/astkrc/outils
+===================================================================
+--- astk-1.10.0.orig/ASTK_CLIENT/etc/astkrc/outils 2011-12-13 11:45:33.000000000 +0100
++++ astk-1.10.0/ASTK_CLIENT/etc/astkrc/outils 2011-12-13 11:48:35.000000000 +0100
@@ -4,22 +4,22 @@
astkrc_version : 1.1
#
@@ -29,34 +29,77 @@
ext : dat
dist : on
#
-Index: astk-1.8.1/ASTK_CLIENT/bin/astk
-===================================================================
---- astk-1.8.1.orig/ASTK_CLIENT/bin/astk 2010-07-07 18:18:07.000000000 +0200
-+++ astk-1.8.1/ASTK_CLIENT/bin/astk 2010-07-13 17:48:59.000000000 +0200
-@@ -38,5 +38,5 @@
+Index: astk-1.10.0/ASTK_CLIENT/bin/astk
+===================================================================
+--- astk-1.10.0.orig/ASTK_CLIENT/bin/astk 2011-12-13 11:45:33.000000000 +0100
++++ astk-1.10.0/ASTK_CLIENT/bin/astk 2011-12-13 11:51:04.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!?SHELL_EXECUTION?
++#!/bin/bash
+
+ # ==============================================================================
+ # COPYRIGHT (C) 1991 - 2003 EDF R&D WWW.CODE-ASTER.ORG
+@@ -17,21 +17,10 @@
+ # 1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE.
+ # ==============================================================================
+
+-set_prefix() {
+- local this=`readlink -n -f $1`
+- local bin=`dirname $this`
+- prefix=`dirname $bin`
+-}
+-
+-set_prefix $0
+-
+-ASTER_ROOT=$prefix
+-ASTER_ETC=$ASTER_ROOT/etc
+-if [ "$ASTER_ROOT" = "/usr" ]; then
++if [ -z "$ASTER_ETC" ]; then
+ ASTER_ETC=/etc
++ export ASTER_ETC
+ fi
+-export ASTER_ROOT
+-export ASTER_ETC
+
+ # set environment
+ if [ -f $ASTER_ETC/codeaster/profile.sh ]; then
+@@ -43,5 +32,5 @@
WISHEXECUTABLE=wish
fi
--$WISHEXECUTABLE $prefix/lib/astk/astk.tcl -- $* &
-+$WISHEXECUTABLE $prefix/share/astk/astk.tcl -- $* &
-
-Index: astk-1.8.1/ASTK_SERV/etc/profile.csh
-===================================================================
---- astk-1.8.1.orig/ASTK_SERV/etc/profile.csh 2010-07-07 18:18:08.000000000 +0200
-+++ astk-1.8.1/ASTK_SERV/etc/profile.csh 2010-07-13 17:48:59.000000000 +0200
-@@ -12,37 +12,20 @@
+-$WISHEXECUTABLE $ASTER_ROOT/lib/astk/astk.tcl -- $* &
++$WISHEXECUTABLE /usr/share/astk/astk.tcl -- $* &
+
+Index: astk-1.10.0/ASTK_SERV/etc/profile.csh
+===================================================================
+--- astk-1.10.0.orig/ASTK_SERV/etc/profile.csh 2011-12-13 11:45:33.000000000 +0100
++++ astk-1.10.0/ASTK_SERV/etc/profile.csh 2011-12-13 12:04:41.000000000 +0100
+@@ -12,39 +12,26 @@
setenv DEFINE_PROFILE_ASRUN done
#--- ifndef DEFINE_PROFILE_ASRUN -----------------------------------------------
--setenv ASTER_ROOT ?ASTER_ROOT?
-+setenv ASTER_ROOT /usr/lib/codeaster
-
+-if ( "X$ASTER_ROOT" == "X" ) then
++if !($?ASTER_ROOT) then
+ # from first installation
+- setenv ASTER_ROOT ?ASTER_ROOT?
+-endif
+-setenv ASTER_ETC $ASTER_ROOT/etc
+-if ( "X$ASTER_ROOT" == "X/usr" ) then
+- setenv ASTER_ETC /etc
+-endif
+-
-if !($?PATH) then
- setenv PATH $ASTER_ROOT/bin:$ASTER_ROOT/outils
-else
- setenv PATH $ASTER_ROOT/bin:$ASTER_ROOT/outils:$PATH
--endif
--
++ setenv ASTER_ROOT /usr/lib/codeaster
++ if !($?PATH) then
++ setenv PATH $ASTER_ROOT/bin:$ASTER_ROOT/outils
++ else
++ setenv PATH $ASTER_ROOT/bin:$ASTER_ROOT/outils:$PATH
++ endif
+ endif
+
-if !($?LD_LIBRARY_PATH) then
- setenv LD_LIBRARY_PATH ?HOME_PYTHON?/lib
-else
@@ -67,7 +110,9 @@
- setenv PYTHONPATH ?ASRUN_SITE_PKG?
-else
- setenv PYTHONPATH ?ASRUN_SITE_PKG?:$PYTHONPATH
--endif
++if !($?ASTER_ETC) then
++ setenv ASTER_ETC /etc
+ endif
-setenv PYTHONEXECUTABLE ?PYTHON_EXE?
+setenv PYTHONEXECUTABLE /usr/bin/python
@@ -80,18 +125,11 @@
# source local profile
--if (-e $ASTER_ROOT/etc/codeaster/profile_local.csh) then
-- source $ASTER_ROOT/etc/codeaster/profile_local.csh
-+if (-e /etc/codeaster/profile_local.csh) then
-+ source /etc/codeaster/profile_local.csh
- endif
-
- #--- endif DEFINE_PROFILE_ASRUN ------------------------------------------------
-Index: astk-1.8.1/ASTK_SERV/etc/asrun
-===================================================================
---- astk-1.8.1.orig/ASTK_SERV/etc/asrun 2010-07-07 18:18:08.000000000 +0200
-+++ astk-1.8.1/ASTK_SERV/etc/asrun 2010-07-13 17:48:59.000000000 +0200
-@@ -133,10 +133,10 @@ interactif_mpi_nbpmax : 32
+Index: astk-1.10.0/ASTK_SERV/etc/asrun
+===================================================================
+--- astk-1.10.0.orig/ASTK_SERV/etc/asrun 2011-12-13 11:45:33.000000000 +0100
++++ astk-1.10.0/ASTK_SERV/etc/asrun 2011-12-13 11:48:35.000000000 +0100
+@@ -212,7 +212,7 @@
# mpirun
# available arguments are : mpi_hostfile, mpi_nbnoeud, mpi_nbcpu
# (use Python string formatting style)
@@ -99,105 +137,148 @@
+mpirun_cmd : mpirun -np %(mpi_nbcpu)s --hostfile %(mpi_hostfile)s %(program)s
# file which contains list of hosts (REQUIRED even if it is not used in mpirun_cmd)
--mpi_hostfile : ?ASTER_CONFDIR?/aster-mpihosts
-+mpi_hostfile : /etc/codeaster/aster-mpihosts
-
- # command called to initialize MPI environment (for example for mpich2)
- #mpi_ini : mpdboot --totalnum=%(mpi_nbnoeud)s --file=%(mpi_hostfile)s ; sleep 10
-@@ -149,7 +149,7 @@ mpi_hostfile : ?ASTER_CONFDIR?/aster-mpihosts
- # OpenMPI (1.2) : echo $OMPI_MCA_ns_nds_vpid
- # OpenMPI (1.3) : echo $OMPI_MCA_orte_ess_vpid
- # Mpich2 : echo $PMI_RANK
--mpi_get_procid_cmd : echo $PMI_RANK
-+mpi_get_procid_cmd : echo $OMPI_MCA_orte_ess_vpid
-
- # maximum number of nodes
- mpi_nbnoeudmax : 1
-@@ -170,8 +170,8 @@ mpi_nbcpumax : 1
+ mpi_hostfile : $ASTER_ETC/codeaster/mpi_hostfile
+@@ -248,10 +248,10 @@
+
+ #-------------------------------------------------------------------------------
# ps commands : uncomment lines corresponding to your platform
- #ps_cpu : /bin/ps -e --width=512 -ocputime -ocommand
- #ps_pid : /bin/ps -e --width=512 -opid -ocommand
+-#ps_cpu : /bin/ps -e --width=512 -ocputime -ocommand
+-#ps_pid : /bin/ps -e --width=512 -opid -ocommand
-ps_cpu : ?PS_COMMAND_CPU?
-ps_pid : ?PS_COMMAND_PID?
+ps_cpu : /bin/ps -e --width=512 -ocputime -ocommand
+ps_pid : /bin/ps -e --width=512 -opid -ocommand
++#ps_cpu : ?PS_COMMAND_CPU?
++#ps_pid : ?PS_COMMAND_PID?
#-------------------------------------------------------------------------------
# debug command :
-@@ -184,8 +184,8 @@ ps_pid : ?PS_COMMAND_PID?
- #cmd_post : gdb -batch --command=@D @E @C
- #cmd_dbg : ddd --debugger gdb --command=@D @E @C
+@@ -261,13 +261,13 @@
+ # @d will be replaced by the string 'where ; quit'
+ # @a will be replaced by the arguments of Code_Aster command line
+ #
+-#cmd_post : gdb -batch --command=@D @E @C
++cmd_post : gdb -batch --command=@D @E @C
+ #cmd_dbg : gdb --command=@D @E
+-#cmd_dbg : ddd --debugger gdb --command=@D @E @C
++cmd_dbg : ddd --debugger gdb --command=@D @E @C
+ #cmd_dbg : idb -gui -gdb -command @D -exec @E
#cmd_dbg : nemiver @E @a
-cmd_post : ?DEBUGGER_COMMAND_POST?
-cmd_dbg : ?DEBUGGER_COMMAND?
-+cmd_post : gdb -batch --command=@D @E @C
-+cmd_dbg : ddd --debugger gdb --command=@D @E @C
++#cmd_post : ?DEBUGGER_COMMAND_POST?
++#cmd_dbg : ?DEBUGGER_COMMAND?
#-------------------------------------------------------------------------------
- # style of ctags used (optionnal, leave commented to ignore ctags generation)
-Index: astk-1.8.1/ASTK_SERV/etc/aster
-===================================================================
---- astk-1.8.1.orig/ASTK_SERV/etc/aster 2010-07-07 18:18:08.000000000 +0200
-+++ astk-1.8.1/ASTK_SERV/etc/aster 2010-07-13 17:48:59.000000000 +0200
+ # [OPTIONNAL]
+Index: astk-1.10.0/ASTK_SERV/etc/aster
+===================================================================
+--- astk-1.10.0.orig/ASTK_SERV/etc/aster 2011-12-13 11:45:33.000000000 +0100
++++ astk-1.10.0/ASTK_SERV/etc/aster 2011-12-13 11:48:35.000000000 +0100
@@ -3,7 +3,7 @@
- # examples : NEW10, /usr/lib/codeaster/NEW10
+ # examples : NEW11, /usr/lib/codeaster/NEW11
# default version (overridden by --vers option)
-default_vers : ?ASTER_VERSION?
-+default_vers : STA10.2
++default_vers : NEW11.0
# available versions
# DO NOT EDIT FOLLOWING LINE !
-Index: astk-1.8.1/ASTK_SERV/share/codeaster/asrun/data/mpirun_template
-===================================================================
---- astk-1.8.1.orig/ASTK_SERV/share/codeaster/asrun/data/mpirun_template 2010-07-07 18:18:08.000000000 +0200
-+++ astk-1.8.1/ASTK_SERV/share/codeaster/asrun/data/mpirun_template 2010-07-13 17:48:59.000000000 +0200
+Index: astk-1.10.0/ASTK_SERV/share/codeaster/asrun/data/mpirun_template
+===================================================================
+--- astk-1.10.0.orig/ASTK_SERV/share/codeaster/asrun/data/mpirun_template 2011-12-13 11:45:33.000000000 +0100
++++ astk-1.10.0/ASTK_SERV/share/codeaster/asrun/data/mpirun_template 2011-12-13 11:48:35.000000000 +0100
@@ -1,4 +1,4 @@
-#!?SHELL_EXECUTION?
+#!/bin/bash
# $Id: mpirun_template 3529 2008-09-26 08:42:08Z courtois $
-Index: astk-1.8.1/ASTK_CLIENT/bin/bsf
-===================================================================
---- astk-1.8.1.orig/ASTK_CLIENT/bin/bsf 2010-07-07 18:18:07.000000000 +0200
-+++ astk-1.8.1/ASTK_CLIENT/bin/bsf 2010-07-13 17:48:59.000000000 +0200
-@@ -38,5 +38,5 @@
+Index: astk-1.10.0/ASTK_CLIENT/bin/bsf
+===================================================================
+--- astk-1.10.0.orig/ASTK_CLIENT/bin/bsf 2011-12-13 11:45:33.000000000 +0100
++++ astk-1.10.0/ASTK_CLIENT/bin/bsf 2011-12-13 11:50:56.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!?SHELL_EXECUTION?
++#!/bin/bash
+
+ # ==============================================================================
+ # COPYRIGHT (C) 1991 - 2003 EDF R&D WWW.CODE-ASTER.ORG
+@@ -17,21 +17,10 @@
+ # 1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE.
+ # ==============================================================================
+
+-set_prefix() {
+- local this=`readlink -n -f $1`
+- local bin=`dirname $this`
+- prefix=`dirname $bin`
+-}
+-
+-set_prefix $0
+-
+-ASTER_ROOT=$prefix
+-ASTER_ETC=$ASTER_ROOT/etc
+-if [ "$ASTER_ROOT" = "/usr" ]; then
++if [ -z "$ASTER_ETC" ]; then
+ ASTER_ETC=/etc
++ export ASTER_ETC
+ fi
+-export ASTER_ROOT
+-export ASTER_ETC
+
+ # set environment
+ if [ -f $ASTER_ETC/codeaster/profile.sh ]; then
+@@ -43,5 +32,5 @@
WISHEXECUTABLE=wish
fi
--$WISHEXECUTABLE $prefix/lib/astk/bsf.tcl -- $* &
-+$WISHEXECUTABLE $prefix/share/astk/bsf.tcl -- $* &
-
-Index: astk-1.8.1/ASTK_SERV/etc/profile.sh
-===================================================================
---- astk-1.8.1.orig/ASTK_SERV/etc/profile.sh 2010-07-13 17:45:53.000000000 +0200
-+++ astk-1.8.1/ASTK_SERV/etc/profile.sh 2010-07-13 17:47:13.000000000 +0200
-@@ -12,7 +12,7 @@
- export DEFINE_PROFILE_ASRUN=done
- #--- ifndef DEFINE_PROFILE_ASRUN -----------------------------------------------
-
--export ASTER_ROOT=?ASTER_ROOT?
-+export ASTER_ROOT=/usr/lib/codeaster
-
- if [ -z "$PATH" ]; then
- export PATH=$ASTER_ROOT/bin:$ASTER_ROOT/outils
-@@ -20,29 +20,17 @@
- export PATH=$ASTER_ROOT/bin:$ASTER_ROOT/outils:$PATH
+-$WISHEXECUTABLE $ASTER_ROOT/lib/astk/bsf.tcl -- $* &
++$WISHEXECUTABLE /usr/share/astk/bsf.tcl -- $* &
+
+Index: astk-1.10.0/ASTK_SERV/etc/profile.sh
+===================================================================
+--- astk-1.10.0.orig/ASTK_SERV/etc/profile.sh 2011-12-13 11:45:33.000000000 +0100
++++ astk-1.10.0/ASTK_SERV/etc/profile.sh 2011-12-13 11:48:35.000000000 +0100
+@@ -14,39 +14,28 @@
+
+ if [ -z "$ASTER_ROOT" ]; then
+ # from first installation
+- ASTER_ROOT=?ASTER_ROOT?
++ ASTER_ROOT=/usr/lib/codeaster
+ export ASTER_ROOT
+-fi
+-ASTER_ETC=$ASTER_ROOT/etc
+-if [ "$ASTER_ROOT" = "/usr" ]; then
+- ASTER_ETC=/etc
+-fi
+-export ASTER_ETC
+
+-if [ -z "$PATH" ]; then
+- export PATH=$ASTER_ROOT/bin:$ASTER_ROOT/outils
+-else
+- export PATH=$ASTER_ROOT/bin:$ASTER_ROOT/outils:$PATH
++ if [ -z "$PATH" ]; then
++ export PATH=$ASTER_ROOT/bin:$ASTER_ROOT/outils
++ else
++ export PATH=$ASTER_ROOT/bin:$ASTER_ROOT/outils:$PATH
++ fi
fi
-if [ -z "$LD_LIBRARY_PATH" ]; then
-- export LD_LIBRARY_PATH=?HOME_PYTHON?/lib
--else
-- export LD_LIBRARY_PATH=?HOME_PYTHON?/lib:$LD_LIBRARY_PATH
+- export LD_LIBRARY_PATH=?HOME_PYTHON?/lib
+-else
+- export LD_LIBRARY_PATH=?HOME_PYTHON?/lib:$LD_LIBRARY_PATH
++if [ -z "$ASTER_ETC" ]; then
++ ASTER_ETC=/etc
++ export ASTER_ETC
+ fi
+
+-if [ -z "$PYTHONPATH" ]; then
+- export PYTHONPATH=?ASRUN_SITE_PKG?
+-else
+- export PYTHONPATH=?ASRUN_SITE_PKG?:$PYTHONPATH
-fi
--
--if [ -z "$PYTHONPATH" ]; then
-- export PYTHONPATH=?ASRUN_SITE_PKG?
--else
-- export PYTHONPATH=?ASRUN_SITE_PKG?:$PYTHONPATH
--fi
--
+
-export PYTHONEXECUTABLE=?PYTHON_EXE?
+export PYTHONEXECUTABLE=/usr/bin/python
@@ -209,10 +290,117 @@
# source local profile
--if [ -e $ASTER_ROOT/etc/codeaster/profile_local.sh ]; then
-- . $ASTER_ROOT/etc/codeaster/profile_local.sh
-+if [ -e /etc/codeaster/profile_local.sh ]; then
-+ . /etc/codeaster/profile_local.sh
- fi
-
- #--- endif DEFINE_PROFILE_ASRUN ------------------------------------------------
+Index: astk-1.10.0/ASTK_SERV/bin/as_run
+===================================================================
+--- astk-1.10.0.orig/ASTK_SERV/bin/as_run 2011-06-15 17:36:38.000000000 +0200
++++ astk-1.10.0/ASTK_SERV/bin/as_run 2011-12-13 11:59:53.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!?SHELL_EXECUTION?
++#!/bin/bash
+
+ # ==============================================================================
+ # COPYRIGHT (C) 1991 - 2003 EDF R&D WWW.CODE-ASTER.ORG
+@@ -17,21 +17,10 @@
+ # 1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE.
+ # ==============================================================================
+
+-set_prefix() {
+- local this=`readlink -n -f $1`
+- local bin=`dirname $this`
+- prefix=`dirname $bin`
+-}
+-
+-set_prefix $0
+-
+-ASTER_ROOT=$prefix
+-ASTER_ETC=$ASTER_ROOT/etc
+-if [ "$ASTER_ROOT" = "/usr" ]; then
++if [ -z "$ASTER_ETC" ]; then
+ ASTER_ETC=/etc
++ export ASTER_ETC
+ fi
+-export ASTER_ROOT
+-export ASTER_ETC
+
+ # set environment
+ if [ -f $ASTER_ETC/codeaster/profile.sh ]; then
+Index: astk-1.10.0/ASTK_SERV/bin/auto_update.cron
+===================================================================
+--- astk-1.10.0.orig/ASTK_SERV/bin/auto_update.cron 2011-06-15 17:36:38.000000000 +0200
++++ astk-1.10.0/ASTK_SERV/bin/auto_update.cron 2011-12-13 12:02:18.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!?SHELL_EXECUTION?
++#!/bin/bash
+
+ # cron script to update (and build) Code_Aster versions
+
+@@ -27,6 +27,17 @@
+
+
+ # Code_Aster root directory
++
++if [ -z "$ASTER_ETC" ]; then
++ ASTER_ETC=/etc
++ export ASTER_ETC
++fi
++
++# set environment
++if [ -f $ASTER_ETC/codeaster/profile.sh ]; then
++ . $ASTER_ETC/codeaster/profile.sh
++fi
++
+ set_prefix() {
+ local here=`readlink -n -f $1`
+ local bin=`dirname $here`
+@@ -80,7 +91,7 @@
+ ================================================================================
+
+ EOF
+- ${ASTER_ROOT}/bin/as_run --auto_update ${loc} \
++ /usr/bin/as_run --auto_update ${loc} \
+ --report_to=${MAIL_DEST} \
+ --vers=${vers} \
+ >> ${LOG_FILE} 2>> ${ERR_FILE}
+@@ -97,7 +108,7 @@
+ ================================================================================
+
+ EOF
+- ${ASTER_ROOT}/bin/as_run --make \
++ /usr/bin/as_run --make \
+ --report_to=${MAIL_DEST} \
+ --vers=${vers} \
+ >> ${LOG_FILE} 2>> ${ERR_FILE}
+Index: astk-1.10.0/ASTK_SERV/bin/parallel_cp
+===================================================================
+--- astk-1.10.0.orig/ASTK_SERV/bin/parallel_cp 2011-06-15 17:36:38.000000000 +0200
++++ astk-1.10.0/ASTK_SERV/bin/parallel_cp 2011-12-13 12:00:33.000000000 +0100
+@@ -1,4 +1,4 @@
+-#!?SHELL_EXECUTION?
++#!/bin/bash
+
+ # ==============================================================================
+ # COPYRIGHT (C) 1991 - 2003 EDF R&D WWW.CODE-ASTER.ORG
+@@ -17,21 +17,10 @@
+ # 1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE.
+ # ==============================================================================
+
+-set_prefix() {
+- local this=`readlink -n -f $1`
+- local bin=`dirname $this`
+- prefix=`dirname $bin`
+-}
+-
+-set_prefix $0
+-
+-ASTER_ROOT=$prefix
+-ASTER_ETC=$ASTER_ROOT/etc
+-if [ "$ASTER_ROOT" = "/usr" ]; then
++if [ -z "$ASTER_ETC" ]; then
+ ASTER_ETC=/etc
++ export ASTER_ETC
+ fi
+-export ASTER_ROOT
+-export ASTER_ETC
+
+ # set environment
+ if [ -f $ASTER_ETC/codeaster/profile.sh ]; then
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=44150&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/patches/debian-install.patch (original)
+++ packages/code-aster/astk/trunk/debian/patches/debian-install.patch Tue Dec 13 15:40:11 2011
@@ -1,183 +1,50 @@
-Index: astk-1.8.1/ASTK_SERV/asrun/installation.py
+Index: astk-1.10.0/ASTK_SERV/asrun/maintenance.py
===================================================================
---- astk-1.8.1.orig/ASTK_SERV/asrun/installation.py 2010-08-26 16:46:20.000000000 +0200
-+++ astk-1.8.1/ASTK_SERV/asrun/installation.py 2010-08-26 16:46:30.000000000 +0200
-@@ -10,19 +10,18 @@ if os.environ.get('ASTER_ROOT'):
- aster_root = os.environ['ASTER_ROOT']
- else:
- # asrun site-packages pythonX.Y lib prefix
-- aster_root = os.path.normpath(os.path.join(
-- get_absolute_dirname(__file__), os.pardir, os.pardir, os.pardir, os.pardir))
-+ #aster_root = os.path.normpath(os.path.join(
-+ # get_absolute_dirname(__file__), os.pardir, os.pardir, os.pardir, os.pardir))
-+ # For Debian installation hard code
-+ aster_root = '/usr/lib/codeaster'
- os.environ['ASTER_ROOT'] = aster_root
+--- astk-1.10.0.orig/ASTK_SERV/asrun/maintenance.py 2011-12-13 15:32:36.000000000 +0100
++++ astk-1.10.0/ASTK_SERV/asrun/maintenance.py 2011-12-13 15:51:27.000000000 +0100
+@@ -869,11 +869,14 @@
+ if run.IsDir(libferm):
+ libferm = os.path.join(libaster, 'ferm.lib')
+ run.Mess(_(u'Start build in %s mode') % mode, 'TITLE')
++ #run.Mess(_(u'destdir = %s') % destdir, 'TITLE')
++ #run.Mess(_(u'REPPREF = %s') % REPREF, 'TITLE')
+
+ # 1.2. compile updated files
+ tit = _(u'Compilation in %s mode') % mode
+ run.timer.Start(tit)
+ kret = build.CompilAster(REPREF, dbg=mode)
++ #kret = build.CompilAster(destdir, dbg=mode)
+ run.timer.Stop(tit)
+ run.CheckOK()
+
+Index: astk-1.10.0/setup.py
+===================================================================
+--- astk-1.10.0.orig/setup.py 2011-12-13 15:32:36.000000000 +0100
++++ astk-1.10.0/setup.py 2011-12-13 15:51:27.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'))
+ data_files.extend(build_data_files('share', 'ASTK_SERV/share'))
+- data_files.extend(build_data_files('share/codeaster/asrun/unittest', 'ASTK_SERV/unittest'))
++ data_files.extend(build_data_files('lib/codeaster/asrun/unittest', 'ASTK_SERV/unittest'))
+ if sys.hexversion >= 0x020500F0:
+ data_files.extend(build_data_files('share/locale', 'ASTK_SERV/i18n/locale'))
+
+Index: astk-1.10.0/ASTK_SERV/asrun/installation.py
+===================================================================
+--- astk-1.10.0.orig/ASTK_SERV/asrun/installation.py 2011-06-15 17:36:38.000000000 +0200
++++ astk-1.10.0/ASTK_SERV/asrun/installation.py 2011-12-13 15:52:19.000000000 +0100
+@@ -18,11 +18,8 @@
# directory for configuration files (profile.sh, config)
# alternative to /etc/code_aster for non-root install
-prefix = aster_root
-if aster_root == '/usr':
- prefix = '/'
--confdir = os.path.join(prefix, 'etc', 'codeaster')
+-confdir = osp.join(prefix, 'etc', 'codeaster')
+-
+confdir = os.path.join('/etc', 'codeaster')
-
- # directory containing data files
--datadir = os.path.join(aster_root, 'share', 'codeaster', 'asrun', 'data')
-+datadir = os.path.join('/usr', 'lib', 'codeaster', 'asrun', 'data')
-
- # directory for internationalization
--localedir = os.path.join(aster_root, 'share', 'locale')
-+localedir = os.path.join('/usr', 'share', 'locale')
-Index: astk-1.8.1/ASTK_SERV/asrun/maintenance.py
-===================================================================
---- astk-1.8.1.orig/ASTK_SERV/asrun/maintenance.py 2010-08-26 16:46:20.000000000 +0200
-+++ astk-1.8.1/ASTK_SERV/asrun/maintenance.py 2010-08-26 16:46:30.000000000 +0200
-@@ -759,22 +759,29 @@ def MakeAster(run, *args):
- subject = subject)
-
- elif target == 'clean':
-- if len(param) == 0:
-+ destdir = run.get('destdir')
-+ if not destdir :
-+ destdir = REPREF
-+ else :
-+ destdir = destdir + REPREF
-+ run.Mess(_(u'cleaning : %s') % destdir, 'TITLE')
-+
-+ if len(param) == 0:
- l_clean = ['BIN_NODBG', 'BIN_DBG', 'BINCMDE', 'BINELE', 'BINPICKLED',
- 'BINLIB_NODBG', 'BINLIB_DBG', 'BINSHLIB_NODBG', 'BINSHLIB_DBG',
- 'BINLIBF_NODBG', 'BINLIBF_DBG', 'BINSHLIBF_NODBG', 'BINSHLIBF_DBG',
-- 'BINOBJ_NODBG', 'BINOBJF_NODBG', 'BINOBJ_DBG', 'BINOBJF_DBG']
-- for key in l_clean:
-- ficrep = os.path.join(REPREF, conf[key][0])
-+ 'BINOBJ_NODBG', 'BINOBJF_NODBG', 'BINOBJ_DBG', 'BINOBJF_DBG']
-+ for key in l_clean:
-+ ficrep = os.path.join(destdir, conf[key][0])
- if conf[key][0] != '':
- run.Delete(ficrep, verbose=True)
-- remove_empty_dirs(REPREF)
-+ remove_empty_dirs(destdir)
- else:
- for dsrc in param:
- # source files
- lf = []
- for ext in ('*.c', '*.f', '*.F'):
-- lf.extend(glob.glob(os.path.join(REPREF, dsrc, ext)))
-+ lf.extend(glob.glob(os.path.join(destdir, dsrc, ext)))
- # object files
- lo = [os.path.splitext(os.path.basename(f))[0]+'.o' for f in lf]
- for dobj in ('BINOBJ_NODBG', 'BINOBJ_DBG'):
-@@ -783,7 +790,7 @@ def MakeAster(run, *args):
- run.VerbStart(ufmt(_(u'remove %d object files of %s from %s'), len(lo),
- dsrc, ficrep), verbose=True)
- for fo in lo:
-- run.Delete(os.path.join(REPREF, ficrep, fo))
-+ run.Delete(os.path.join(destdir, ficrep, fo))
- run.VerbEnd(0, '%5d files' % len(lo), verbose=True)
- else:
- run.Mess(_(u'unknown target : %s') % target, '<F>_INVALID_ARGUMENT')
-@@ -812,6 +819,9 @@ def _build_aster(run, conf, iupdate, REPREF, destdir, reptrav, lardv=None):
- debug_mode = [mod for mod in conf['MAKE'][0].split() if mod in ('debug', 'nodebug')]
- if not destdir:
- destdir = REPREF
-+ else :
-+ destdir = destdir+REPREF
-+ destdir_copy = True
-
- # ----- Initialize MPI_INFO object
- mpi_info = MPI_INFO(conf.get_defines())
-@@ -860,11 +870,13 @@ def _build_aster(run, conf, iupdate, REPREF, destdir, reptrav, lardv=None):
- if run.IsDir(libferm):
- libferm = os.path.join(libaster, 'ferm.lib')
- run.Mess(_(u'Start build in %s mode') % mode, 'TITLE')
-+ run.Mess(_(u'destdir = %s') % destdir, 'TITLE')
-+ run.Mess(_(u'REPPREF = %s') % REPREF, 'TITLE')
-
- # 1.2. compile updated files
- tit = _(u'Compilation in %s mode') % mode
- run.timer.Start(tit)
-- kret = build.CompilAster(REPREF, dbg=mode)
-+ kret = build.CompilAster(destdir, dbg=mode)
- run.timer.Stop(tit)
- run.CheckOK()
-
-@@ -872,13 +884,13 @@ def _build_aster(run, conf, iupdate, REPREF, destdir, reptrav, lardv=None):
- # 1.3.1. obj or dbg
- tit = _(u'Add object files to library')
- run.timer.Start(tit)
-- kret = build.Archive(repobj=os.path.join(REPREF, DbgPara[mode]['suff']),
-+ kret = build.Archive(repobj=os.path.join(destdir, DbgPara[mode]['suff']),
- lib=libaster)
- run.CheckOK()
-
- # 1.3.2. obj_f or dbg_f
- kret = build.Archive(
-- repobj=os.path.join(REPREF, DbgPara[mode]['suffer']),
-+ repobj=os.path.join(destdir, DbgPara[mode]['suffer']),
- lib=libferm)
- run.CheckOK()
- run.timer.Stop(tit)
-@@ -897,7 +909,10 @@ def _build_aster(run, conf, iupdate, REPREF, destdir, reptrav, lardv=None):
- # - required Python modules are present
- tit = _(u'Test executables')
- run.timer.Start(tit)
-- cmd = exec_name + ' -c '
-+ if not destdir :
-+ cmd = exec_name + ' -c '
-+ else :
-+ cmd = 'LD_LIBRARY_PATH='+ destdir + 'lib ' + exec_name + ' -c '
- cpyt = ['import traceback']
- cmd_import = """
- print '%(cmd)s :',
-@@ -934,7 +949,7 @@ except:
- kargs['exe'] = os.path.join(destdir, DbgPara['debug']['exe'])
- tit = _(u'Compilation of commands catalogue')
- run.timer.Start(tit)
-- kret = build.CompilCapy(REPREF, reptrav, i18n=True, **kargs)
-+ kret = build.CompilCapy(destdir, reptrav, i18n=True, **kargs)
- run.timer.Stop(tit)
- run.CheckOK()
-
-@@ -945,25 +960,16 @@ except:
- })
- tit = _(u'Make pickled of elements')
- run.timer.Start(tit)
-- kret = build.MakePickled(REPREF, reptrav, repdest=destdir, **kargs)
-+ kret = build.MakePickled(destdir, reptrav, repdest=destdir, **kargs)
- run.timer.Stop(tit)
- run.CheckOK()
-
- tit = _(u'Elements compilation')
- run.timer.Start(tit)
-- kret = build.CompilEle(REPREF, reptrav, **kargs)
-+ kret = build.CompilEle(destdir, reptrav, **kargs)
- run.timer.Stop(tit)
- run.CheckOK()
-
-- # 4. ----- copy of auxiliary files
-- if os.path.abspath(destdir) != os.path.abspath(REPREF):
-- lsrc = [os.path.join(REPREF, fsrc) for fsrc in [conf['SRCPY'][0], conf.get_filename()]]
-- run.Copy(destdir, *lsrc)
-- #XXX only works if the files are in REPREF
-- lsrc = [os.path.join(REPREF, fsrc) for fsrc in conf['ENV_SH'] \
-- if fsrc == os.path.basename(fsrc)]
-- run.Copy(destdir, *lsrc)
--
- # 9. ----- end
- run.Mess(_(u'Code_Aster has been successfully built'), 'OK')
-
-Index: astk-1.8.1/setup.py
-===================================================================
---- astk-1.8.1.orig/setup.py 2010-08-26 16:49:00.000000000 +0200
-+++ astk-1.8.1/setup.py 2010-08-26 16:49:21.000000000 +0200
-@@ -53,7 +53,7 @@ def start_setup(prefix):
- 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'))
- data_files.extend(build_data_files('share', 'ASTK_SERV/share'))
-- data_files.extend(build_data_files('share/codeaster/asrun/unittest', 'ASTK_SERV/unittest'))
-+ data_files.extend(build_data_files('lib/codeaster/asrun/unittest', 'ASTK_SERV/unittest'))
- if sys.hexversion >= 0x020500F0:
- data_files.extend(build_data_files('share/locale', 'ASTK_SERV/i18n/locale'))
-
++
+ # confdir contains plugins directory
+ if confdir not in sys.path:
+ sys.path.append(confdir)
Modified: packages/code-aster/astk/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/patches/series?rev=44150&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/patches/series (original)
+++ packages/code-aster/astk/trunk/debian/patches/series Tue Dec 13 15:40:11 2011
@@ -1,2 +1,3 @@
config.patch
+tcl_fixpath.patch
debian-install.patch
Added: packages/code-aster/astk/trunk/debian/patches/tcl_fixpath.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/patches/tcl_fixpath.patch?rev=44150&op=file
==============================================================================
--- packages/code-aster/astk/trunk/debian/patches/tcl_fixpath.patch (added)
+++ packages/code-aster/astk/trunk/debian/patches/tcl_fixpath.patch Tue Dec 13 15:40:11 2011
@@ -1,0 +1,158 @@
+Index: astk-1.10.0/ASTK_CLIENT/lib/init_env.tcl
+===================================================================
+--- astk-1.10.0.orig/ASTK_CLIENT/lib/init_env.tcl 2011-06-15 17:36:38.000000000 +0200
++++ astk-1.10.0/ASTK_CLIENT/lib/init_env.tcl 2011-12-13 12:10:30.000000000 +0100
+@@ -132,7 +132,7 @@
+ set idexp [open $ftmp w]
+ write_server_infos $idexp $serv
+ close $idexp
+- set lcmd [file join $ashare::prefix "bin" as_run]
++ set lcmd [file join $ashare::prefix "usr/bin" as_run]
+ append lcmd " --proxy --info --schema=[get_schema $serv info] $ftmp"
+ append lcmd [ashare::get_glob_args]
+ # on n'ajoute pas les protocoles en argument :
+Index: astk-1.10.0/ASTK_CLIENT/lib/aide.tcl
+===================================================================
+--- astk-1.10.0.orig/ASTK_CLIENT/lib/aide.tcl 2011-06-15 17:36:38.000000000 +0200
++++ astk-1.10.0/ASTK_CLIENT/lib/aide.tcl 2011-12-13 12:17:11.000000000 +0100
+@@ -144,7 +144,7 @@
+ set idexp [open $ftmp w]
+ write_server_infos $idexp $serv
+ close $idexp
+- append lcmd [file join $ashare::prefix "bin" as_run]
++ append lcmd [file join $ashare::prefix "usr/bin" as_run]
+ append lcmd " --proxy --sendmail --schema=[get_schema $serv sendmail]"
+ append [ashare::get_glob_args]
+ append argu "--report_to=$astk::agla(mail_ata) "
+Index: astk-1.10.0/ASTK_CLIENT/lib/asjob_main.tcl
+===================================================================
+--- astk-1.10.0.orig/ASTK_CLIENT/lib/asjob_main.tcl 2011-06-15 17:36:38.000000000 +0200
++++ astk-1.10.0/ASTK_CLIENT/lib/asjob_main.tcl 2011-12-13 12:17:14.000000000 +0100
+@@ -244,7 +244,7 @@
+ puts $idexp "P noeud $noeud"
+ close $idexp
+ set retour -1
+- append cmd [file join $ashare::prefix "bin" as_run]
++ append cmd [file join $ashare::prefix "usr/bin" as_run]
+ append cmd " --proxy --del --schema=[get_schema $nsrv stop_del] $ftmp"
+ append lcmd [ashare::get_glob_args]
+ append cmd " --signal=KILL ; "
+@@ -306,7 +306,7 @@
+ set idexp [open $ftmp w]
+ write_server_infos $idexp $nsrv
+ close $idexp
+- set cmd [file join $ashare::prefix "bin" as_run]
++ set cmd [file join $ashare::prefix "usr/bin" as_run]
+ append cmd [ashare::get_glob_args]
+ append cmd " --proxy --purge_flash --schema=[get_schema $nsrv purge_flash] $ftmp"
+ set id [array startsearch asjob::TextJobs]
+@@ -371,7 +371,7 @@
+ puts $idexp "P noeud $noeud"
+ close $idexp
+ set lcmd ""
+- append lcmd [file join $ashare::prefix "bin" as_run]
++ append lcmd [file join $ashare::prefix "usr/bin" as_run]
+ append lcmd " --proxy --del --schema=[get_schema $nsrv stop_del] $ftmp"
+ append lcmd [ashare::get_glob_args]
+ append lcmd " --signal=USR1"
+@@ -493,7 +493,7 @@
+ puts $idexp "P edit_type $type"
+ close $idexp
+ set lcmd ""
+- append lcmd [file join $ashare::prefix "bin" as_run]
++ append lcmd [file join $ashare::prefix "usr/bin" as_run]
+ append lcmd " --proxy --edit --schema=[get_schema $nsrv edit] $ftmp"
+ if { $action == "output_html" } {
+ append lcmd " --result_to_output"
+@@ -565,7 +565,7 @@
+ puts $idexp "P mode $mode"
+ close $idexp
+ set lcmd ""
+- append lcmd [file join $ashare::prefix "bin" as_run]
++ append lcmd [file join $ashare::prefix "usr/bin" as_run]
+ append lcmd " --proxy --get_results --schema=[get_schema $nsrv get_results]"
+ append lcmd [ashare::get_glob_args]
+ set argu "$ftmp"
+@@ -634,7 +634,7 @@
+ puts $idexp "P tail_regexp $expr_tail"
+ close $idexp
+ set lcmd ""
+- append lcmd [file join $ashare::prefix "bin" as_run]
++ append lcmd [file join $ashare::prefix "usr/bin" as_run]
+ append lcmd " --proxy --tail --schema=[get_schema $nsrv tail] $ftmp"
+ append lcmd [ashare::get_glob_args]
+ set retour [ashare::rexec_cmd -1 astk::config $lcmd "" 0 out $asjob::fen_root progress]
+Index: astk-1.10.0/ASTK_CLIENT/lib/convbase.tcl
+===================================================================
+--- astk-1.10.0.orig/ASTK_CLIENT/lib/convbase.tcl 2011-06-15 17:36:38.000000000 +0200
++++ astk-1.10.0/ASTK_CLIENT/lib/convbase.tcl 2011-12-13 12:17:12.000000000 +0100
+@@ -110,7 +110,7 @@
+ set lcmd ""
+ set argu ""
+ # profil
+- append lcmd [file join $ashare::prefix "bin" as_run]
++ append lcmd [file join $ashare::prefix "usr/bin" as_run]
+ append lcmd " --proxy --serv --schema=[get_schema $serv serv]"
+ append lcmd [ashare::get_glob_args]
+ if { [is_localhost_serv $serv_export] == 0 } {
+Index: astk-1.10.0/ASTK_CLIENT/lib/fichier.tcl
+===================================================================
+--- astk-1.10.0.orig/ASTK_CLIENT/lib/fichier.tcl 2011-06-15 17:36:38.000000000 +0200
++++ astk-1.10.0/ASTK_CLIENT/lib/fichier.tcl 2011-12-13 12:16:53.000000000 +0100
+@@ -319,7 +319,7 @@
+ write_server_infos $idexp $srv
+ close $idexp
+ # as_run --get_export testcase
+- append lcmd [file join $ashare::prefix "bin" as_run]
++ append lcmd [file join $ashare::prefix "usr/bin" as_run]
+ append lcmd " --proxy --get_export --schema=[get_schema $srv get_export] $ftmp"
+ append lcmd " --vers=$astk::profil(version)"
+ append lcmd " $tst"
+@@ -487,7 +487,7 @@
+ # préparation de la ligne de commande à exécuter
+ set lcmd ""
+ set argu ""
+- append lcmd [file join $ashare::prefix "bin" as_run]
++ append lcmd [file join $ashare::prefix "usr/bin" as_run]
+ append lcmd " --proxy --insert_in_db --schema=[get_schema $serv insert_in_db]"
+ append lcmd [ashare::get_glob_args]
+ append argu $astk::profil(nom_fich_export)
+Index: astk-1.10.0/ASTK_CLIENT/lib/i_serv.tcl
+===================================================================
+--- astk-1.10.0.orig/ASTK_CLIENT/lib/i_serv.tcl 2011-06-15 17:36:38.000000000 +0200
++++ astk-1.10.0/ASTK_CLIENT/lib/i_serv.tcl 2011-12-13 12:17:12.000000000 +0100
+@@ -98,7 +98,7 @@
+ set lcmd ""
+ set argu ""
+ # as_exec fichier_export
+- append lcmd [file join $ashare::prefix "bin" as_run]
++ append lcmd [file join $ashare::prefix "usr/bin" as_run]
+ append lcmd " --proxy --serv --schema=[get_schema $serv serv]"
+ append lcmd [ashare::get_glob_args]
+ if { [is_localhost_serv $astk::profil(serv_fich_export)] == 0 } {
+Index: astk-1.10.0/ASTK_CLIENT/lib/ihm_outils.tcl
+===================================================================
+--- astk-1.10.0.orig/ASTK_CLIENT/lib/ihm_outils.tcl 2011-06-15 17:36:38.000000000 +0200
++++ astk-1.10.0/ASTK_CLIENT/lib/ihm_outils.tcl 2011-12-13 12:17:13.000000000 +0100
+@@ -331,7 +331,7 @@
+ set argu ""
+ # tool_stanley profil
+ #XXX assert serv_export == -1 !
+- append lcmd [file join $ashare::prefix "bin" as_run]
++ append lcmd [file join $ashare::prefix "usr/bin" as_run]
+ append lcmd " --proxy --serv --schema=[get_schema $serv serv]"
+ append lcmd [ashare::get_glob_args]
+ if { [is_localhost_serv $serv_export] == 0 } {
+Index: astk-1.10.0/ASTK_CLIENT/lib/ihm_rex.tcl
+===================================================================
+--- astk-1.10.0.orig/ASTK_CLIENT/lib/ihm_rex.tcl 2011-06-15 17:36:38.000000000 +0200
++++ astk-1.10.0/ASTK_CLIENT/lib/ihm_rex.tcl 2011-12-13 12:17:14.000000000 +0100
+@@ -249,7 +249,7 @@
+ # préparation de la ligne de commande à exécuter
+ set lcmd ""
+ set argu ""
+- append lcmd [file join $ashare::prefix "bin" as_run]
++ append lcmd [file join $ashare::prefix "usr/bin" as_run]
+ append lcmd " --proxy --create_issue --schema=[get_schema $serv create_issue]"
+ append lcmd [ashare::get_glob_args]
+ append argu $frex
Modified: packages/code-aster/astk/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/rules?rev=44150&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/rules (original)
+++ packages/code-aster/astk/trunk/debian/rules Tue Dec 13 15:40:11 2011
@@ -1,8 +1,8 @@
#!/usr/bin/make -f
# Copyright 2008 - Sylvestre Ledru <sylvestre.ledru at inria.fr>
-ASTER_VERSION=10.3.0
-ASTER_VERSION_FULL=$(ASTER_VERSION)-3
+ASTER_VERSION=11.0.10
+ASTER_VERSION_FULL=$(ASTER_VERSION)-2
ASTER_ROOT=/usr/lib/codeaster
DEB_PYTHON_SYSTEM=pysupport
@@ -13,102 +13,38 @@
DEB_PYTHON_MODULE_PACKAGE = asrun
DEB_PYTHON_COMPILE_VERSION := $(shell pyversions -r)
-#DEB_PYTHON_INSTALL_ARGS_ALL += --no-compile \
-# --install-lib=usr/share/python-support/astk
DEB_PYTHON_INSTALL_ARGS_ALL += --no-compile \
--install-lib=usr/share/python-support --install-layout=deb
export DESTDIR = $(DEB_DESTDIR)
install/code-aster-gui::
- mkdir -p debian/code-aster-gui/usr/bin
- #mv $(DEB_DESTDIR)/usr/ASTK/ASTK_CLIENT debian/code-aster-gui/usr/bin
- mv $(DEB_DESTDIR)/usr/bin/codeaster-gui debian/code-aster-gui/usr/bin
- mv $(DEB_DESTDIR)/usr/bin/astk debian/code-aster-gui/usr/bin
-
- mkdir -p debian/code-aster-gui/usr/share/astk
- mv $(DEB_DESTDIR)/usr/lib/astk/*.tcl debian/code-aster-gui/usr/share/astk
- mv $(DEB_DESTDIR)/usr/lib/astk/BWidget-1.7.0 debian/code-aster-gui/usr/share/astk
- mv $(DEB_DESTDIR)/usr/lib/astk/DOC debian/code-aster-gui/usr/share/astk
- mv $(DEB_DESTDIR)/usr/lib/astk/HELP debian/code-aster-gui/usr/share/astk
- mv $(DEB_DESTDIR)/usr/lib/astk/icons debian/code-aster-gui/usr/share/astk
- mv $(DEB_DESTDIR)/usr/lib/astk/locales.txt debian/code-aster-gui/usr/share/astk
- mv $(DEB_DESTDIR)/usr/lib/astk/RELNOTES debian/code-aster-gui/usr/share/astk
- rm -f debian/code-aster-gui/usr/share/astk/BWidget-1.7.0/LICENSE.txt
+ rm -f $(DEB_DESTDIR)/usr/lib/astk/BWidget-1.7.0/LICENSE.txt
- mkdir -p debian/code-aster-gui/etc/codeaster/astkrc
- mv $(DEB_DESTDIR)/etc/codeaster/astkrc/* debian/code-aster-gui/etc/codeaster/astkrc
-
- install -d debian/code-aster-gui/usr/share/applications
- install -m 0644 debian/code-aster-gui.desktop debian/code-aster-gui/usr/share/applications
-
- install -d debian/code-aster-gui/usr/share/pixmaps
- install -m 0644 debian/astk.xpm debian/code-aster-gui/usr/share/pixmaps
-
- mkdir -p debian/code-aster-gui/usr/share/man/man1
- install -m 0644 debian/astk.1 debian/code-aster-gui/usr/share/man/man1
- install -m 0644 debian/codeaster-gui.1 debian/code-aster-gui/usr/share/man/man1
- install -m 0644 debian/bsf.1 debian/code-aster-gui/usr/share/man/man1
-
# Add links in $ASTER_ROOT/outils
- mkdir -p mkdir -p debian/code-aster-gui/$(ASTER_ROOT)/outils
+ mkdir -p debian/code-aster-gui/$(ASTER_ROOT)/outils
+ ln -sf /usr/bin/eficas debian/code-aster-gui/$(ASTER_ROOT)/outils
ln -sf /usr/bin/eficasQt debian/code-aster-gui/$(ASTER_ROOT)/outils
ln -sf /usr/bin/gmsh debian/code-aster-gui/$(ASTER_ROOT)/outils
ln -sf /usr/bin/xmgrace debian/code-aster-gui/$(ASTER_ROOT)/outils
install/code-aster-run::
- mkdir -p debian/code-aster-run/usr/bin
- #mv $(DEB_DESTDIR)/usr/ASTK/ASTK_CLIENT debian/code-aster-run/usr/bin
- mv $(DEB_DESTDIR)/usr/bin/codeaster debian/code-aster-run/usr/bin
- mv $(DEB_DESTDIR)/usr/bin/as_run debian/code-aster-run/usr/bin
- mv $(DEB_DESTDIR)/usr/bin/get debian/code-aster-run/usr/bin/codeaster-get
- mv $(DEB_DESTDIR)/usr/bin/getop debian/code-aster-run/usr/bin/codeaster-getop
- #mv $(DEB_DESTDIR)/usr/bin/show debian/code-aster-run/usr/bin
- mv $(DEB_DESTDIR)/usr/bin/parallel_cp debian/code-aster-run/usr/bin/codeaster-parallel_cp
-
- install -d debian/code-aster-run/etc/codeaster
- install -m 0644 ASTK_SERV/etc/profile.sh debian/code-aster-run/etc/codeaster
- install -m 0644 ASTK_SERV/etc/config_nodename debian/code-aster-run/etc/codeaster
- install -m 0644 ASTK_SERV/etc/aster debian/code-aster-run/etc/codeaster
- install -m 0644 ASTK_SERV/etc/profile.csh debian/code-aster-run/etc/codeaster
- install -m 0644 ASTK_SERV/etc/asrun debian/code-aster-run/etc/codeaster
- install -m 0644 debian/aster-mpihosts debian/code-aster-run/etc/codeaster
- # Add version to /etc/codeaster/aster
- perl -pi -e "s|#\?vers : VVV\?|vers : STA10.3|" debian/code-aster-run/etc/codeaster/aster
+ # Add version to ASTK_SERV/etc/aster(/etc/codeaster/aster)
+ perl -pi -e "s|#\?vers : VVV\?|vers : NEW11.0|" ASTK_SERV/etc/aster
- install -d debian/code-aster-run/$(ASTER_ROOT)/asrun
- mv $(DEB_DESTDIR)/$(ASTER_ROOT)/* debian/code-aster-run/$(ASTER_ROOT)
-
- mkdir -p debian/code-aster-run/usr/lib/codeaster/asrun/data
- install ASTK_SERV/share/codeaster/asrun/data/mpirun_template debian/code-aster-run/usr/lib/codeaster/asrun/data
-
-
mkdir -p debian/code-aster-run/usr/share/python-support
mv $(DEB_DESTDIR)/usr/share/python-support debian/code-aster-run/usr/share/python-support
+
+ mkdir -p debian/tmp/usr/lib/codeaster/bin
+ ln -sf /usr/bin/as_run debian/tmp/usr/lib/codeaster/bin/as_run
- #mkdir -p debian/code-aster-run/usr/share/python-support
- #mv $(DEB_DESTDIR)/usr/ASTK/ASTK_SERV/lib/*.py debian/code-aster-run/usr/share/python-support
+ cd $(DEB_DESTDIR)/usr/bin && mv get codeaster-get
+ cd $(DEB_DESTDIR)/usr/bin && mv parallel_cp codeaster-parallel_cp
- #mkdir -p debian/code-aster-run/usr/bin
- #mv $(DEB_DESTDIR)/usr/ASTK/ASTK_SERV/bin/as_* debian/code-aster-run/usr/binls
-
- mkdir -p debian/code-aster-run/usr/share/man/man1
- install -m 0644 debian/as_run.1 debian/code-aster-run/usr/share/man/man1
- install -m 0644 debian/codeaster.1 debian/code-aster-run/usr/share/man/man1
- install -m 0644 debian/codeaster-get.1 debian/code-aster-run/usr/share/man/man1
- install -m 0644 debian/codeaster-getop.1 debian/code-aster-run/usr/share/man/man1
- install -m 0644 debian/codeaster-parallel_cp.1 debian/code-aster-run/usr/share/man/man1
-
- install -d debian/code-aster-run/usr/share/locale
- mv $(DEB_DESTDIR)/usr/share/locale/* debian/code-aster-run/usr/share/locale
+clean::
+ rm -rf build
- mkdir -p debian/code-aster-run/usr/lib/codeaster/bin
- ln -sf /usr/bin/as_run debian/code-aster-run/usr/lib/codeaster/bin/as_run
-
- # override lintian error
- mkdir -p debian/code-aster-run/usr/share/lintian/overrides
- cp debian/code-aster-run.lintian-overrides debian/code-aster-run/usr/share/lintian/overrides
get-orig-source:
# Retreive aster-full-src-$(ASTER_VERSION_FULL).noarch.tar.gz
mkdir -p tmp
More information about the debian-science-commits
mailing list