twm: Changes to 'debian-unstable'

[Julien Cristau <jcristau@alioth.debian.org>]

 debian/changelog       |    7 +++++++
 debian/twm.menu-method |    2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 704b3cc62c22325ef242c12e61afa611aaf371d0
Author: Julien Cristau <jcristau@debian.org>
Date:   Mon Jul 16 11:51:33 2007 +0200

    debian/twm.menu-method: add a "supported" entry for the wm menu
    
    This makes it possible to switch to another window manager from twm.

diff --git a/debian/changelog b/debian/changelog
index 51ce7f6..44dd5c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+twm (1:1.0.3-3) UNRELEASED; urgency=low
+
+  * debian/twm.menu-method: add a "supported" entry for the wm menu, to make
+    it possible to switch to another window manager from twm.
+
+ -- Julien Cristau <jcristau@debian.org>  Mon, 16 Jul 2007 11:49:50 +0200
+
 twm (1:1.0.3-2) unstable; urgency=low
 
   * Generate the maintainer scripts properly (so the x-window-manager
diff --git a/debian/twm.menu-method b/debian/twm.menu-method
index f60c0b9..d3586da 100644
--- a/debian/twm.menu-method
+++ b/debian/twm.menu-method
@@ -21,10 +21,10 @@ outputencoding="ASCII";
 function q($com)=esc($com,"\"");
 function f($com)="  \"" q(title()) "\"    f.exec  \"" q($com) " &\"\n";
 
-#This doesn't seem to be possible with twm:  wm="f.restart \"${title}\"\\n"
 supported;
   x11= f($command);
   text=f(term());
+  wm=" \"" q(title()) "\" f.startwm \"" q($command) "\"\n";
 #  x11 = "  \"" $title "\"    f.exec  \""$command " &\"\n";
 #  text= "  \"" $title "\"    f.exec  \"xterm -title \\\""
 #               $title "\\\" -e " esc($command,"\"") " &\"\n";