r37207 - in /packages/code-aster/astk/trunk/debian: changelog patches/config.patch patches/debian-install.patch rules

trophime-guest at users.alioth.debian.org trophime-guest at users.alioth.debian.org
Thu Jan 13 10:13:34 UTC 2011 

Author: trophime-guest
Date: Thu Jan 13 10:13:33 2011
New Revision: 37207

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=37207
Log:
update to 1.8.4 (thanks to Andre Espaze)

Modified:
    packages/code-aster/astk/trunk/debian/changelog
    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/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=37207&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/changelog (original)
+++ packages/code-aster/astk/trunk/debian/changelog Thu Jan 13 10:13:33 2011
@@ -1,7 +1,11 @@
-astk (1.8.3-3) unstable; urgency=low
+astk (1.8.4-1) unstable; urgency=low
 
  * [Debconf translation updates]
    - Swedish (Martin Bagge / brother) 
+
+  [Andre Espaze]
+  * New upstream version
+  * debian/rules: moving asrun Python package to code-aster-run
 
  -- Christophe Trophime <christophe.trophime at grenoble.cnrs.fr>  Tue, 11 Jan 2011 15:43:53 +0100
 

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=37207&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/patches/config.patch (original)
+++ packages/code-aster/astk/trunk/debian/patches/config.patch Thu Jan 13 10:13:33 2011
@@ -91,7 +91,7 @@
 ===================================================================
 --- 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
-@@ -136,10 +136,10 @@
+@@ -133,10 +133,10 @@ interactif_mpi_nbpmax : 32
  # mpirun
  #    available arguments are : mpi_hostfile, mpi_nbnoeud, mpi_nbcpu
  #    (use Python string formatting style)
@@ -104,7 +104,7 @@
  
  # command called to initialize MPI environment (for example for mpich2)
  #mpi_ini : mpdboot --totalnum=%(mpi_nbnoeud)s --file=%(mpi_hostfile)s ; sleep 10
-@@ -152,7 +152,7 @@
+@@ -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
@@ -113,7 +113,7 @@
  
  # maximum number of nodes
  mpi_nbnoeudmax : 1
-@@ -173,8 +173,8 @@
+@@ -170,8 +170,8 @@ mpi_nbcpumax : 1
  # 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
@@ -124,10 +124,10 @@
  
  #-------------------------------------------------------------------------------
  # debug command :
-@@ -185,8 +185,8 @@
- #
+@@ -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
+ #cmd_dbg : nemiver @E @a
 -cmd_post : ?DEBUGGER_COMMAND_POST?
 -cmd_dbg : ?DEBUGGER_COMMAND?
 +cmd_post : gdb -batch --command=@D @E @C

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=37207&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/patches/debian-install.patch (original)
+++ packages/code-aster/astk/trunk/debian/patches/debian-install.patch Thu Jan 13 10:13:33 2011
@@ -33,8 +33,8 @@
 ===================================================================
 --- 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
-@@ -764,22 +764,29 @@ def MakeAster(run, *args):
-             run.ExitOnFatalError = True
+@@ -759,22 +759,29 @@ def MakeAster(run, *args):
+                 subject = subject)
      
      elif target == 'clean':
 -        if len(param) == 0:
@@ -69,7 +69,7 @@
                  # object files
                  lo = [os.path.splitext(os.path.basename(f))[0]+'.o' for f in lf]
                  for dobj in ('BINOBJ_NODBG', 'BINOBJ_DBG'):
-@@ -788,7 +795,7 @@ def MakeAster(run, *args):
+@@ -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:
@@ -78,7 +78,7 @@
                          run.VerbEnd(0, '%5d files' % len(lo), verbose=True)
      else:
          run.Mess(_(u'unknown target : %s') % target, '<F>_INVALID_ARGUMENT')
-@@ -817,6 +824,9 @@ def _build_aster(run, conf, iupdate, REPREF, destdir, reptrav, lardv=None):
+@@ -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
@@ -88,7 +88,7 @@
  
      # ----- Initialize MPI_INFO object
      mpi_info = MPI_INFO(conf.get_defines())
-@@ -865,11 +875,13 @@ def _build_aster(run, conf, iupdate, REPREF, destdir, reptrav, lardv=None):
+@@ -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')      
@@ -103,7 +103,7 @@
          run.timer.Stop(tit)
          run.CheckOK()
  
-@@ -877,13 +889,13 @@ def _build_aster(run, conf, iupdate, REPREF, destdir, reptrav, lardv=None):
+@@ -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)
@@ -119,7 +119,7 @@
                  lib=libferm)
          run.CheckOK()
          run.timer.Stop(tit)
-@@ -902,7 +914,10 @@ def _build_aster(run, conf, iupdate, REPREF, destdir, reptrav, lardv=None):
+@@ -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)
@@ -131,7 +131,7 @@
          cpyt = ['import traceback']
          cmd_import = """
  print '%(cmd)s :',
-@@ -939,7 +954,7 @@ except:
+@@ -934,7 +949,7 @@ except:
          kargs['exe'] = os.path.join(destdir, DbgPara['debug']['exe'])
      tit = _(u'Compilation of commands catalogue')
      run.timer.Start(tit)
@@ -140,7 +140,7 @@
      run.timer.Stop(tit)
      run.CheckOK()
  
-@@ -950,25 +965,16 @@ except:
+@@ -945,25 +960,16 @@ except:
      })
      tit = _(u'Make pickled of elements')
      run.timer.Start(tit)

Modified: packages/code-aster/astk/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/rules?rev=37207&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/rules (original)
+++ packages/code-aster/astk/trunk/debian/rules Thu Jan 13 10:13:33 2011
@@ -1,8 +1,8 @@
 #!/usr/bin/make -f
 # Copyright 2008 - Sylvestre Ledru <sylvestre.ledru at inria.fr>
 
-ASTER_VERSION=10.2.0
-ASTER_VERSION_FULL=$(ASTER_VERSION)-2
+ASTER_VERSION=10.3.0
+ASTER_VERSION_FULL=$(ASTER_VERSION)-3
 ASTER_ROOT=/usr/lib/codeaster
 
 DEB_PYTHON_SYSTEM=pysupport
@@ -36,9 +36,6 @@
 	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
 
-	mkdir -p debian/code-aster-gui/usr/share/python-support
-	mv $(DEB_DESTDIR)/usr/share/python-support debian/code-aster-gui/usr/share/python-support
-	
 	mkdir -p debian/code-aster-gui/etc/codeaster/astkrc
 	mv $(DEB_DESTDIR)/etc/codeaster/astkrc/* debian/code-aster-gui/etc/codeaster/astkrc
 
@@ -76,10 +73,13 @@
 	install -m 0644 ASTK_SERV/etc/asrun debian/code-aster-run/etc/codeaster
 	
 	# Add version to /etc/codeaster/aster
-	perl -pi -e "s|#\?vers : VVV\?|vers : STA10.2|" debian/code-aster-run/etc/codeaster/aster
+	perl -pi -e "s|#\?vers : VVV\?|vers : STA10.3|" debian/code-aster-run/etc/codeaster/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/share/python-support
+	mv $(DEB_DESTDIR)/usr/share/python-support debian/code-aster-run/usr/share/python-support
 
 	#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

More information about the debian-science-commits mailing list