r45129 - in /packages/code-aster/astk/trunk/debian: code-aster-gui.postinst code-aster-run.config control patches/config.patch rules

[trophime-guest at users.alioth.debian.org]

Author: trophime-guest
Date: Tue Jun 26 17:08:40 2012
New Revision: 45129

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45129
Log:
some minor fixes

Modified:
    packages/code-aster/astk/trunk/debian/code-aster-gui.postinst
    packages/code-aster/astk/trunk/debian/code-aster-run.config
    packages/code-aster/astk/trunk/debian/control
    packages/code-aster/astk/trunk/debian/patches/config.patch
    packages/code-aster/astk/trunk/debian/rules

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=45129&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 17:08:40 2012
@@ -8,9 +8,9 @@
 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/
+               cp -a /usr/share/codeaster/astkrc/config_serveurs \
+                       /usr/share/codeaster/astkrc/prefs \
+                       /etc/codeaster/astkrc/
        fi
 
 	db_get astk/servername || true

Modified: 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=45129&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/code-aster-run.config (original)
+++ packages/code-aster/astk/trunk/debian/code-aster-run.config Tue Jun 26 17:08:40 2012
@@ -8,7 +8,7 @@
 ASRUN=/etc/codeaster/asrun
 
 if [ -f "$ASRUN" ]; then
-       editor=$(sed -ne 's/^editor[[:space:]]*:[[:space:]]*//; p; q}' $ASRUN)
+       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"

Modified: packages/code-aster/astk/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/control?rev=45129&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/control (original)
+++ packages/code-aster/astk/trunk/debian/control Tue Jun 26 17:08:40 2012
@@ -15,8 +15,8 @@
 Package: code-aster-gui
 Architecture: all
 Section: science
-Depends: tk8.5 | wish, tcl8.5 | tclsh, debconf (>= 1.5.30), ${misc:Depends},
- dpkg-dev, tkpng
+Depends: tk8.5 | wish, tcl8.5 | tclsh, tkpng, debconf (>= 1.5.30), ${misc:Depends},
+ dpkg-dev
 Recommends: code-aster-run
 Replaces: astk, astk-server
 Conflicts: astk, astk-server

Modified: packages/code-aster/astk/trunk/debian/patches/config.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/patches/config.patch?rev=45129&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/patches/config.patch (original)
+++ packages/code-aster/astk/trunk/debian/patches/config.patch Tue Jun 26 17:08:40 2012
@@ -187,7 +187,7 @@
  
  # default version (overridden by --vers option)
 -default_vers : ?ASTER_VERSION?
-+default_vers : NEW11.0
++default_vers : STA10.0
  
  # available versions
  # DO NOT EDIT FOLLOWING LINE !

Modified: packages/code-aster/astk/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/code-aster/astk/trunk/debian/rules?rev=45129&op=diff
==============================================================================
--- packages/code-aster/astk/trunk/debian/rules (original)
+++ packages/code-aster/astk/trunk/debian/rules Tue Jun 26 17:08:40 2012
@@ -38,15 +38,7 @@
 	#fix lintian error
 	#chmod  ugo-x $(DEB_DESTDIR)debian/code-aster-run/$(ASTER_ROOT)/asrun/unittest/run_test.py
 
-#these variables have not been defined in /home/trophime/alioth/code-aster/astk/build-area/astk-1.10.4/debian/tmp/etc/codeaster/asrun
-#  CTAGS_STYLE, DEBUGGER_COMMAND, DEBUGGER_COMMAND_POST, EDITOR, IFDEF, NODE, PS_COMMAND_CPU, PS_COMMAND_PID, TERMINAL
-#these variables have not been defined in /home/trophime/alioth/code-aster/astk/build-area/astk-1.10.4/debian/tmp/etc/codeaster/astkrc/config_serveurs
-#  EDITOR, FULL_SERVER_NAME, SERVER_NAME, TERMINAL
-#these variables have not been defined in /home/trophime/alioth/code-aster/astk/build-area/astk-1.10.4/debian/tmp/etc/codeaster/astkrc/prefs
-#  DOMAIN_NAME, EDITOR, TERMINAL
-#post-installation completed
-
-# how to remove duplicate py in $(ASTER_ROOT)/asrun/unittest
+# how to remove duplicate .py in $(ASTER_ROOT)/asrun/unittest??
 
 	mkdir -p debian/tmp/usr/lib/codeaster/bin
 	ln -sf /usr/bin/as_run debian/tmp/usr/lib/codeaster/bin/as_run