r36747 - in /packages/code-aster/astk/trunk/debian: astk-server.postinst astk.config astk.postinst patches/onecore.patch patches/series
trophime-guest at users.alioth.debian.org
trophime-guest at users.alioth.debian.org
Fri Jul 23 15:11:12 UTC 2010
Author: trophime-guest
Date: Fri Jul 23 15:11:05 2010
New Revision: 36747
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36747
Log:
update postinst scripts
Added:
packages/code-aster/astk/trunk/debian/patches/onecore.patch
Modified:
packages/code-aster/astk/trunk/debian/astk-server.postinst
packages/code-aster/astk/trunk/debian/astk.config
packages/code-aster/astk/trunk/debian/astk.postinst
packages/code-aster/astk/trunk/debian/patches/series
Modified: packages/code-aster/astk/trunk/debian/astk-server.postinst
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/astk-server.postinst?rev=36747&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/astk-server.postinst (original)
+++ packages/code-aster/astk/trunk/debian/astk-server.postinst Fri Jul 23 15:11:05 2010
@@ -21,19 +21,19 @@
if [ "$1" = "configure" ] ; then
db_get astk/platform || true
platform=${RET}
- perl -pi -le "s|\?IFDEF\?|$platform|" /etc/codeaster/asrun
+ perl -pi -le "s|plate-forme : .*|plate-forme : $platform|" /etc/codeaster/asrun
db_get astk/node || true
node=${RET}
- perl -pi -le "s|\?NODE\?|$node|" /etc/codeaster/asrun
+ perl -pi -le "s|noeud : .*|noeud : $node|" /etc/codeaster/asrun
db_get astk/EDITOR || true
editor=${RET}
- perl -pi -le "s|\?EDITOR\?|$servername\.$domainname|" /etc/codeaster/asrun
+ perl -pi -le "s|editor : .*|editor : $editor|" /etc/codeaster/asrun
db_get astk/TERMINAL || true
terminal=${RET}
- perl -pi -le "s|\?TERMINAL\?|$servername\.$domainname|" /etc/codeaster/asrun
+ perl -pi -le "s|terminal : .*|terminal : $terminal|" /etc/codeaster/asrun
fi
Modified: packages/code-aster/astk/trunk/debian/astk.config
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/astk.config?rev=36747&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/astk.config (original)
+++ packages/code-aster/astk/trunk/debian/astk.config Fri Jul 23 15:11:05 2010
@@ -8,8 +8,8 @@
#Set default platform
if [ "${dc_platform}" = "" ] ; then
- DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
- DEB_HOST_ARCH_BITS := $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS)
+ DEB_HOST_ARCH_OS = $(dpkg-architecture -qDEB_HOST_ARCH_OS)
+ DEB_HOST_ARCH_BITS = $(dpkg-architecture -qDEB_HOST_ARCH_BITS)
dc_platform= "$(printf '%s\n' $DEB_HOST_ARCH_OS | tr '[:lower:]' '[:upper:]')"
if [ "${DEB_HOST_ARCH_BITS}" = "64" ; then
dc_platform= "$(printf '%s%d\n' $DEB_HOST_ARCH_OS$DEB_HOST_ARCH_BITS | tr '[:lower:]' '[:upper:]')"
Modified: packages/code-aster/astk/trunk/debian/astk.postinst
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/astk.postinst?rev=36747&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/astk.postinst (original)
+++ packages/code-aster/astk/trunk/debian/astk.postinst Fri Jul 23 15:11:05 2010
@@ -21,22 +21,22 @@
if [ "$1" = "configure" ] ; then
db_get astk/servername || true
servername=${RET}
- perl -pi -le "s|\?SERVER_NAME\?|$servername|" /etc/codeaster/astkrc/config_serveurs
+ perl -pi -le "s|serveur : .*|serveur : $servername|" /etc/codeaster/astkrc/config_serveurs
db_get astk/domainname || true
domainname=${RET}
- perl -pi -le "s|\?DOMAIN_NAME\?|$domainname|" /etc/codeaster/astkrc/prefs
- perl -pi -le "s|\?FULL_SERVER_NAME\?|$servername\.$domainname|" /etc/codeaster/astkrc/config_serveurs
+ perl -pi -le "s|nom_domaine : .*|nom_domaine : $domainname|" /etc/codeaster/astkrc/prefs
+ perl -pi -le "s|nom_complet : .*|nom_complet : $servername\.$domainname|" /etc/codeaster/astkrc/config_serveurs
db_get astk/EDITOR || true
editor=${RET}
- perl -pi -le "s|\?EDITOR\?|$servername\.$domainname|" /etc/codeaster/astkrc/prefs
- perl -pi -le "s|\?EDITOR\?|$servername\.$domainname|" /etc/codeaster/astkrc/config_serveurs
+ perl -pi -le "s|editeur : .*|editeur : $seditor|" /etc/codeaster/astkrc/prefs
+ perl -pi -le "s|editeur : .*|editeur : $editor|" /etc/codeaster/astkrc/config_serveurs
db_get astk/TERMINAL || true
terminal=${RET}
- perl -pi -le "s|\?TERMINAL\?|$servername\.$domainname|" /etc/codeaster/astkrc/prefs
- perl -pi -le "s|\?TERMINAL\?|$servername\.$domainname|" /etc/codeaster/astkrc/config_serveurs
+ perl -pi -le "s|xterm : .*|xterm : $terminal|" /etc/codeaster/astkrc/prefs
+ perl -pi -le "s|xterm : .*|xterm : $terminal|" /etc/codeaster/astkrc/config_serveurs
fi
Added: packages/code-aster/astk/trunk/debian/patches/onecore.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/patches/onecore.patch?rev=36747&op=file
==============================================================================
--- packages/code-aster/astk/trunk/debian/patches/onecore.patch (added)
+++ packages/code-aster/astk/trunk/debian/patches/onecore.patch Fri Jul 23 15:11:05 2010
@@ -1,0 +1,13 @@
+Index: astk-1.8.1/ASTK_SERV/asrun/system.py
+===================================================================
+--- astk-1.8.1.orig/ASTK_SERV/asrun/system.py 2010-07-21 09:57:06.000000000 +0200
++++ astk-1.8.1/ASTK_SERV/asrun/system.py 2010-07-21 09:57:12.000000000 +0200
+@@ -814,7 +814,7 @@
+ iret, out = self.Shell('cat /proc/cpuinfo', mach, user)
+ exp = re.compile('^processor\s+:\s+([0-9]+)', re.MULTILINE)
+ l_ids = exp.findall(out)
+- if len(l_ids) > 1: # else: it should not !
++ if len(l_ids) >= 1: # else: it should not !
+ num = max([int(i) for i in l_ids]) + 1
+ elif on_windows():
+ num = 1
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=36747&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/patches/series (original)
+++ packages/code-aster/astk/trunk/debian/patches/series Fri Jul 23 15:11:05 2010
@@ -2,3 +2,4 @@
config.patch
#install.diff
#aster.diff
+onecore.patch
More information about the debian-science-commits
mailing list