r44146 - in /packages/code-aster/eficas/trunk/debian: ./ patches/
trophime-guest at users.alioth.debian.org
trophime-guest at users.alioth.debian.org
Mon Dec 12 16:27:42 UTC 2011
Author: trophime-guest
Date: Mon Dec 12 16:27:41 2011
New Revision: 44146
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44146
Log:
fix packaging - eficas is now working
Added:
packages/code-aster/eficas/trunk/debian/eficas.1
packages/code-aster/eficas/trunk/debian/patches/eficasTk.patch
packages/code-aster/eficas/trunk/debian/patches/python_sysadd.patch
packages/code-aster/eficas/trunk/debian/patches/setup.py.patch
- copied unchanged from r44142, packages/code-aster/eficas/trunk/debian/patches/setup.py.diff
Removed:
packages/code-aster/eficas/trunk/debian/patches/eficas.diff
packages/code-aster/eficas/trunk/debian/patches/path_to_python.diff
packages/code-aster/eficas/trunk/debian/patches/paths.diff
packages/code-aster/eficas/trunk/debian/patches/setup.py.diff
Modified:
packages/code-aster/eficas/trunk/debian/changelog
packages/code-aster/eficas/trunk/debian/control
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/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/eficas/trunk/debian/changelog?rev=44146&op=diff
==============================================================================
--- packages/code-aster/eficas/trunk/debian/changelog (original)
+++ packages/code-aster/eficas/trunk/debian/changelog Mon Dec 12 16:27:41 2011
@@ -3,10 +3,12 @@
* New upstream release
* Remove Tk support
* Add openturn support
- * Bump to standard 3.9.2 :
- - transition to dh_python2
+ * Add debian/eficas.install
+ * debian/rules: simplify install target
+ * Bump to standard 3.9.2
+ * Update C. Trophime email
- -- Christophe Trophime <christophe.trophime at grenoble.cnrs.fr> Sat, 11 Dec 2011 14:41:18 +0200
+ -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr> Sat, 11 Dec 2011 14:41:18 +0200
eficas (2.1.1-1-1) unstable; urgency=low
Modified: packages/code-aster/eficas/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/eficas/trunk/debian/control?rev=44146&op=diff
==============================================================================
--- packages/code-aster/eficas/trunk/debian/control (original)
+++ packages/code-aster/eficas/trunk/debian/control Mon Dec 12 16:27:41 2011
@@ -2,8 +2,9 @@
Section: science
Priority: optional
Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
-Uploaders: Sylvestre Ledru <sylvestre at debian.org>, Christophe Trophime <christophe.trophime at grenoble.cnrs.fr>
+Uploaders: Sylvestre Ledru <sylvestre at debian.org>, Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>
Build-Depends: debhelper (>= 5.0.38), cdbs (>= 0.4.90~),
+ python-support,
python-all (>= 2.6.6-3~), python-qt4-dev, quilt,
python-openturns
Standards-Version: 3.9.2
Added: packages/code-aster/eficas/trunk/debian/eficas.1
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/eficas/trunk/debian/eficas.1?rev=44146&op=file
==============================================================================
--- packages/code-aster/eficas/trunk/debian/eficas.1 (added)
+++ packages/code-aster/eficas/trunk/debian/eficas.1 Mon Dec 12 16:27:41 2011
@@ -1,0 +1,19 @@
+.\" -*- nroff -*-
+.TH eficas 1 "April 2010" "Eficas"
+.SH NAME
+eficas \- eficas command
+.SH SYNOPSIS
+.B eficas
+.br
+.SH DESCRIPTION
+This manual page documents briefly the
+.BR eficas
+command.
+
+eficas is an application to help the creation of Code Aster
+command files. Thanks to this graphical user interface, a user
+can intuitively create a Aster command file without knowing the
+syntax.
+
+.SH AUTHOR
+The Debian Scientific Computing Team
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=44146&op=diff
==============================================================================
--- packages/code-aster/eficas/trunk/debian/eficas.install (original)
+++ packages/code-aster/eficas/trunk/debian/eficas.install Mon Dec 12 16:27:41 2011
@@ -1,7 +1,10 @@
-Editeur/icons/* usr/share/eficas/Editeur/icons/
-Editeur/Patrons/ASTER/* usr/share/eficas/Editeur/Patrons/ASTER
-#usr/share/pyshared/eficas
+Editeur/icons usr/share/eficas/Editeur
+Editeur/Patrons usr/share/eficas/Editeur
+
+#
+eficas usr/bin
eficasQt usr/bin
+#eficasTk usr/bin
# Configuration
#usr/share/pyshared/Aster
Added: packages/code-aster/eficas/trunk/debian/patches/eficasTk.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/eficas/trunk/debian/patches/eficasTk.patch?rev=44146&op=file
==============================================================================
--- packages/code-aster/eficas/trunk/debian/patches/eficasTk.patch (added)
+++ packages/code-aster/eficas/trunk/debian/patches/eficasTk.patch Mon Dec 12 16:27:41 2011
@@ -1,0 +1,11 @@
+Index: eficas-6.3.0-1/eficasTk
+===================================================================
+--- eficas-6.3.0-1.orig/eficasTk 2011-12-12 13:38:17.000000000 +0100
++++ eficas-6.3.0-1/eficasTk 2011-12-12 13:40:52.000000000 +0100
+@@ -40,5 +40,5 @@
+ PYTHONEXECUTABLE=python
+ fi
+
+-$PYTHONEXECUTABLE $eficasdir/Aster/eficas_aster.py $*
++python /usr/share/pyshared/Aster/eficas_aster.py $*
+
Added: packages/code-aster/eficas/trunk/debian/patches/python_sysadd.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/eficas/trunk/debian/patches/python_sysadd.patch?rev=44146&op=file
==============================================================================
--- packages/code-aster/eficas/trunk/debian/patches/python_sysadd.patch (added)
+++ packages/code-aster/eficas/trunk/debian/patches/python_sysadd.patch Mon Dec 12 16:27:41 2011
@@ -1,0 +1,136 @@
+Index: eficas-6.3.0-1/Aster/prefs_ASTER.py
+===================================================================
+--- eficas-6.3.0-1.orig/Aster/prefs_ASTER.py 2011-05-27 16:30:33.000000000 +0200
++++ eficas-6.3.0-1/Aster/prefs_ASTER.py 2011-12-12 16:02:06.000000000 +0100
+@@ -44,7 +44,7 @@
+
+
+ EditeurDir=INSTALLDIR+"/Editeur"
+-sys.path[:0]=[INSTALLDIR]
++sys.path[len(sys.path):]=[INSTALLDIR]
+
+ ICONDIR=os.path.join(INSTALLDIR,'Editeur','icons')
+
+Index: eficas-6.3.0-1/Editeur/autre_analyse_cata.py
+===================================================================
+--- eficas-6.3.0-1.orig/Editeur/autre_analyse_cata.py 2010-11-16 09:43:12.000000000 +0100
++++ eficas-6.3.0-1/Editeur/autre_analyse_cata.py 2011-12-12 16:02:06.000000000 +0100
+@@ -24,9 +24,9 @@
+ """
+ if __name__ == "__main__" :
+ import sys
+- sys.path[:0]=[".."]
+- sys.path[:0]=["../Aster"]
+- sys.path[:0]=["../Saturne"]
++ sys.path[len(sys.path):]=[".."]
++ sys.path[len(sys.path):]=["../Aster"]
++ sys.path[len(sys.path):]=["../Saturne"]
+
+ from Accas import NUPL
+
+Index: eficas-6.3.0-1/Editeur/import_code.py
+===================================================================
+--- eficas-6.3.0-1.orig/Editeur/import_code.py 2010-09-17 15:11:49.000000000 +0200
++++ eficas-6.3.0-1/Editeur/import_code.py 2011-12-12 16:02:05.000000000 +0100
+@@ -42,10 +42,10 @@
+ # Ensuite on utilise les packages de l'intallation
+ if hasattr(prefs_Code,'CODE_PATH'):
+ if prefs_Code.CODE_PATH:
+- sys.path[:0]=[prefs_Code.CODE_PATH]
++ sys.path[len(sys.path):]=[prefs_Code.CODE_PATH]
+ import Noyau,Validation
+ del sys.path[0]
+-sys.path[:0]=[prefs_Code.INSTALLDIR]
++sys.path[len(sys.path):]=[prefs_Code.INSTALLDIR]
+
+ # Ensuite on surcharge eventuellement
+ #if hasattr(prefs_Code,'CODE_PATH_SURCHARGE'):
+Index: eficas-6.3.0-1/InterfaceQT4/monOptions_OPENTURNS_STUDY.py
+===================================================================
+--- eficas-6.3.0-1.orig/InterfaceQT4/monOptions_OPENTURNS_STUDY.py 2010-09-17 15:11:49.000000000 +0200
++++ eficas-6.3.0-1/InterfaceQT4/monOptions_OPENTURNS_STUDY.py 2011-12-12 16:02:04.000000000 +0100
+@@ -203,7 +203,7 @@
+ self.configuration.OpenTURNS_path=str(self.LERepOT.text())
+ self.configuration.save_params()
+ if self.configuration.OpenTURNS_path == "" : return
+- sys.path[:0]=[self.configuration.OpenTURNS_path]
++ sys.path[len(sys.path):]=[self.configuration.OpenTURNS_path]
+
+ def ChangeSaveDir(self):
+ if not os.path.isdir(self.LESaveDir.text()) :
+Index: eficas-6.3.0-1/InterfaceQT4/monOptions_OPENTURNS_WRAPPER.py
+===================================================================
+--- eficas-6.3.0-1.orig/InterfaceQT4/monOptions_OPENTURNS_WRAPPER.py 2010-09-17 15:11:49.000000000 +0200
++++ eficas-6.3.0-1/InterfaceQT4/monOptions_OPENTURNS_WRAPPER.py 2011-12-12 16:02:03.000000000 +0100
+@@ -203,7 +203,7 @@
+ self.configuration.OpenTURNS_path=str(self.LERepOT.text())
+ self.configuration.save_params()
+ if self.configuration.OpenTURNS_path == "" : return
+- sys.path[:0]=[self.configuration.OpenTURNS_path]
++ sys.path[len(sys.path):]=[self.configuration.OpenTURNS_path]
+
+ def ChangeSaveDir(self):
+ if not os.path.isdir(self.LESaveDir.text()) :
+Index: eficas-6.3.0-1/Openturns_Study/configuration_OPENTURNS_STUDY.py
+===================================================================
+--- eficas-6.3.0-1.orig/Openturns_Study/configuration_OPENTURNS_STUDY.py 2011-06-14 13:21:02.000000000 +0200
++++ eficas-6.3.0-1/Openturns_Study/configuration_OPENTURNS_STUDY.py 2011-12-12 16:02:02.000000000 +0100
+@@ -56,7 +56,7 @@
+ if hasattr(self,'oldOTPath') and (self.OpenTURNS_path != self.oldOTPath):
+ import sys
+ sys.path.remove(self.oldOTPath)
+- sys.path[:0]=[self.OpenTURNS_path]
++ sys.path[len(sys.path):]=[self.OpenTURNS_path]
+ self.oldOTPath=self.OpenTURNS_path
+
+ def make_config(appli,rep):
+Index: eficas-6.3.0-1/Openturns_Study/prefs_OPENTURNS_STUDY.py
+===================================================================
+--- eficas-6.3.0-1.orig/Openturns_Study/prefs_OPENTURNS_STUDY.py 2011-06-14 13:21:02.000000000 +0200
++++ eficas-6.3.0-1/Openturns_Study/prefs_OPENTURNS_STUDY.py 2011-12-12 16:02:03.000000000 +0100
+@@ -49,5 +49,5 @@
+ OpenTURNS_path=""
+ # Choix des catalogues
+ if len(OpenTURNS_path) > 0:
+- sys.path[:0]=[OpenTURNS_path]
+-sys.path[:0]=[INSTALLDIR]
++ sys.path[len(sys.path):]=[OpenTURNS_path]
++sys.path[len(sys.path):]=[INSTALLDIR]
+Index: eficas-6.3.0-1/Openturns_Wrapper/configuration_OPENTURNS_WRAPPER.py
+===================================================================
+--- eficas-6.3.0-1.orig/Openturns_Wrapper/configuration_OPENTURNS_WRAPPER.py 2011-06-14 13:21:02.000000000 +0200
++++ eficas-6.3.0-1/Openturns_Wrapper/configuration_OPENTURNS_WRAPPER.py 2011-12-12 16:02:00.000000000 +0100
+@@ -57,7 +57,7 @@
+ if hasattr(self,'oldOTPath') and (self.OpenTURNS_path != self.oldOTPath):
+ import sys
+ sys.path.remove(self.oldOTPath)
+- sys.path[:0]=[self.OpenTURNS_path]
++ sys.path[len(sys.path):]=[self.OpenTURNS_path]
+ self.oldOTPath=self.OpenTURNS_path
+
+ def make_config(appli,rep):
+Index: eficas-6.3.0-1/Openturns_Wrapper/prefs_OPENTURNS_WRAPPER.py
+===================================================================
+--- eficas-6.3.0-1.orig/Openturns_Wrapper/prefs_OPENTURNS_WRAPPER.py 2011-06-14 13:21:02.000000000 +0200
++++ eficas-6.3.0-1/Openturns_Wrapper/prefs_OPENTURNS_WRAPPER.py 2011-12-12 16:02:02.000000000 +0100
+@@ -49,5 +49,5 @@
+ OpenTURNS_path=""
+ # Choix des catalogues
+ if len(OpenTURNS_path) > 0:
+- sys.path[:0]=[OpenTURNS_path]
+-sys.path[:0]=[INSTALLDIR]
++ sys.path[len(sys.path):]=[OpenTURNS_path]
++sys.path[len(sys.path):]=[INSTALLDIR]
+Index: eficas-6.3.0-1/generator/OpenturnsSTD.py
+===================================================================
+--- eficas-6.3.0-1.orig/generator/OpenturnsSTD.py 2010-09-17 15:11:51.000000000 +0200
++++ eficas-6.3.0-1/generator/OpenturnsSTD.py 2011-12-12 16:02:05.000000000 +0100
+@@ -25,7 +25,7 @@
+
+ # Chargement du module systeme
+ import sys
+-sys.path[:0]=['%s']
++sys.path[len(sys.path):]=['%s']
+
+ # Chargement du module math
+ import math
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=44146&op=diff
==============================================================================
--- packages/code-aster/eficas/trunk/debian/patches/series (original)
+++ packages/code-aster/eficas/trunk/debian/patches/series Mon Dec 12 16:27:41 2011
@@ -1,1 +1,4 @@
-setup.py.diff
+setup.py.patch
+eficasTk.patch
+#eficas_prefs.patch
+python_sysadd.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=44146&op=diff
==============================================================================
--- packages/code-aster/eficas/trunk/debian/rules (original)
+++ packages/code-aster/eficas/trunk/debian/rules Mon Dec 12 16:27:41 2011
@@ -2,11 +2,10 @@
# Copyright 2008 - Sylvestre Ledru <sylvestre.ledru at inria.fr>
ASTER_VERSION=11.0.10
-ASTER_VERSION_FULL=$(ASTER_VERSION)-1
+ASTER_VERSION_FULL=$(ASTER_VERSION)-2
DEB_PYTHON_MODULE_PACKAGE = eficas
-DEB_PYTHON2_MODULE_PACKAGES = eficas
-#DEB_PYTHON_SYSTEM=pysupport
+DEB_PYTHON_SYSTEM=pysupport
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/python-distutils.mk
@@ -14,28 +13,31 @@
DEB_PYTHON_COMPILE_VERSION := $(shell pyversions -r)
DEB_PYTHON_INSTALL_ARGS_ALL += --no-compile \
- --install-lib=usr/share/pyshared/eficas
+ --install-lib=usr/share/python-support/eficas
# --install-lib usr/lib/$(DEB_PYTHON_COMPILE_VERSION)/site-packages/eficas
#usr/share/python/site-package/eficas
-build/$(DEB_PYTHON_MODULE_PACKAGE)::
+build/eficas::
echo '#!/bin/sh\npython /usr/share/pyshared/Aster/qtEficas_aster.py $$*\n' > eficasQt
-install/$(DEB_PYTHON_MODULE_PACKAGE)::
+install/eficas::
# Configuration
+ install -d debian/eficas/usr/share/pyshared/Editeur
+ (cd debian/eficas/usr/share/pyshared/Editeur && ln -sf /usr/share/eficas/Editeur/icons .)
+ (cd debian/eficas/usr/share/pyshared/Editeur && ln -sf /usr/share/eficas/Editeur/Patrons .)
install -d debian/eficas/usr/share/pyshared/Aster
- install -d debian/eficas/etc/eficas/
- (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/Editeur .)
-
+ (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 .)
+
# Permissions
#chmod +x debian/eficas/usr/share/pyshared/eficas/Aster/eficas_aster.py
#chmod +x debian/eficas/usr/share/pyshared/eficas/Aster/qtEficas_aster.py
#chmod +x debian/eficas/usr/share/pyshared/eficas/Traducteur/traduitV7V8.py
#chmod +x debian/eficas/usr/share/pyshared/eficas/Traducteur/traduitV8V9.py
+# Remove
+ rm -rf debian/eficas/usr/lib/python*
clean::
More information about the debian-science-commits
mailing list