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

trophime-guest at users.alioth.debian.org trophime-guest at users.alioth.debian.org
Wed Oct 13 15:58:02 UTC 2010 

Author: trophime-guest
Date: Wed Oct 13 15:57:58 2010
New Revision: 36942

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36942
Log:
update to 1.8.3 with andre fix

Modified:
    packages/code-aster/astk/trunk/debian/changelog
    packages/code-aster/astk/trunk/debian/patches/debian-install.patch
    packages/code-aster/astk/trunk/debian/patches/series
    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=36942&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/changelog (original)
+++ packages/code-aster/astk/trunk/debian/changelog Wed Oct 13 15:57:58 2010
@@ -1,3 +1,18 @@
+astk (1.8.3-1) unstable; urgency=low
+
+  * New upstream version
+  * Remove debug -x flag from postinst and post rm scripts
+  * debian/rules : 
+     correct get-orig-source (update spip id)
+     add a symlink to /usr/bin/as_run in $ASTER_ROOT/bin in code-aster-run
+   
+  
+  [Andre Espaze]
+  * remove onecore.patch
+  * update debian-install.patch to latest version
+
+ -- Christophe Trophime <christophe.trophime at grenoble.cnrs.fr>  Thu, 30 Sep 2010 10:43:38 +0200
+
 astk (1.8.1-3) unstable; urgency=low
 
   * Add directory $ASTER_ROOT/outils

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=36942&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/patches/debian-install.patch (original)
+++ packages/code-aster/astk/trunk/debian/patches/debian-install.patch Wed Oct 13 15:57:58 2010
@@ -2,7 +2,7 @@
 ===================================================================
 --- astk-1.8.1.orig/ASTK_SERV/asrun/installation.py	2010-08-26 16:46:20.000000000 +0200
 +++ astk-1.8.1/ASTK_SERV/asrun/installation.py	2010-08-26 16:46:30.000000000 +0200
-@@ -10,19 +10,18 @@
+@@ -10,19 +10,18 @@ if os.environ.get('ASTER_ROOT'):
      aster_root = os.environ['ASTER_ROOT']
  else:
      #               asrun           site-packages pythonX.Y      lib     prefix
@@ -33,7 +33,7 @@
 ===================================================================
 --- 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
-@@ -751,22 +751,29 @@
+@@ -764,22 +764,29 @@ def MakeAster(run, *args):
              run.ExitOnFatalError = True
      
      elif target == 'clean':
@@ -69,16 +69,16 @@
                  # object files
                  lo = [os.path.splitext(os.path.basename(f))[0]+'.o' for f in lf]
                  for dobj in ('BINOBJ_NODBG', 'BINOBJ_DBG'):
-@@ -776,7 +783,7 @@
-                                       dsrc, ficrep), \
-                             verbose=True)
+@@ -788,7 +795,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:
 -                            run.Delete(os.path.join(REPREF, ficrep, fo))
 +                            run.Delete(os.path.join(destdir, ficrep, fo))
                          run.VerbEnd(0, '%5d files' % len(lo), verbose=True)
      else:
          run.Mess(_(u'unknown target : %s') % target, '<F>_INVALID_ARGUMENT')
-@@ -805,6 +812,9 @@
+@@ -817,6 +824,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())
-@@ -853,11 +863,13 @@
+@@ -865,11 +875,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()
  
-@@ -865,13 +877,13 @@
+@@ -877,13 +889,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)
-@@ -890,7 +902,10 @@
+@@ -902,7 +914,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 :',
-@@ -927,7 +942,7 @@
+@@ -939,7 +954,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()
  
-@@ -938,25 +953,16 @@
+@@ -950,25 +965,16 @@ except:
      })
      tit = _(u'Make pickled of elements')
      run.timer.Start(tit)
@@ -172,7 +172,7 @@
 ===================================================================
 --- astk-1.8.1.orig/setup.py	2010-08-26 16:49:00.000000000 +0200
 +++ astk-1.8.1/setup.py	2010-08-26 16:49:21.000000000 +0200
-@@ -53,7 +53,7 @@
+@@ -53,7 +53,7 @@ def start_setup(prefix):
     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'))

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=36942&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/patches/series (original)
+++ packages/code-aster/astk/trunk/debian/patches/series Wed Oct 13 15:57:58 2010
@@ -1,3 +1,2 @@
 config.patch
-onecore.patch
 debian-install.patch

Modified: packages/code-aster/astk/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/rules?rev=36942&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/rules (original)
+++ packages/code-aster/astk/trunk/debian/rules Wed Oct 13 15:57:58 2010
@@ -2,7 +2,7 @@
 # Copyright 2008 - Sylvestre Ledru <sylvestre.ledru at inria.fr>
 
 ASTER_VERSION=10.2.0
-ASTER_VERSION_FULL=$(ASTER_VERSION)-1
+ASTER_VERSION_FULL=$(ASTER_VERSION)-2
 ASTER_ROOT=/usr/lib/codeaster
 
 DEB_PYTHON_SYSTEM=pysupport
@@ -96,11 +96,15 @@
 
 	install -d debian/code-aster-run/usr/share/locale
 	mv $(DEB_DESTDIR)/usr/share/locale/* debian/code-aster-run/usr/share/locale
+	
+	mkdir -p debian/code-aster-run/usr/lib/codeaster/bin
+	ln -sf /usr/bin/as_run debian/code-aster-run/usr/lib/codeaster/bin/as_run
 
 get-orig-source:
 	# Retreive aster-full-src-$(ASTER_VERSION_FULL).noarch.tar.gz
 	mkdir -p tmp
-	cd tmp && wget "http://www.code-aster.org/V2/spip.php?action=dw2_out&id=785"
+	cd tmp && wget "http://www.code-aster.org/V2/spip.php?action=dw2_out&id=828"
+	cd tmp && mv "spip.php?action=dw2_out&id=828" aster-full-src-$(ASTER_VERSION_FULL).noarch.tar.gz
 	
 	# Go to SRC directory and retreive astk source
 	cd tmp && tar xzf aster-full-src-$(ASTER_VERSION_FULL).noarch.tar.gz

More information about the debian-science-commits mailing list