r45550 - in /packages/code-aster/astk/trunk/debian: changelog control patches/config.patch patches/debian-install.patch patches/tcl_fixpath.patch rules
apalazzi-guest at users.alioth.debian.org
apalazzi-guest at users.alioth.debian.org
Sat Jan 26 18:23:15 UTC 2013
Author: apalazzi-guest
Date: Sat Jan 26 18:23:15 2013
New Revision: 45550
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45550
Log:
Various updates.
Updated to upstream version 1.11.0; some patches were fixed because
they didn't apply correctly.
Removed build-deps from gmsh and grace, unnecessary.
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/tcl_fixpath.patch
packages/code-aster/astk/trunk/debian/rules
Modified: packages/code-aster/astk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/changelog?rev=45550&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/changelog (original)
+++ packages/code-aster/astk/trunk/debian/changelog Sat Jan 26 18:23:15 2013
@@ -1,3 +1,10 @@
+astk (1.11.0-1) unstable; urgency=low
+
+ * Updated to version 1.11.0
+ * Removed unnecessary build-deps on gmsh, garce and eficas
+
+ -- Andrea Palazzi <palazziandrea at yahoo.it> Mon, 31 Dec 2012 14:31:43 +0100
+
astk (1.10.4-5) unstable; urgency=low
* code-aster-run :
Modified: packages/code-aster/astk/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/control?rev=45550&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/control (original)
+++ packages/code-aster/astk/trunk/debian/control Sat Jan 26 18:23:15 2013
@@ -4,8 +4,7 @@
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.3
-Build-Depends: debhelper (>= 8), python-all (>= 2.6.6-3~), po-debconf,
- gmsh, grace, eficas
+Build-Depends: debhelper (>= 8), python-all (>= 2.6.6-3~), po-debconf
X-Python-Version: all
Homepage: http://www.code-aster.org/
Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/code-aster/astk/
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=45550&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/patches/config.patch (original)
+++ packages/code-aster/astk/trunk/debian/patches/config.patch Sat Jan 26 18:23:15 2013
@@ -1,7 +1,5 @@
-Index: astk-1.10.0/ASTK_CLIENT/etc/astkrc/outils
-===================================================================
---- astk-1.10.0.orig/ASTK_CLIENT/etc/astkrc/outils 2011-12-16 13:20:49.000000000 +0100
-+++ astk-1.10.0/ASTK_CLIENT/etc/astkrc/outils 2011-12-16 16:23:22.000000000 +0100
+--- a/ASTK_CLIENT/etc/astkrc/outils
++++ b/ASTK_CLIENT/etc/astkrc/outils
@@ -4,22 +4,22 @@
astkrc_version : 1.1
#
@@ -29,10 +27,8 @@
ext : dat
dist : on
#
-Index: astk-1.10.0/ASTK_CLIENT/bin/astk
-===================================================================
---- astk-1.10.0.orig/ASTK_CLIENT/bin/astk 2011-12-16 13:20:49.000000000 +0100
-+++ astk-1.10.0/ASTK_CLIENT/bin/astk 2011-12-16 16:23:22.000000000 +0100
+--- a/ASTK_CLIENT/bin/astk
++++ b/ASTK_CLIENT/bin/astk
@@ -1,4 +1,4 @@
-#!?SHELL_EXECUTION?
+#!/bin/bash
@@ -70,10 +66,8 @@
-$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-16 13:20:49.000000000 +0100
-+++ astk-1.10.0/ASTK_SERV/etc/profile.csh 2011-12-16 16:23:22.000000000 +0100
+--- a/ASTK_SERV/etc/profile.csh
++++ b/ASTK_SERV/etc/profile.csh
@@ -14,37 +14,19 @@
if !($?ASTER_ROOT) then
@@ -118,11 +112,8 @@
# source local profile
- # source local profile
-Index: astk-1.10.0/ASTK_SERV/etc/asrun
-===================================================================
---- astk-1.10.0.orig/ASTK_SERV/etc/asrun 2011-12-16 13:20:49.000000000 +0100
-+++ astk-1.10.0/ASTK_SERV/etc/asrun 2011-12-16 16:23:22.000000000 +0100
+--- a/ASTK_SERV/etc/asrun
++++ b/ASTK_SERV/etc/asrun
@@ -212,10 +212,10 @@
# mpirun
# available arguments are : mpi_hostfile, mpi_nbnoeud, mpi_nbcpu
@@ -178,10 +169,8 @@
#-------------------------------------------------------------------------------
# [OPTIONNAL]
-Index: astk-1.10.0/ASTK_SERV/etc/aster
-===================================================================
---- astk-1.10.0.orig/ASTK_SERV/etc/aster 2011-12-16 13:20:49.000000000 +0100
-+++ astk-1.10.0/ASTK_SERV/etc/aster 2011-12-16 16:23:22.000000000 +0100
+--- a/ASTK_SERV/etc/aster
++++ b/ASTK_SERV/etc/aster
@@ -3,7 +3,7 @@
# examples : NEW11, /usr/lib/codeaster/NEW11
@@ -191,10 +180,8 @@
# available versions
# DO NOT EDIT FOLLOWING LINE !
-Index: astk-1.10.0/ASTK_CLIENT/bin/bsf
-===================================================================
---- astk-1.10.0.orig/ASTK_CLIENT/bin/bsf 2011-12-16 13:20:49.000000000 +0100
-+++ astk-1.10.0/ASTK_CLIENT/bin/bsf 2011-12-16 16:23:22.000000000 +0100
+--- a/ASTK_CLIENT/bin/bsf
++++ b/ASTK_CLIENT/bin/bsf
@@ -1,4 +1,4 @@
-#!?SHELL_EXECUTION?
+#!/bin/bash
@@ -232,50 +219,39 @@
-$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-16 13:20:49.000000000 +0100
-+++ astk-1.10.0/ASTK_SERV/etc/profile.sh 2011-12-16 16:23:41.000000000 +0100
-@@ -14,39 +14,27 @@
+--- a/ASTK_SERV/etc/profile.sh
++++ b/ASTK_SERV/etc/profile.sh
+@@ -13,12 +13,10 @@
+ #--- ifndef DEFINE_PROFILE_ASRUN -----------------------------------------------
if [ -z "$ASTER_ROOT" ]; then
- # from first installation
-- ASTER_ROOT=?ASTER_ROOT?
+- [ -z "${BASH_SOURCE[0]}" ] && here=$0 || here=${BASH_SOURCE[0]}
+- ASTER_ROOT=`dirname $(dirname $(dirname $(readlink -f ${here})))`
- export ASTER_ROOT
--fi
--ASTER_ETC=$ASTER_ROOT/etc
--if [ "$ASTER_ROOT" = "/usr" ]; then
-- ASTER_ETC=/etc
--fi
--export ASTER_ETC
+ export ASTER_ROOT=/usr/lib/codeaster
-
--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
+ ASTER_ETC=$ASTER_ROOT/etc
+-if [ "$ASTER_ROOT" = "/usr" ]; then
++if [ "$ASTER_ROOT" = "/usrlib/codeaster" ]; then
+ ASTER_ETC=/etc
+ fi
+ export ASTER_ETC
+@@ -29,24 +27,12 @@
+ export PATH=$ASTER_ROOT/bin:$ASTER_ROOT/outils:$PATH
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
-+if [ -z "$ASTER_ETC" ]; then
-+ ASTER_ETC=/etc
-+ export ASTER_ETC
- fi
-
+-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
@@ -287,10 +263,8 @@
# source local profile
-Index: astk-1.10.0/ASTK_SERV/bin/as_run
-===================================================================
---- astk-1.10.0.orig/ASTK_SERV/bin/as_run 2011-12-16 13:20:49.000000000 +0100
-+++ astk-1.10.0/ASTK_SERV/bin/as_run 2011-12-16 16:23:22.000000000 +0100
+--- a/ASTK_SERV/bin/as_run
++++ b/ASTK_SERV/bin/as_run
@@ -1,4 +1,4 @@
-#!?SHELL_EXECUTION?
+#!/bin/bash
@@ -321,10 +295,8 @@
# 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-12-16 13:20:49.000000000 +0100
-+++ astk-1.10.0/ASTK_SERV/bin/auto_update.cron 2011-12-16 16:23:22.000000000 +0100
+--- a/ASTK_SERV/bin/auto_update.cron
++++ b/ASTK_SERV/bin/auto_update.cron
@@ -1,4 +1,4 @@
-#!?SHELL_EXECUTION?
+#!/bin/bash
@@ -367,10 +339,8 @@
--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-12-16 13:20:49.000000000 +0100
-+++ astk-1.10.0/ASTK_SERV/bin/parallel_cp 2011-12-16 16:23:22.000000000 +0100
+--- a/ASTK_SERV/bin/parallel_cp
++++ b/ASTK_SERV/bin/parallel_cp
@@ -1,4 +1,4 @@
-#!?SHELL_EXECUTION?
+#!/bin/bash
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=45550&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/patches/debian-install.patch (original)
+++ packages/code-aster/astk/trunk/debian/patches/debian-install.patch Sat Jan 26 18:23:15 2013
@@ -1,19 +1,17 @@
-Index: astk-1.10.0/ASTK_SERV/asrun/maintenance.py
-===================================================================
---- 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 @@
+--- a/ASTK_SERV/asrun/maintenance.py
++++ b/ASTK_SERV/asrun/maintenance.py
+@@ -798,13 +798,19 @@
subject = subject)
elif target == 'clean':
+ destdir = run.get('destdir')
-+ if not destdir :
-+ destdir = REPREF
-+ else :
-+ destdir = destdir + REPREF
++ 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',
+ l_clean = ['BIN_NODBG', 'BIN_DBG', 'BINCMDE', 'BINCMDE_ZIP', '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']
@@ -23,7 +21,7 @@
if conf[key][0] != '':
run.Delete(ficrep, verbose=True)
remove_empty_dirs(REPREF)
-@@ -783,7 +789,7 @@
+@@ -813,7 +819,7 @@
# source files
lf = []
for ext in ('*.c', '*.f', '*.F'):
@@ -32,7 +30,7 @@
# object files
lo = [os.path.splitext(os.path.basename(f))[0]+'.o' for f in lf]
for dobj in ('BINOBJ_NODBG', 'BINOBJ_DBG'):
-@@ -821,6 +827,8 @@
+@@ -851,6 +857,8 @@
debug_mode = [mod for mod in conf['MAKE'][0].split() if mod in ('debug', 'nodebug')]
if not destdir:
destdir = REPREF
@@ -41,7 +39,7 @@
# ----- Initialize MPI_INFO object
mpi_info = MPI_INFO(conf.get_defines())
-@@ -869,11 +877,14 @@
+@@ -899,11 +907,14 @@
if run.IsDir(libferm):
libferm = os.path.join(libaster, 'ferm.lib')
run.Mess(_(u'Start build in %s mode') % mode, 'TITLE')
@@ -57,7 +55,7 @@
run.timer.Stop(tit)
run.CheckOK()
-@@ -881,13 +892,13 @@
+@@ -911,13 +922,13 @@
# 1.3.1. obj or dbg
tit = _(u'Add object files to library')
run.timer.Start(tit)
@@ -73,7 +71,7 @@
lib=libferm)
run.CheckOK()
run.timer.Stop(tit)
-@@ -906,7 +917,10 @@
+@@ -936,7 +947,10 @@
# - required Python modules are present
tit = _(u'Test executables')
run.timer.Start(tit)
@@ -85,7 +83,7 @@
cpyt = ['import traceback']
cmd_import = """
print '%(cmd)s :',
-@@ -943,7 +957,7 @@
+@@ -973,7 +987,7 @@
kargs['exe'] = os.path.join(destdir, DbgPara['debug']['exe'])
tit = _(u'Compilation of commands catalogue')
run.timer.Start(tit)
@@ -94,7 +92,7 @@
run.timer.Stop(tit)
run.CheckOK()
-@@ -954,24 +968,17 @@
+@@ -984,24 +998,17 @@
})
tit = _(u'Make pickled of elements')
run.timer.Start(tit)
@@ -121,7 +119,7 @@
# 9. ----- end
run.Mess(_(u'Code_Aster has been successfully built'), 'OK')
-@@ -1173,7 +1180,7 @@
+@@ -1202,7 +1209,7 @@
run.Mess(_(u'Apply unigest directives'), 'TITLE')
lardv = []
for f in lunig:
@@ -130,11 +128,9 @@
if re.search('^'+conf['SRCC'][0]+'/' + \
'|^'+conf['SRCFOR'][0]+'/' + \
'|^'+conf['SRCF90'][0]+'/', f):
-Index: astk-1.10.0/setup.py
-===================================================================
---- 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 @@
+--- a/setup.py
++++ b/setup.py
+@@ -86,7 +86,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'))
@@ -143,10 +139,8 @@
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-12-15 17:41:44.000000000 +0100
-+++ astk-1.10.0/ASTK_SERV/asrun/installation.py 2011-12-16 09:19:22.000000000 +0100
+--- a/ASTK_SERV/asrun/installation.py
++++ b/ASTK_SERV/asrun/installation.py
@@ -18,17 +18,14 @@
# directory for configuration files (profile.sh, config)
Modified: 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=45550&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/patches/tcl_fixpath.patch (original)
+++ packages/code-aster/astk/trunk/debian/patches/tcl_fixpath.patch Sat Jan 26 18:23:15 2013
@@ -1,7 +1,5 @@
-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
+--- a/ASTK_CLIENT/lib/init_env.tcl
++++ b/ASTK_CLIENT/lib/init_env.tcl
@@ -132,7 +132,7 @@
set idexp [open $ftmp w]
write_server_infos $idexp $serv
@@ -11,10 +9,8 @@
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
+--- a/ASTK_CLIENT/lib/aide.tcl
++++ b/ASTK_CLIENT/lib/aide.tcl
@@ -144,7 +144,7 @@
set idexp [open $ftmp w]
write_server_infos $idexp $serv
@@ -24,10 +20,8 @@
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
+--- a/ASTK_CLIENT/lib/asjob_main.tcl
++++ b/ASTK_CLIENT/lib/asjob_main.tcl
@@ -244,7 +244,7 @@
puts $idexp "P noeud $noeud"
close $idexp
@@ -64,7 +58,7 @@
append lcmd " --proxy --edit --schema=[get_schema $nsrv edit] $ftmp"
if { $action == "output_html" } {
append lcmd " --result_to_output"
-@@ -565,7 +565,7 @@
+@@ -566,7 +566,7 @@
puts $idexp "P mode $mode"
close $idexp
set lcmd ""
@@ -73,7 +67,7 @@
append lcmd " --proxy --get_results --schema=[get_schema $nsrv get_results]"
append lcmd [ashare::get_glob_args]
set argu "$ftmp"
-@@ -634,7 +634,7 @@
+@@ -635,7 +635,7 @@
puts $idexp "P tail_regexp $expr_tail"
close $idexp
set lcmd ""
@@ -82,10 +76,8 @@
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
+--- a/ASTK_CLIENT/lib/convbase.tcl
++++ b/ASTK_CLIENT/lib/convbase.tcl
@@ -110,7 +110,7 @@
set lcmd ""
set argu ""
@@ -95,11 +87,9 @@
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 @@
+--- a/ASTK_CLIENT/lib/fichier.tcl
++++ b/ASTK_CLIENT/lib/fichier.tcl
+@@ -320,7 +320,7 @@
write_server_infos $idexp $srv
close $idexp
# as_run --get_export testcase
@@ -108,7 +98,7 @@
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 @@
+@@ -496,7 +496,7 @@
# préparation de la ligne de commande à exécuter
set lcmd ""
set argu ""
@@ -117,11 +107,9 @@
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 @@
+--- a/ASTK_CLIENT/lib/i_serv.tcl
++++ b/ASTK_CLIENT/lib/i_serv.tcl
+@@ -107,7 +107,7 @@
set lcmd ""
set argu ""
# as_exec fichier_export
@@ -130,10 +118,8 @@
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
+--- a/ASTK_CLIENT/lib/ihm_outils.tcl
++++ b/ASTK_CLIENT/lib/ihm_outils.tcl
@@ -331,7 +331,7 @@
set argu ""
# tool_stanley profil
@@ -143,10 +129,8 @@
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
+--- a/ASTK_CLIENT/lib/ihm_rex.tcl
++++ b/ASTK_CLIENT/lib/ihm_rex.tcl
@@ -249,7 +249,7 @@
# préparation de la ligne de commande à exécuter
set lcmd ""
Modified: packages/code-aster/astk/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/rules?rev=45550&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/rules (original)
+++ packages/code-aster/astk/trunk/debian/rules Sat Jan 26 18:23:15 2013
@@ -1,12 +1,12 @@
#!/usr/bin/make -f
# Copyright 2008 - Sylvestre Ledru <sylvestre.ledru at inria.fr>
-ASTER_VERSION=11.1.0
-ASTER_VERSION_FULL=$(ASTER_VERSION)-3
+ASTER_VERSION=11.3.0
+ASTER_VERSION_FULL=$(ASTER_VERSION)-2
ASTER_ROOT=/usr/lib/codeaster
DEB_SOURCE_PACKAGE := astk
-DEB_UPSTREAM_VERSION := 1.10.4
+DEB_UPSTREAM_VERSION := 1.11.0
BUILDDIR = $(CURDIR)/debian/build
DEB_DESTDIR = $(CURDIR)/debian/tmp
@@ -38,7 +38,6 @@
ln -sf /usr/bin/xmgrace debian/code-aster-gui/$(ASTER_ROOT)/outils
#install/code-aster-run::
-
# Add version to ASTK_SERV/etc/aster(/etc/codeaster/aster)
perl -pi -e "s|#\?vers : VVV\?|vers : STA10.6|" ASTK_SERV/etc/aster
More information about the debian-science-commits
mailing list