r44155 - in /packages/code-aster/eficas/trunk/debian: README.Debian eficas.install patches/aide.patch patches/doc.patch patches/patch.docwww.diff patches/series rules
trophime-guest at users.alioth.debian.org
trophime-guest at users.alioth.debian.org
Wed Dec 14 15:41:57 UTC 2011
Author: trophime-guest
Date: Wed Dec 14 15:41:57 2011
New Revision: 44155
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44155
Log:
fix broken menu Aide
Added:
packages/code-aster/eficas/trunk/debian/patches/aide.patch
packages/code-aster/eficas/trunk/debian/patches/doc.patch
packages/code-aster/eficas/trunk/debian/patches/patch.docwww.diff
Modified:
packages/code-aster/eficas/trunk/debian/README.Debian
packages/code-aster/eficas/trunk/debian/eficas.install
packages/code-aster/eficas/trunk/debian/patches/series
packages/code-aster/eficas/trunk/debian/rules
Modified: packages/code-aster/eficas/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/eficas/trunk/debian/README.Debian?rev=44155&op=diff
==============================================================================
--- packages/code-aster/eficas/trunk/debian/README.Debian (original)
+++ packages/code-aster/eficas/trunk/debian/README.Debian Wed Dec 14 15:41:57 2011
@@ -2,8 +2,11 @@
-----------------
eficas-doc are not installed according to Debian policy.
-To install eficas docs (DEB_UPSTREAM_VERSION = 6.3.0-1)
-first extract from the orig upstream tarball
+Eficas docs are now accessible via a web browser.
+
+
+Alternatively you can install eficas docs (DEB_UPSTREAM_VERSION = 6.3.0-1) as follows
+First extract from the orig upstream tarball
(ASTER_VERSION_FULL = 11.0.10-2) :
mdkir -p tmp/
@@ -21,6 +24,9 @@
cd eficas-6.3.0
cp -r Aster/Doc /usr/share/doc/eficas
cp -r Aster/Cata /usr/share/doc/eficas
+
+Eventually you can :
+
ln -s /usr/share/doc/eficas/Doc /usr/share/pyshared/Aster
cd /usr/share/doc/eficas/Aster/Cata
foreach file in 'ls -l *.docu' do;
@@ -29,5 +35,7 @@
popd
rm -rf tmp
+Or modify the eficas parameters from the menu
+
-- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr> Sat, 11 Dec 2011 14:41:18 +0200
Modified: packages/code-aster/eficas/trunk/debian/eficas.install
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/eficas/trunk/debian/eficas.install?rev=44155&op=diff
==============================================================================
--- packages/code-aster/eficas/trunk/debian/eficas.install (original)
+++ packages/code-aster/eficas/trunk/debian/eficas.install Wed Dec 14 15:41:57 2011
@@ -11,6 +11,12 @@
Aster/editeur*.ini etc/eficas/
#usr/share/eficas/Editeur
+Openturns_Study/catalogues_openturns.ini usr/share/pyshared/Openturns_Study
+Openturns_Wrapper/catalogues_openturns.ini usr/share/pyshared/Openturns_Wrapper
+
+# Doc
+Aide/* usr/share/eficas/Aide
+
# Icon and menu entry
debian/eficas.desktop usr/share/applications/
debian/eficas.xpm usr/share/pixmaps/
Added: packages/code-aster/eficas/trunk/debian/patches/aide.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/eficas/trunk/debian/patches/aide.patch?rev=44155&op=file
==============================================================================
--- packages/code-aster/eficas/trunk/debian/patches/aide.patch (added)
+++ packages/code-aster/eficas/trunk/debian/patches/aide.patch Wed Dec 14 15:41:57 2011
@@ -1,0 +1,14 @@
+Index: eficas-6.3.0-1/Aide/eficas_OPENTURNS_STUDY.adp
+===================================================================
+--- eficas-6.3.0-1.orig/Aide/eficas_OPENTURNS_STUDY.adp 2010-09-17 15:11:45.000000000 +0200
++++ eficas-6.3.0-1/Aide/eficas_OPENTURNS_STUDY.adp 2011-12-14 16:18:12.000000000 +0100
+@@ -1,5 +1,8 @@
+ <assistantconfig version="3.2.0">
+- <DCF ref="eficas_openturns.html"
++ <profile>
++ <property name="title">Eficas Pour OPENTURNS </property>
++ </profile>
++ <DCF ref="fichiers_OPENTURNS_STUDY/index.html"
+ title="Eficas pour OPENTURNS ">
+ </DCF>
+ </assistantconfig>
Added: packages/code-aster/eficas/trunk/debian/patches/doc.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/eficas/trunk/debian/patches/doc.patch?rev=44155&op=file
==============================================================================
--- packages/code-aster/eficas/trunk/debian/patches/doc.patch (added)
+++ packages/code-aster/eficas/trunk/debian/patches/doc.patch Wed Dec 14 15:41:57 2011
@@ -1,0 +1,30 @@
+Index: eficas-6.3.0-1/Aster/editeur.ini
+===================================================================
+--- eficas-6.3.0-1.orig/Aster/editeur.ini 2011-06-14 16:34:44.000000000 +0200
++++ eficas-6.3.0-1/Aster/editeur.ini 2011-12-14 16:29:38.000000000 +0100
+@@ -27,8 +27,8 @@
+ rep_Pmw = os.path.join(initialdir,'../Pmw')
+
+ # Accès à la documentation Aster
+-path_doc = os.path.join(rep_cata,'..','Doc')
+-exec_acrobat = "/usr/bin/xpdf"
++path_doc = "http://www.code-aster.org/V2/doc/"
++exec_acrobat = "/usr/bin/gnome-www-browser"
+
+ # Utilisateur/Développeur
+ isdeveloppeur = "NON"
+Index: eficas-6.3.0-1/Aster/editeur_salome.ini
+===================================================================
+--- eficas-6.3.0-1.orig/Aster/editeur_salome.ini 2011-06-14 16:34:36.000000000 +0200
++++ eficas-6.3.0-1/Aster/editeur_salome.ini 2011-12-14 16:29:36.000000000 +0100
+@@ -27,8 +27,8 @@
+ rep_Pmw = os.path.join(initialdir,'../Pmw')
+
+ # Accès à la documentation Aster
+-path_doc = os.path.join(rep_cata,'..','Doc')
+-exec_acrobat = "/usr/bin/xpdf"
++path_doc = "http://www.code-aster.org/V2/doc/"
++exec_acrobat = "/usr/bin/nome-www-browser"
+
+ # Utilisateur/Développeur
+ isdeveloppeur = "NON"
Added: packages/code-aster/eficas/trunk/debian/patches/patch.docwww.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/eficas/trunk/debian/patches/patch.docwww.diff?rev=44155&op=file
==============================================================================
--- packages/code-aster/eficas/trunk/debian/patches/patch.docwww.diff (added)
+++ packages/code-aster/eficas/trunk/debian/patches/patch.docwww.diff Wed Dec 14 15:41:57 2011
@@ -1,0 +1,69 @@
+diff -ur eficas-6.3.0.orig/Aster/editeur.ini eficas-6.3.0/Aster/editeur.ini
+--- eficas-6.3.0.orig/Aster/editeur.ini 2011-06-14 16:34:44.000000000 +0200
++++ eficas-6.3.0/Aster/editeur.ini 2011-12-14 15:06:52.000000000 +0100
+@@ -21,14 +21,16 @@
+ import os
+
+ # Répertoire initial
+-import prefs_ASTER
++import prefs_ASTER
+ initialdir=prefs_ASTER.REPINI
+ rep_cata = os.path.join(initialdir,'Cata')
+ rep_Pmw = os.path.join(initialdir,'../Pmw')
+
+ # Accès à la documentation Aster
+-path_doc = os.path.join(rep_cata,'..','Doc')
+-exec_acrobat = "/usr/bin/xpdf"
++#path_doc = os.path.join(rep_cata,'..','Doc')
++#exec_acrobat = "/usr/bin/xpdf"
++exec_acrobat = "/usr/bin/gnome-www-browser"
++path_doc = "http://www.code-aster.org/V2/doc/"
+
+ # Utilisateur/Développeur
+ isdeveloppeur = "NON"
+diff -ur eficas-6.3.0.orig/InterfaceQT4/typeNode.py eficas-6.3.0/InterfaceQT4/typeNode.py
+--- eficas-6.3.0.orig/InterfaceQT4/typeNode.py 2010-09-17 15:11:49.000000000 +0200
++++ eficas-6.3.0/InterfaceQT4/typeNode.py 2011-12-14 15:05:23.000000000 +0100
+@@ -11,7 +11,7 @@
+ self.menu = QMenu(self.tree)
+ #items du menu
+ self.menu.addAction(self.Supprime)
+-
++
+ def createActions(self):
+ self.CommApres = QAction('après',self.tree)
+ self.tree.connect(self.CommApres,SIGNAL("activated()"),self.addCommApres)
+@@ -58,14 +58,16 @@
+ return
+ nom_fichier = cle_doc
+ import os
+- fichier = os.path.abspath(os.path.join(self.editor.CONFIGURATION.path_doc,
+- nom_fichier))
+- try :
+- f=open(fichier,"rb")
+- except :
+- texte="impossible d'ouvrir " + fichier
+- QMessageBox.information( self.editor, "Documentation Vide", texte)
+- return
++ fichier = os.path.join(self.editor.CONFIGURATION.path_doc, nom_fichier)
++ if fichier.startswith('http:'):
++ pass
++ #logger.debug("open browser with: %s", fichier)
++ else:
++ fichier = os.path.abspath(fichier)
++ if not os.path.exists(fichier):
++ texte="impossible d'ouvrir " + fichier
++ QMessageBox.information( self.editor, "Documentation Vide", texte)
++ return
+ if os.name == 'nt':
+ os.spawnv(os.P_NOWAIT,commande,(commande,fichier,))
+ elif os.name == 'posix':
+@@ -98,7 +100,7 @@
+ self.commentMenu.addAction(self.CommApres)
+ self.commentMenu.addAction(self.CommAvant)
+ #ss-menu Parameters:
+- self.paramMenu =self.menu.addMenu('Parametre')
++ self.paramMenu =self.menu.addMenu('Parametre')
+ self.paramMenu.addAction(self.ParamApres)
+ self.paramMenu.addAction(self.ParamAvant)
+ self.menu.addAction(self.Documentation)
Modified: packages/code-aster/eficas/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/eficas/trunk/debian/patches/series?rev=44155&op=diff
==============================================================================
--- packages/code-aster/eficas/trunk/debian/patches/series (original)
+++ packages/code-aster/eficas/trunk/debian/patches/series Wed Dec 14 15:41:57 2011
@@ -2,3 +2,5 @@
eficasTk.patch
#eficas_prefs.patch
python_sysadd.patch
+aide.patch
+doc.patch
Modified: packages/code-aster/eficas/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/eficas/trunk/debian/rules?rev=44155&op=diff
==============================================================================
--- packages/code-aster/eficas/trunk/debian/rules (original)
+++ packages/code-aster/eficas/trunk/debian/rules Wed Dec 14 15:41:57 2011
@@ -4,8 +4,9 @@
ASTER_VERSION=11.0.10
ASTER_VERSION_FULL=$(ASTER_VERSION)-2
-DEB_PYTHON2_MODULE_PACKAGES = Accas Aide Aster convert Editeur \
- Extensions generator Ihm InterfaceQT4 UiQT4 Noyau Traducteur eficas
+DEB_PYTHON2_MODULE_PACKAGES = eficas Accas Aide Aster convert Editeur \
+ Extensions generator Ihm InterfaceQT4 UiQT4 Noyau Traducteur \
+ Validation Openturns_Study Openturns_Wrapper
#DEB_PYTHON_SYSTEM=pysupport
include /usr/share/cdbs/1/rules/debhelper.mk
@@ -30,6 +31,7 @@
install -d debian/eficas/usr/share/pyshared/Aster
(cd debian/eficas/usr/share/pyshared/Aster && ln -sf /etc/eficas/editeur.ini .)
(cd debian/eficas/usr/share/pyshared/Aster && ln -sf /etc/eficas/editeur_salome.ini .)
+ (cd debian/eficas/usr/share/pyshared && ln -sf /usr/share/eficas/Aide .)
# Permissions
#chmod +x debian/eficas/usr/share/pyshared/Aster/eficas_aster.py
@@ -49,6 +51,8 @@
mkdir -p tmp
cd tmp && wget "http://www.code-aster.org/FICHIERS/aster-full-src-$(ASTER_VERSION_FULL).noarch.tar.gz"
- # Go to SRC directory and retreive astk source
+ # Go to SRC directory and retreive eficas source
cd tmp && tar xzf aster-full-src-$(ASTER_VERSION_FULL).noarch.tar.gz
cd tmp/aster-full-src-$(ASTER_VERSION)/SRC && mv $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).tar.gz $(CURDIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz
+
+ rm -rf tmp
More information about the debian-science-commits
mailing list