Author: dnusinow
Date: 2006-02-26 22:56:22 -0500 (Sun, 26 Feb 2006)
New Revision: 1346
Added:
branches/modular/app/twm-X11R7.0-1.0.1/debian/patches/
branches/modular/app/twm-X11R7.0-1.0.1/debian/patches/01_debian_system_twmrc.diff
branches/modular/app/twm-X11R7.0-1.0.1/debian/patches/series
Modified:
branches/modular/app/twm-X11R7.0-1.0.1/debian/changelog
branches/modular/app/twm-X11R7.0-1.0.1/debian/rules
Log:
* Port patches from trunk
+ debian/903_debian_system.twmrc.diff
Modified: branches/modular/app/twm-X11R7.0-1.0.1/debian/changelog
===================================================================
--- branches/modular/app/twm-X11R7.0-1.0.1/debian/changelog 2006-02-27
03:50:54 UTC (rev 1345)
+++ branches/modular/app/twm-X11R7.0-1.0.1/debian/changelog 2006-02-27
03:56:22 UTC (rev 1346)
@@ -3,8 +3,10 @@
[ David Nusinow ]
* Add versioned build-depends on the modular X libs. Thanks Frank
Lichtenheld. (closes: #354098)
+ * Port patches from trunk
+ + debian/903_debian_system.twmrc.diff
- -- David Nusinow <[EMAIL PROTECTED]> Thu, 23 Feb 2006 22:06:20 -0500
+ -- David Nusinow <[EMAIL PROTECTED]> Sun, 26 Feb 2006 22:55:58 -0500
twm (1:1.0.1-1) experimental; urgency=low
Added:
branches/modular/app/twm-X11R7.0-1.0.1/debian/patches/01_debian_system_twmrc.diff
===================================================================
---
branches/modular/app/twm-X11R7.0-1.0.1/debian/patches/01_debian_system_twmrc.diff
2006-02-27 03:50:54 UTC (rev 1345)
+++
branches/modular/app/twm-X11R7.0-1.0.1/debian/patches/01_debian_system_twmrc.diff
2006-02-27 03:56:22 UTC (rev 1346)
@@ -0,0 +1,78 @@
+$Id: 903_debian_system.twmrc.diff 396 2005-07-22 21:45:02Z dnusinow $
+
+Fix system.twmrc to actually be useful and tabbed right, as well as add
+the Debian menu. This patch by Branden Robinson.
+
+diff -ruN src/system.twmrc xc/programs/twm/system.twmrc
+--- src/system.twmrc 2004-04-23 19:54:37.000000000 +0000
++++ src/system.twmrc 2004-10-27 05:38:03.898916992 +0000
+@@ -52,7 +52,8 @@
+ #
+ # Set some useful bindings. Sort of uwm-ish, sort of simple-button-ish
+ #
+-Button1 = : root : f.menu "defops"
++Button1 = : root : f.menu "main"
++Button2 = : root : f.menu "windowops"
+
+ Button1 = m : window|icon : f.function "move-or-lower"
+ Button2 = m : window|icon : f.iconify
+@@ -70,25 +71,39 @@
+ #
+ # And a menus with the usual things
+ #
+-menu "defops"
++menu "main"
+ {
+-"Twm" f.title
+-"Iconify" f.iconify
+-"Resize" f.resize
+-"Move" f.move
+-"Raise" f.raise
+-"Lower" f.lower
+-"" f.nop
+-"Focus" f.focus
+-"Unfocus" f.unfocus
+-"Show Iconmgr" f.showiconmgr
+-"Hide Iconmgr" f.hideiconmgr
+-"" f.nop
+-"Xterm" f.exec "exec xterm &"
+-"" f.nop
+-"Kill" f.destroy
+-"Delete" f.delete
+-"" f.nop
+-"Restart" f.restart
+-"Exit" f.quit
++ "Main Menu" f.title
++ "Debian" f.menu "/Debian"
++ "" f.nop
++ "Show Icon Manager" f.showiconmgr
++ "Hide Icon Manager" f.hideiconmgr
++ "" f.nop
++ "Exit" f.menu "Quit-Verify"
+ }
++
++menu "Quit-Verify"
++{
++ "Really quit twm?" f.title
++ "No, restart twm" f.restart
++ "Yes, really quit" f.quit
++}
++
++menu "windowops"
++{
++ "Window Ops" f.title
++ "" f.nop
++ "Iconify" f.iconify
++ "Resize" f.resize
++ "Move" f.move
++ "Raise" f.raise
++ "Lower" f.lower
++ "" f.nop
++ "Focus" f.focus
++ "Unfocus" f.unfocus
++ "" f.nop
++ "Delete" f.delete
++ "Destroy" f.destroy
++}
++
++include-menu-defs
Added: branches/modular/app/twm-X11R7.0-1.0.1/debian/patches/series
===================================================================
--- branches/modular/app/twm-X11R7.0-1.0.1/debian/patches/series
2006-02-27 03:50:54 UTC (rev 1345)
+++ branches/modular/app/twm-X11R7.0-1.0.1/debian/patches/series
2006-02-27 03:56:22 UTC (rev 1346)
@@ -0,0 +1 @@
+01_debian_system_twmrc.diff -p0
Modified: branches/modular/app/twm-X11R7.0-1.0.1/debian/rules
===================================================================
--- branches/modular/app/twm-X11R7.0-1.0.1/debian/rules 2006-02-27 03:50:54 UTC
(rev 1345)
+++ branches/modular/app/twm-X11R7.0-1.0.1/debian/rules 2006-02-27 03:56:22 UTC
(rev 1346)
@@ -36,7 +36,7 @@
# so very wrong
CFLAGS += -DLIBXCURSOR=\\\"libXcursor.so.1\\\"
-build: build-stamp
+build: patch build-stamp
build-stamp:
dh_testdir
@@ -49,7 +49,7 @@
touch build-stamp
-clean:
+clean: xsfclean
dh_testdir
dh_testroot
rm -f build-stamp
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
