r44501 - in /packages/code-aster/astk/trunk/debian: as_client.1 changelog code-aster-gui.1 code-aster-gui.install code-aster.1 codeaster-client.1 patches/config.patch rules

trophime-guest at users.alioth.debian.org trophime-guest at users.alioth.debian.org
Wed Feb 15 10:39:47 UTC 2012


Author: trophime-guest
Date: Wed Feb 15 10:39:47 2012
New Revision: 44501

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44501
Log:
update to 1.10.4

Added:
    packages/code-aster/astk/trunk/debian/as_client.1
    packages/code-aster/astk/trunk/debian/codeaster-client.1
Removed:
    packages/code-aster/astk/trunk/debian/code-aster-gui.1
    packages/code-aster/astk/trunk/debian/code-aster.1
Modified:
    packages/code-aster/astk/trunk/debian/changelog
    packages/code-aster/astk/trunk/debian/code-aster-gui.install
    packages/code-aster/astk/trunk/debian/patches/config.patch
    packages/code-aster/astk/trunk/debian/rules

Added: packages/code-aster/astk/trunk/debian/as_client.1
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/as_client.1?rev=44501&op=file
==============================================================================
--- packages/code-aster/astk/trunk/debian/as_client.1 (added)
+++ packages/code-aster/astk/trunk/debian/as_client.1 Wed Feb 15 10:39:47 2012
@@ -1,0 +1,28 @@
+.TH ASTK "1" "April 2010" "Code Aster 10.2.0" "Astk Gui"
+.SH NAME
+as_client \- launch the astk GUI
+.SH SYNOPSIS
+.PP
+.B as_client
+[
+.B -h
+]
+[
+.B -debug \fR[\fIN\fR]
+]
+[
+.B -profil \fIprofile_name\fR
+]
+[
+.B -agla \fIdata\fR
+]
+.SH DESCRIPTION
+.BR as_client
+is a symbolic link to
+.BR astk
+command.
+.PP
+.SH FILES
+\fI/etc/codeaster/astkrc\fR	default configuration directory for astk
+.SH AUTHOR
+The Debian Scientific Computing Team

Modified: packages/code-aster/astk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/changelog?rev=44501&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/changelog (original)
+++ packages/code-aster/astk/trunk/debian/changelog Wed Feb 15 10:39:47 2012
@@ -1,4 +1,4 @@
-astk (1.10.0-1) unstable; urgency=low
+astk (1.10.4-1) unstable; urgency=low
 
   * New  upstream release
   * debian/rules: simply install targets
@@ -8,7 +8,7 @@
   * 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
+ -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>  wed, 15 Feb 2012 09:01:13 +0100
 
 astk (1.8.4-5) unstable; urgency=low
 

Modified: 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=44501&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/code-aster-gui.install (original)
+++ packages/code-aster/astk/trunk/debian/code-aster-gui.install Wed Feb 15 10:39:47 2012
@@ -1,5 +1,8 @@
+debian/tmp/usr/bin/as_client usr/bin
+debian/tmp/usr/bin/codeaster-client usr/bin
 debian/tmp/usr/bin/codeaster-gui usr/bin
 debian/tmp/usr/bin/astk usr/bin
+debian/tmp/usr/bin/bsf usr/bin
 
 debian/tmp/usr/lib/astk/*.tcl usr/share/astk
 debian/tmp/usr/lib/astk/BWidget-1.7.0 usr/share/astk
@@ -25,4 +28,6 @@
 #install manpages
 debian/astk.1 usr/share/man/man1
 debian/codeaster-gui.1 usr/share/man/man1
+debian/codeaster-client.1 usr/share/man/man1
+debian/as_client.1 usr/share/man/man1
 debian/bsf.1 usr/share/man/man1 

Added: packages/code-aster/astk/trunk/debian/codeaster-client.1
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/codeaster-client.1?rev=44501&op=file
==============================================================================
--- packages/code-aster/astk/trunk/debian/codeaster-client.1 (added)
+++ packages/code-aster/astk/trunk/debian/codeaster-client.1 Wed Feb 15 10:39:47 2012
@@ -1,0 +1,28 @@
+.TH ASTK "1" "April 2010" "Code Aster 10.2.0" "Astk Gui"
+.SH NAME
+codeaster-client \- launch the astk GUI
+.SH SYNOPSIS
+.PP
+.B codeaster-client
+[
+.B -h
+]
+[
+.B -debug \fR[\fIN\fR]
+]
+[
+.B -profil \fIprofile_name\fR
+]
+[
+.B -agla \fIdata\fR
+]
+.SH DESCRIPTION
+.BR codeaster-client
+is a symbolic link to
+.BR astk
+command.
+.PP
+.SH FILES
+\fI/etc/codeaster/astkrc\fR	default configuration directory for astk
+.SH AUTHOR
+The Debian Scientific Computing Team

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=44501&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/patches/config.patch (original)
+++ packages/code-aster/astk/trunk/debian/patches/config.patch Wed Feb 15 10:39:47 2012
@@ -74,12 +74,9 @@
 ===================================================================
 --- 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
-@@ -12,39 +12,26 @@
-    setenv DEFINE_PROFILE_ASRUN done
- #--- ifndef DEFINE_PROFILE_ASRUN -----------------------------------------------
- 
--if ( "X$ASTER_ROOT" == "X" ) then
-+if !($?ASTER_ROOT) then
+@@ -14,37 +14,19 @@
+ 
+ if !($?ASTER_ROOT) then
      # from first installation
 -    setenv ASTER_ROOT ?ASTER_ROOT?
 -endif
@@ -93,37 +90,34 @@
 -else
 -   setenv PATH $ASTER_ROOT/bin:$ASTER_ROOT/outils:$PATH
 +    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
++    setenv PATH $ASTER_ROOT/bin:$ASTER_ROOT/outils:$PATH
  endif
  
 -if !($?LD_LIBRARY_PATH) then
 -   setenv LD_LIBRARY_PATH ?HOME_PYTHON?/lib
 -else
 -   setenv LD_LIBRARY_PATH ?HOME_PYTHON?/lib:$LD_LIBRARY_PATH
--endif
--
++if (!$?ASTER_ETC) then
++   setenv ASTER_ETC /etc
+ endif
+ 
 -if !($?PYTHONPATH) then
 -   setenv PYTHONPATH ?ASRUN_SITE_PKG?
 -else
 -   setenv PYTHONPATH ?ASRUN_SITE_PKG?:$PYTHONPATH
-+if !($?ASTER_ETC) then
-+   setenv ASTER_ETC /etc
- endif
+-endif
  
 -setenv PYTHONEXECUTABLE ?PYTHON_EXE?
 +setenv PYTHONEXECUTABLE /usr/bin/python
  
- # this should not be usefull...
- #setenv PYTHONHOME ?HOME_PYTHON?
+-# this should not be usefull...
+-#setenv PYTHONHOME ?HOME_PYTHON?
  
 -setenv WISHEXECUTABLE ?WISH_EXE?
 +setenv WISHEXECUTABLE /usr/bin/wish
  
  
+ # source local profile
  # source local profile
 Index: astk-1.10.0/ASTK_SERV/etc/asrun
 ===================================================================
@@ -197,16 +191,6 @@
  
  # available versions
  # DO NOT EDIT FOLLOWING LINE !
-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-16 13:20:49.000000000 +0100
-+++ astk-1.10.0/ASTK_SERV/share/codeaster/asrun/data/mpirun_template	2011-12-16 16:23:22.000000000 +0100
-@@ -1,4 +1,4 @@
--#!?SHELL_EXECUTION?
-+#!/bin/bash
- 
- # $Id: mpirun_template 3529 2008-09-26 08:42:08Z courtois $
- 
 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

Modified: packages/code-aster/astk/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/rules?rev=44501&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/rules (original)
+++ packages/code-aster/astk/trunk/debian/rules Wed Feb 15 10:39:47 2012
@@ -20,6 +20,7 @@
 
 install/code-aster-gui:: 
 	rm -f $(DEB_DESTDIR)/usr/lib/astk/BWidget-1.7.0/LICENSE.txt
+	cd $(DEB_DESTDIR)/usr/bin && ln -sf codeaster-client codeaster-gui
 
 	# Add links in $ASTER_ROOT/outils
 	mkdir -p debian/code-aster-gui/$(ASTER_ROOT)/outils
@@ -31,7 +32,7 @@
 install/code-aster-run:: 
 	
 	# Add version to ASTK_SERV/etc/aster(/etc/codeaster/aster)
-	perl -pi -e "s|#\?vers : VVV\?|vers : NEW11.0|" ASTK_SERV/etc/aster
+	perl -pi -e "s|#\?vers : VVV\?|vers : STA11.0|" ASTK_SERV/etc/aster
 	
 	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
@@ -41,6 +42,7 @@
 
 	cd $(DEB_DESTDIR)/usr/bin && mv get codeaster-get
 	cd $(DEB_DESTDIR)/usr/bin && mv parallel_cp codeaster-parallel_cp
+	cd $(DEB_DESTDIR)/usr/bin && ln -sf as_run codeaster
 
 clean::
 	rm -rf build




More information about the debian-science-commits mailing list