r45123 - in /packages/code-aster/astk/trunk/debian: ./ po/
trophime-guest at users.alioth.debian.org
trophime-guest at users.alioth.debian.org
Tue Jun 26 14:38:20 UTC 2012
Author: trophime-guest
Date: Tue Jun 26 14:38:20 2012
New Revision: 45123
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45123
Log:
transition from python-support to dh_python2 + fix for postinst by Julien Cristau -need to be tested
Added:
packages/code-aster/astk/trunk/debian/code-aster-run.config
packages/code-aster/astk/trunk/debian/code-aster-run.templates
packages/code-aster/astk/trunk/debian/compat
packages/code-aster/astk/trunk/debian/po/it.po
Removed:
packages/code-aster/astk/trunk/debian/pyversions
Modified:
packages/code-aster/astk/trunk/debian/changelog
packages/code-aster/astk/trunk/debian/code-aster-gui.install
packages/code-aster/astk/trunk/debian/code-aster-gui.postinst
packages/code-aster/astk/trunk/debian/code-aster-gui.templates
packages/code-aster/astk/trunk/debian/code-aster-run.install
packages/code-aster/astk/trunk/debian/code-aster-run.postinst
packages/code-aster/astk/trunk/debian/control
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=45123&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/changelog (original)
+++ packages/code-aster/astk/trunk/debian/changelog Tue Jun 26 14:38:20 2012
@@ -1,3 +1,20 @@
+astk (1.10.4-3) unstable; urgency=low
+
+ * debian/rules:
+ - switch to dh_python2
+ - use debhelper instead of cdbs
+ * debian/control: remove quilt
+ * debian/code-aster-gui.install
+ - remove codeaster-gui installed with dh_link
+
+ [Julien Cristau]
+ * Fix postinst and postrm scripts (Closes: #670293)
+ * Add code-aster-run.templates
+ * Add code-aster-run.config
+ * Install configfiles in usr/share/codeaster
+
+ -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr> Tue, 26 Jun 2012 16:01:42 +0200
+
astk (1.10.4-2) unstable; urgency=low
[Beatrice Torracca]
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=45123&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/code-aster-gui.install (original)
+++ packages/code-aster/astk/trunk/debian/code-aster-gui.install Tue Jun 26 14:38:20 2012
@@ -1,6 +1,6 @@
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/codeaster-gui usr/bin
debian/tmp/usr/bin/astk usr/bin
debian/tmp/usr/bin/bsf usr/bin
@@ -13,7 +13,10 @@
debian/tmp/usr/lib/astk/RELNOTES* usr/share/astk
# config
-debian/tmp/etc/codeaster/astkrc/* etc/codeaster/astkrc
+debian/tmp/etc/codeaster/astkrc/prefs usr/share/codeaster/astkrc
+debian/tmp/etc/codeaster/astkrc/config_serveurs usr/share/codeaster/astkrc
+debian/tmp/etc/codeaster/astkrc/outils etc/codeaster/astkrc
+debian/tmp/etc/codeaster/astkrc/ASTKRC_INFO.txt etc/codeaster/astkrc
# menu
debian/code-aster-gui.desktop usr/share/applications
Modified: packages/code-aster/astk/trunk/debian/code-aster-gui.postinst
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/code-aster-gui.postinst?rev=45123&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/code-aster-gui.postinst (original)
+++ packages/code-aster/astk/trunk/debian/code-aster-gui.postinst Tue Jun 26 14:38:20 2012
@@ -6,6 +6,13 @@
. /usr/share/debconf/confmodule
if [ "$1" = "configure" ] ; then
+ if [ -z "$2" ]; then
+ mkdir -p /etc/codeaster/astk
+ cp -a /usr/share/codeaster/astk/config_serveurs \
+ /usr/share/codeaster/astk/prefs \
+ /etc/codeaster/astk/
+ fi
+
db_get astk/servername || true
servername=${RET}
perl -pi -le "s|serveur : .*|serveur : $servername|" /etc/codeaster/astkrc/config_serveurs
Modified: packages/code-aster/astk/trunk/debian/code-aster-gui.templates
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/code-aster-gui.templates?rev=45123&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/code-aster-gui.templates (original)
+++ packages/code-aster/astk/trunk/debian/code-aster-gui.templates Tue Jun 26 14:38:20 2012
@@ -6,13 +6,6 @@
#
# Even minor modifications require translation updates and such
# changes should be coordinated with translators and reviewers.
-
-Template: astk/platform
-Type: select
-Choices: LINUX, P_LINUX, LINUX64, P_LINUX64
-Default: LINUX64
-_Description: Aster platform:
- Select Aster platform.
Template: astk/domainname
Type: string
@@ -25,12 +18,6 @@
_Description: ASTK server host name:
Please enter the host name (without domain name) of the server
that this ASTK client should connect to.
-
-Template: astk/node
-Type: string
-_Description: ASTK client node name:
- Please enter the public name by which this client will be known on
- the network. It must be a unique name within the domain.
Template: astk/EDITOR
Type: select
@@ -48,18 +35,3 @@
Please select the command line that ASTK should use to launch a
terminal window.
-Template: astk/MPIRUN
-Type: select
-Choices: LAM, OPENMPI, MPICH2
-Default: OPENMPI
-_Description: ASTK server MPI implementation:
- Please select the MPI implementation used by the server that this ASTK
- client should connect to.
-
-Template: astk/IFDEF
-Type: select
-Choices: LINUX, LINUX64
-Default: LINUX64
-_Description: ASTK server bit width:
- Please select the bit width of the server that this ASTK client should
- connect to.
Added: packages/code-aster/astk/trunk/debian/code-aster-run.config
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/code-aster-run.config?rev=45123&op=file
==============================================================================
--- packages/code-aster/astk/trunk/debian/code-aster-run.config (added)
+++ packages/code-aster/astk/trunk/debian/code-aster-run.config Tue Jun 26 14:38:20 2012
@@ -1,0 +1,18 @@
+#!/bin/sh
+
+set -ex
+
+# Source debconf library.
+. /usr/share/debconf/confmodule
+
+ASRUN=/etc/codeaster/asrun
+
+if [ -f "$ASRUN" ]; then
+ editor=$(sed -ne 's/^editor[[:space:]]*:[[:space:]]*//; p; q}' $ASRUN)
+ terminal=$(sed -ne '/^terminal/ { s/^terminal[[:space:]]*:[[:space:]]*//; p; q}' $ASRUN)
+ db_set astk/EDITOR "$editor"
+ db_set astk/TERMINAL "$terminal"
+fi
+db_input low astk/EDITOR || true
+db_input low astk/TERMINAL || true
+db_go || true
Modified: packages/code-aster/astk/trunk/debian/code-aster-run.install
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/code-aster-run.install?rev=45123&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/code-aster-run.install (original)
+++ packages/code-aster/astk/trunk/debian/code-aster-run.install Tue Jun 26 14:38:20 2012
@@ -9,7 +9,7 @@
ASTK_SERV/etc/config_nodename etc/codeaster
ASTK_SERV/etc/aster etc/codeaster
ASTK_SERV/etc/profile.csh etc/codeaster
-ASTK_SERV/etc/asrun etc/codeaster
+ASTK_SERV/etc/asrun usr/share/codeaster
debian/aster-mpihosts etc/codeaster
# ASTER_ROOT
Modified: packages/code-aster/astk/trunk/debian/code-aster-run.postinst
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/code-aster-run.postinst?rev=45123&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/code-aster-run.postinst (original)
+++ packages/code-aster/astk/trunk/debian/code-aster-run.postinst Tue Jun 26 14:38:20 2012
@@ -4,24 +4,29 @@
# Source debconf library.
. /usr/share/debconf/confmodule
+TEMPLATE=/usr/share/codeaster/asrun
+ASRUN=/etc/codeaster/asrun
-if [ "$1" = "configure" ] ; then
- db_get astk/platform || true
- platform=${RET}
- perl -pi -le "s|plate-forme : .*|plate-forme : $platform|" /etc/codeaster/asrun
+if [ "$1" = "configure" ]; then
+ if [ -z "$2" ]; then
+ if [ "$(getconf LONG_BIT)" = 64 ]; then
+ platform=LINUX64
+ else
+ platform=LINUX
+ fi
+ node=$(hostname -s 2>/dev/null)
- db_get astk/node || true
- node=${RET}
- perl -pi -le "s|noeud : .*|noeud : $node|" /etc/codeaster/asrun
-
- db_get astk/EDITOR || true
- editor=${RET}
- perl -pi -le "s|editor : .*|editor : $editor|" /etc/codeaster/asrun
-
- db_get astk/TERMINAL || true
- terminal=${RET}
- perl -pi -le "s|terminal : .*|terminal : $terminal|" /etc/codeaster/asrun
-
+ sed -e "s|^plate-forme : .*|plate-forme : $platform|;s|noeud : .*|noeud : $node|" < $TEMPLATE > $ASRUN
+ fi
+
+ db_get astk/EDITOR || true
+ editor=${RET}
+
+ db_get astk/TERMINAL || true
+ terminal=${RET}
+
+ sed -i -e "s|editor : .*|editor : $editor|;s|terminal : .*|terminal : $terminal|" $ASRUN
+
fi
#DEBHELPER#
Added: packages/code-aster/astk/trunk/debian/code-aster-run.templates
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/code-aster-run.templates?rev=45123&op=file
==============================================================================
--- packages/code-aster/astk/trunk/debian/code-aster-run.templates (added)
+++ packages/code-aster/astk/trunk/debian/code-aster-run.templates Tue Jun 26 14:38:20 2012
@@ -1,0 +1,38 @@
+# These templates have been reviewed by the debian-l10n-english
+# team
+#
+# If modifications/additions/rewording are needed, please ask
+# debian-l10n-english at lists.debian.org for advice.
+#
+# Even minor modifications require translation updates and such
+# changes should be coordinated with translators and reviewers.
+
+Template: astk/platform
+Type: select
+Choices: LINUX, P_LINUX, LINUX64, P_LINUX64
+Default: LINUX64
+_Description: Aster platform:
+ Select Aster platform.
+
+Template: astk/node
+Type: string
+_Description: ASTK client node name:
+ Please enter the public name by which this client will be known on
+ the network. It must be a unique name within the domain.
+
+Template: astk/EDITOR
+Type: select
+Choices: /usr/bin/nedit, /usr/bin/gedit --display=\@D, /usr/bin/kwrite --display \@D, /usr/bin/xemacs -display \@D, /usr/bin/emacs -display \@D, /usr/bin/xedit -display \@D, /usr/bin/xterm -display \@D -e \@E -e vi
+Default: /usr/bin/nedit
+_Description: Standard editor:
+ Please select the command line that ASTK should use to launch an
+ editor.
+
+Template: astk/TERMINAL
+Type: select
+Choices: /usr/bin/xterm -display \@D -e \@E, /usr/bin/gnome-terminal --display=\@D --command=\@E, /usr/bin/konsole --display \@D -e \@E
+Default: /usr/bin/gnome-terminal --display=\@D --command=\@E
+_Description: Standard terminal emulator:
+ Please select the command line that ASTK should use to launch a
+ terminal window.
+
Added: packages/code-aster/astk/trunk/debian/compat
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/compat?rev=45123&op=file
==============================================================================
--- packages/code-aster/astk/trunk/debian/compat (added)
+++ packages/code-aster/astk/trunk/debian/compat Tue Jun 26 14:38:20 2012
@@ -1,0 +1,1 @@
+8
Modified: packages/code-aster/astk/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/control?rev=45123&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/control (original)
+++ packages/code-aster/astk/trunk/debian/control Tue Jun 26 14:38:20 2012
@@ -3,10 +3,10 @@
Priority: extra
Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>, "Adam C. Powell, IV" <hazelsct at debian.org>
-Standards-Version: 3.9.2
-Build-Depends: debhelper (>= 7), cdbs (>= 0.4.90~), quilt, python-all (>= 2.6.6-3~),
- python-support (>= 1.0.7),
- po-debconf, gmsh, grace, eficas
+Standards-Version: 3.9.3
+Build-Depends: debhelper (>= 8), python-all (>= 2.6.6-3~), po-debconf,
+ gmsh, grace, eficas
+X-Python-Version: all
Homepage: http://www.code-aster.org/
Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/code-aster/astk/
Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/code-aster/astk/
Added: packages/code-aster/astk/trunk/debian/po/it.po
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/po/it.po?rev=45123&op=file
==============================================================================
--- packages/code-aster/astk/trunk/debian/po/it.po (added)
+++ packages/code-aster/astk/trunk/debian/po/it.po Tue Jun 26 14:38:20 2012
@@ -1,0 +1,140 @@
+# Italian translation of astk debconf messages.
+# Copyright (C) 2012, astk package copyright holder
+# This file is distributed under the same license as the astk package.
+# Beatrice Torracca <beatricet at libero.it>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: astk\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-04-24 10:29+0200\n"
+"PO-Revision-Date: 2012-05-21 20:27+0200\n"
+"Last-Translator: Beatrice Torracca <beatricet at libero.it>\n"
+"Language-Team: Italian <debian-l10n-italian at lists.debian.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.7.1\n"
+
+#. Type: select
+#. Description
+#: ../code-aster-gui.templates:2001
+msgid "Aster platform:"
+msgstr "Piattaforma Aster:"
+
+#. Type: select
+#. Description
+#: ../code-aster-gui.templates:2001
+msgid "Select Aster platform."
+msgstr "Selezionare la piattaforma Aster."
+
+#. Type: string
+#. Description
+#: ../code-aster-gui.templates:3001
+msgid "ASTK server domain name:"
+msgstr "Nome di dominio del server ASTK:"
+
+#. Type: string
+#. Description
+#: ../code-aster-gui.templates:3001
+msgid ""
+"Please enter the domain name of the server that this ASTK client should "
+"connect to."
+msgstr ""
+"Inserire il nome di dominio del server a cui si deve connettere questo "
+"client ASTK."
+
+#. Type: string
+#. Description
+#: ../code-aster-gui.templates:4001
+msgid "ASTK server host name:"
+msgstr "Nome host del server ASTK:"
+
+#. Type: string
+#. Description
+#: ../code-aster-gui.templates:4001
+msgid ""
+"Please enter the host name (without domain name) of the server that this "
+"ASTK client should connect to."
+msgstr ""
+"Inserire il nome host (senza nome di dominio) del server a cui si deve "
+"connettere questo client ASTK."
+
+#. Type: string
+#. Description
+#: ../code-aster-gui.templates:5001
+msgid "ASTK client node name:"
+msgstr "Nome del nodo del client ASTK:"
+
+#. Type: string
+#. Description
+#: ../code-aster-gui.templates:5001
+msgid ""
+"Please enter the public name by which this client will be known on the "
+"network. It must be a unique name within the domain."
+msgstr ""
+"Inserire il nome pubblico con sui sarà conosciuto nella rete questo client. "
+"Deve essere un nome univoco all'interno del dominio."
+
+#. Type: select
+#. Description
+#: ../code-aster-gui.templates:6001
+msgid "Standard editor:"
+msgstr "Editor standard:"
+
+#. Type: select
+#. Description
+#: ../code-aster-gui.templates:6001
+msgid ""
+"Please select the command line that ASTK should use to launch an editor."
+msgstr ""
+"Selezionare la riga di comando che ASTK deve usare per avviare un editor."
+
+#. Type: select
+#. Description
+#: ../code-aster-gui.templates:7001
+msgid "Standard terminal emulator:"
+msgstr "Emulatore di terminale standard:"
+
+#. Type: select
+#. Description
+#: ../code-aster-gui.templates:7001
+msgid ""
+"Please select the command line that ASTK should use to launch a terminal "
+"window."
+msgstr ""
+"Selezionare la riga di comando che ASTK deve usare per avviare una finestra "
+"di terminale."
+
+#. Type: select
+#. Description
+#: ../code-aster-gui.templates:8001
+msgid "ASTK server MPI implementation:"
+msgstr "Implementazione MPI del server ASTK:"
+
+#. Type: select
+#. Description
+#: ../code-aster-gui.templates:8001
+msgid ""
+"Please select the MPI implementation used by the server that this ASTK "
+"client should connect to."
+msgstr ""
+"Selezionare l'implementazione MPI usata dal server a cui si deve connettere "
+"questo client ASTK."
+
+#. Type: select
+#. Description
+#: ../code-aster-gui.templates:9001
+msgid "ASTK server bit width:"
+msgstr "Larghezza in bit del server ASTK:"
+
+#. Type: select
+#. Description
+#: ../code-aster-gui.templates:9001
+msgid ""
+"Please select the bit width of the server that this ASTK client should "
+"connect to."
+msgstr ""
+"Selezionare la larghezza in bit del server a cui si deve connettere questo "
+"client ASTK."
Modified: packages/code-aster/astk/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/rules?rev=45123&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/rules (original)
+++ packages/code-aster/astk/trunk/debian/rules Tue Jun 26 14:38:20 2012
@@ -5,22 +5,23 @@
ASTER_VERSION_FULL=$(ASTER_VERSION)-3
ASTER_ROOT=/usr/lib/codeaster
-DEB_PYTHON_SYSTEM=pysupport
+BUILDDIR = $(CURDIR)/debian/build
+DEB_DESTDIR = $(CURDIR)/debian/tmp
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+%:
+ dh $@ --builddirectory=$(BUILDDIR) --with python2
-DEB_PYTHON_MODULE_PACKAGE = asrun
DEB_PYTHON_COMPILE_VERSION := $(shell pyversions -r)
DEB_PYTHON_INSTALL_ARGS_ALL += --no-compile \
- --install-lib=usr/share/python-support --install-layout=deb
+ --install-lib=usr/share/pyshared --install-layout=deb
export DESTDIR = $(DEB_DESTDIR)
-install/code-aster-gui::
+override_dh_auto_install:
+ dh_auto_install
+#install/code-gui-run::
rm -f $(DEB_DESTDIR)/usr/lib/astk/BWidget-1.7.0/LICENSE.txt
- cd $(DEB_DESTDIR)/usr/bin && ln -sf codeaster-client codeaster-gui
+ dh_link usr/bin/codeaster-client usr/bin/codeaster-gui
# Add links in $ASTER_ROOT/outils
mkdir -p debian/code-aster-gui/$(ASTER_ROOT)/outils
@@ -28,15 +29,15 @@
ln -sf /usr/bin/eficasQt debian/code-aster-gui/$(ASTER_ROOT)/outils
ln -sf /usr/bin/gmsh debian/code-aster-gui/$(ASTER_ROOT)/outils
ln -sf /usr/bin/xmgrace debian/code-aster-gui/$(ASTER_ROOT)/outils
-
-install/code-aster-run::
-
+
+#install/code-aster-run::
+
# Add version to ASTK_SERV/etc/aster(/etc/codeaster/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
-
+
+ #fix lintian error
+ chmod ugo-x $(DEB_DESTDIR)/$(ASTER_ROOT)/asrun/unittest/run_test.py
+
mkdir -p debian/tmp/usr/lib/codeaster/bin
ln -sf /usr/bin/as_run debian/tmp/usr/lib/codeaster/bin/as_run
@@ -44,14 +45,17 @@
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
-
+override_dh_auto_clean:
+ rm -rf $(BUILDDIR)
+ rm -rf $(CURDIR)/debian/tmp
+ find . -name \*.pyc | xargs -r rm
+ debconf-updatepo
+
get-orig-source:
# Retreive aster-full-src-$(ASTER_VERSION_FULL).noarch.tar.gz
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
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
More information about the debian-science-commits
mailing list