r45602 - in /packages/code-aster/astk/trunk/debian: aster.template changelog code-aster-run.install code-aster-run.postinst code-aster-run.postrm rules update-codeaster-engines

apalazzi-guest at users.alioth.debian.org apalazzi-guest at users.alioth.debian.org
Tue Feb 26 13:26:56 UTC 2013


Author: apalazzi-guest
Date: Tue Feb 26 13:26:56 2013
New Revision: 45602

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45602
Log:
Fixes for bug #670567.

Added script update-codeaster-engines to update the file 
/etc/codeaster/aster.
Now the file /etc/codeaster/aster is installed in a minimal
version by code-aster-run.postinst, then is updated by postinst
scripts of packages code-aster-engine and code-aster-mpi-engine.
Also fixed some errors introduced previously in patch config.patch
when it was updated for astk 1.11.0
		

Added:
    packages/code-aster/astk/trunk/debian/aster.template
    packages/code-aster/astk/trunk/debian/update-codeaster-engines   (with props)
Modified:
    packages/code-aster/astk/trunk/debian/changelog
    packages/code-aster/astk/trunk/debian/code-aster-run.install
    packages/code-aster/astk/trunk/debian/code-aster-run.postinst
    packages/code-aster/astk/trunk/debian/code-aster-run.postrm
    packages/code-aster/astk/trunk/debian/rules

Added: packages/code-aster/astk/trunk/debian/aster.template
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/aster.template?rev=45602&op=file
==============================================================================
--- packages/code-aster/astk/trunk/debian/aster.template (added)
+++ packages/code-aster/astk/trunk/debian/aster.template Tue Feb 26 13:26:56 2013
@@ -1,0 +1,5 @@
+# Code_Aster versions - template file
+# this file is just a barebone configuration because as_run needs it
+# to run; it should not appear in a functional system.
+default_vers : STABLE
+vers : STABLE

Modified: packages/code-aster/astk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/changelog?rev=45602&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/changelog (original)
+++ packages/code-aster/astk/trunk/debian/changelog Tue Feb 26 13:26:56 2013
@@ -1,8 +1,14 @@
-astk (1.11.0-2) unstable; urgency=low
-
-  * Fixed some errors in a patch
-
- -- Andrea Palazzi <palazziandrea at yahoo.it>  Sat, 16 Feb 2013 09:35:32 +0100
+astk (1.11.0-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Added script update-codeaster-engines to create the aster
+    config file
+  * Now the file /etc/codeaster/aster is installed in a minimal
+    version by code-aster-run.postinst (Closes: #670567)
+  * Fixed some errors introduced previously in patch config.patch
+    when it was updated for astk 1.11.0
+
+ -- Andrea Palazzi <palazziandrea at yahoo.it>  Sat, 26 Feb 2013 09:35:32 +0100
 
 astk (1.11.0-1) unstable; urgency=low
 

Modified: 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=45602&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/code-aster-run.install (original)
+++ packages/code-aster/astk/trunk/debian/code-aster-run.install Tue Feb 26 13:26:56 2013
@@ -3,14 +3,16 @@
 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
+debian/tmp/usr/sbin/update-codeaster-engines usr/sbin
 
 # config
 ASTK_SERV/etc/profile.sh etc/codeaster
 ASTK_SERV/etc/config_nodename etc/codeaster
-ASTK_SERV/etc/aster etc/codeaster
+#ASTK_SERV/etc/aster etc/codeaster
 ASTK_SERV/etc/profile.csh etc/codeaster
 ASTK_SERV/etc/asrun usr/share/codeaster
 debian/aster-mpihosts etc/codeaster
+debian/aster.template usr/share/codeaster
 
 # ASTER_ROOT
 debian/tmp/usr/lib/codeaster usr/lib

Modified: packages/code-aster/astk/trunk/debian/code-aster-run.postinst
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/code-aster-run.postinst?rev=45602&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/code-aster-run.postinst (original)
+++ packages/code-aster/astk/trunk/debian/code-aster-run.postinst Tue Feb 26 13:26:56 2013
@@ -6,9 +6,11 @@
 . /usr/share/debconf/confmodule
 TEMPLATE=/usr/share/codeaster/asrun
 ASRUN=/etc/codeaster/asrun
+ASTER_TEMPLATE=/usr/share/codeaster/aster.template
+ASTER=/etc/codeaster/aster
 
 if [ "$1" = "configure" ]; then
-       if [ -z "$2" ]; then
+       if [ -z "$2" ]; then # first install of pacakge
                if [ "$(getconf LONG_BIT)" = 64 ]; then
                        platform=LINUX64
                else
@@ -17,6 +19,8 @@
                node=$(hostname -s 2>/dev/null)
 
                sed -e "s|^plate-forme : .*|plate-forme : $platform|;s|noeud : .*|noeud : $node|" < $TEMPLATE > $ASRUN
+
+               cp $ASTER_TEMPLATE $ASTER
        fi
 
        db_get astk/EDITOR || true
@@ -26,7 +30,6 @@
        terminal=${RET}
 
        sed -i -e "s|editor : .*|editor : $editor|;s|terminal : .*|terminal : $terminal|" $ASRUN
-        
 fi
 
 #DEBHELPER#

Modified: packages/code-aster/astk/trunk/debian/code-aster-run.postrm
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/code-aster-run.postrm?rev=45602&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/code-aster-run.postrm (original)
+++ packages/code-aster/astk/trunk/debian/code-aster-run.postrm Tue Feb 26 13:26:56 2013
@@ -10,7 +10,7 @@
     
     # Remove files in /etc/codeaster
     rm -f /etc/codeaster/asrun
-    
+    rm -f /etc/codeater/aster    
     find /etc/codeaster  -type d -empty | xargs -r rmdir
 
 fi

Modified: packages/code-aster/astk/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/rules?rev=45602&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/rules (original)
+++ packages/code-aster/astk/trunk/debian/rules Tue Feb 26 13:26:56 2013
@@ -38,8 +38,10 @@
 	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
+# install update-codeaster-engine script
+	mkdir -p $(DEB_DESTDIR)/usr/sbin
+	cp debian/update-codeaster-engines $(DEB_DESTDIR)/usr/sbin
+	chmod 755 $(DEB_DESTDIR)/usr/sbin/update-codeaster-engines
 
 	# Fix platform in ASTK_SERV/etc/asrun (/etc/codeaster/asrun)
 	if [ "${DEB_HOST_ARCH_BITS}" = "64" ]; then \

Added: packages/code-aster/astk/trunk/debian/update-codeaster-engines
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/update-codeaster-engines?rev=45602&op=file
==============================================================================
--- packages/code-aster/astk/trunk/debian/update-codeaster-engines (added)
+++ packages/code-aster/astk/trunk/debian/update-codeaster-engines Tue Feb 26 13:26:56 2013
@@ -1,0 +1,25 @@
+#!/bin/sh
+
+set -ex
+
+# CONFFILE=/etc/codeaster/aster
+ENGINES_DIR=/var/lib/codeaster
+CA_VERSIONS=$(ls ${ENGINES_DIR})
+CA_DEFAULT_VERSION=$(echo ${CA_VERSIONS} | cut -f 1 -d ' ')
+
+cat << EOF
+# Code_Aster versions
+# versions can be absolute paths or relative to ASTER_ROOT
+# examples : NEW10, /usr/lib/codeaster/NEW10
+
+# default version (overridden by --vers option)
+EOF
+
+echo default_vers : ${CA_DEFAULT_VERSION}
+
+echo "# available versions"
+echo "# DO NOT EDIT FOLLOWING LINES !"
+
+for CA_VERSION in ${CA_VERSIONS} ; do
+    echo "vers : ${CA_VERSION}"
+done

Propchange: packages/code-aster/astk/trunk/debian/update-codeaster-engines
------------------------------------------------------------------------------
    svn:executable = *




More information about the debian-science-commits mailing list