r45196 - in /packages/code-aster/astk/trunk/debian: changelog code-aster-gui.config code-aster-gui.templates control rules
trophime-guest at users.alioth.debian.org
trophime-guest at users.alioth.debian.org
Mon Jul 2 12:15:05 UTC 2012
Author: trophime-guest
Date: Mon Jul 2 12:15:05 2012
New Revision: 45196
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45196
Log:
fix #679589
Modified:
packages/code-aster/astk/trunk/debian/changelog
packages/code-aster/astk/trunk/debian/code-aster-gui.config
packages/code-aster/astk/trunk/debian/code-aster-gui.templates
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=45196&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/changelog (original)
+++ packages/code-aster/astk/trunk/debian/changelog Mon Jul 2 12:15:05 2012
@@ -1,7 +1,8 @@
astk (1.10.4-4) unstable; urgency=low
* debian/control:
- - add gcc to code-aster-gui Depends (closes: #679589)
+ - Remove dpkg-dev, gcc from code-aster-guiDepends
+ * fix code-aster-gui.config (closes: #679589)
-- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr> Sat, 30 Jun 2012 14:44:09 +0200
Modified: packages/code-aster/astk/trunk/debian/code-aster-gui.config
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/code-aster-gui.config?rev=45196&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/code-aster-gui.config (original)
+++ packages/code-aster/astk/trunk/debian/code-aster-gui.config Mon Jul 2 12:15:05 2012
@@ -6,18 +6,18 @@
# Source debconf library.
. /usr/share/debconf/confmodule
-DEB_HOST_ARCH_OS="$(dpkg-architecture -qDEB_HOST_ARCH_OS | tr '[:lower:]' '[:upper:]')"
-DEB_HOST_ARCH_BITS="$(dpkg-architecture -qDEB_HOST_ARCH_BITS)"
+#DEB_HOST_ARCH_OS="$(dpkg-architecture -qDEB_HOST_ARCH_OS | tr '[:lower:]' '[:upper:]')"
+#DEB_HOST_ARCH_BITS="$(dpkg-architecture -qDEB_HOST_ARCH_BITS)"
#Set default platform
-if [ "${dc_platform}" = "" ] ; then
- dc_platform= "${DEB_HOST_ARCH_OS}" && \
- db_set astk/platform "${dc_platform}"
- if [ "${DEB_HOST_ARCH_BITS}" = "64" ] ; then
- dc_platform= "${DEB_HOST_ARCH_OS}${DEB_HOST_ARCH_BITS}" && \
- db_set astk/platform "${dc_platform}"
- fi
-fi
+#if [ "${dc_platform}" = "" ] ; then
+# dc_platform="${DEB_HOST_ARCH_OS}" && \
+# db_set astk/platform "${dc_platform}"
+# if [ "${DEB_HOST_ARCH_BITS}" = "64" ] ; then
+# dc_platform="${DEB_HOST_ARCH_OS}${DEB_HOST_ARCH_BITS}" && \
+# db_set astk/platform "${dc_platform}"
+# fi
+#fi
#Set default domain name
if [ "${dc_domainname}" = "" ] ; then
@@ -52,31 +52,26 @@
db_version 2.0
# Choose Platform
-db_input medium astk/platform || true
-dc_platform="$RET"
+#db_input medium astk/platform || true
+#dc_platform="$RET"
+#db_go
+
+db_input medium astk/domainname || true
+dc_domainname="$RET"
db_go
-# Node name
+db_input medium astk/servername || true
+dc_servername="$RET"
+db_go
+
db_input medium astk/node || true
dc_node="$RET"
db_go
-# Server name
-db_input medium astk/servername || true
-dc_servername="$RET"
-db_go
-
-# Domain name
-db_input medium astk/domainname || true
-dc_domainname="$RET"
-db_go
-
-# Choose Editor
db_input medium astk/EDITOR || true
dc_editor="$RET"
db_go
-# Choose TERMINAL
db_input medium astk/TERMINAL || true
dc_terminal="$RET"
db_go
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=45196&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/code-aster-gui.templates (original)
+++ packages/code-aster/astk/trunk/debian/code-aster-gui.templates Mon Jul 2 12:15:05 2012
@@ -6,6 +6,13 @@
#
# 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
@@ -18,6 +25,12 @@
_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
Modified: packages/code-aster/astk/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/control?rev=45196&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/control (original)
+++ packages/code-aster/astk/trunk/debian/control Mon Jul 2 12:15:05 2012
@@ -15,8 +15,7 @@
Package: code-aster-gui
Architecture: all
Section: science
-Depends: tk8.5 | wish, tcl8.5 | tclsh, tkpng, debconf (>= 1.5.30), ${misc:Depends},
- dpkg-dev, gcc
+Depends: tk8.5 | wish, tcl8.5 | tclsh, tkpng, debconf (>= 1.5.30), ${misc:Depends}
Recommends: code-aster-run
Replaces: astk, astk-server
Conflicts: astk, astk-server
Modified: packages/code-aster/astk/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/rules?rev=45196&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/rules (original)
+++ packages/code-aster/astk/trunk/debian/rules Mon Jul 2 12:15:05 2012
@@ -7,6 +7,10 @@
BUILDDIR = $(CURDIR)/debian/build
DEB_DESTDIR = $(CURDIR)/debian/tmp
+
+DEB_HOST_ARCH_OS=$(shell dpkg-architecture -qDEB_HOST_ARCH_OS | tr '[:lower:]' '[:upper:]')
+DEB_HOST_ARCH_BITS=$(shell dpkg-architecture -qDEB_HOST_ARCH_BITS)
+
%:
dh $@ --builddirectory=$(BUILDDIR) --with python2
@@ -35,8 +39,16 @@
# Add version to ASTK_SERV/etc/aster(/etc/codeaster/aster)
perl -pi -e "s|#\?vers : VVV\?|vers : STA10.6|" ASTK_SERV/etc/aster
+ # Fix platform in ASTK_SERV/etc/asrun (/etc/codeaster/asrun)
+ if [ "${DEB_HOST_ARCH_BITS}" = "64" ]; then \
+ perl -pi -e "s|\?IFDEF\?|$(DEB_HOST_ARCH_OS)$(DEB_HOST_ARCH_BITS)|" ASTK_SERV/etc/asrun; \
+ else \
+ perl -pi -e "s|\?IFDEF\?|$(DEB_HOST_ARCH_OS)|" ASTK_SERV/etc/asrun; \
+ fi
+
#fix lintian error
#chmod ugo-x $(DEB_DESTDIR)debian/code-aster-run/$(ASTER_ROOT)/asrun/unittest/run_test.py
+
# how to remove duplicate .py in $(ASTER_ROOT)/asrun/unittest??
More information about the debian-science-commits
mailing list