X Strike Force X.Org X11 SVN commit: r100 - trunk/debian
Author: dnusinow
Date: 2005-05-16 21:08:59 -0500 (Mon, 16 May 2005)
New Revision: 100
Added:
trunk/debian/twm.README.Debian
trunk/debian/twm.examples
trunk/debian/twm.install
trunk/debian/twm.links
trunk/debian/twm.menu
trunk/debian/twm.menu-method
trunk/debian/twm.postinst.in
trunk/debian/twm.postrm.in
trunk/debian/twm.preinst.in
trunk/debian/twm.prerm.in
Modified:
trunk/debian/changelog
Log:
Added twm packaging files. Minor change to postinst noted in changelog. Audited, altered, and approved by David.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-05-17 02:03:19 UTC (rev 99)
+++ trunk/debian/changelog 2005-05-17 02:08:59 UTC (rev 100)
@@ -8,6 +8,8 @@
- Add Daniel Stone to list of Debian package authors in copyright for
his work on this package. Update branding in general in this file.
- Update shell-lib.sh to merge changes from current xfree tree
+ - Change twm manpage to be set to twm.1x rather than twm.1, as in the
+ xfree packaging
- Re-add jisx0208.1983-0.enc.gz to MANIFEST.all's list of font encodings
until I know more about why it was removed.
Added: trunk/debian/twm.README.Debian
===================================================================
--- trunk/debian/twm.README.Debian 2005-05-17 02:03:19 UTC (rev 99)
+++ trunk/debian/twm.README.Debian 2005-05-17 02:08:59 UTC (rev 100)
@@ -0,0 +1,22 @@
+Debian README for twm package
+=============================
+
+Newcomers to the X Window System should first read the Debian X FAQ
+(Frequently Asked Questions list): /usr/share/doc/xfree86-common/FAQ.gz.
+You can view this file with your favorite pager program after decompressing
+it. For example:
+ $ zcat /usr/share/doc/xfree86-common/FAQ.gz | pager
+
+For information on the /etc/X11/twm/system.twmrc file, see the twm(1)
+manual page. Note that /etc/X11/twm/system.twmrc is auto-generated from
+the /etc/X11/twm/system.twmrc-menu file, so as to be able to support the
+Debian menu system. You should therefore make your customizations to
+/etc/X11/twm/system.twmrc-menu. After the update-menu command is run, they
+will appear in /etc/X11/twm/system.twmrc and be used by the twm binary.
+
+Some examples of .twmrc files from days of yore are available in
+/usr/share/doc/twm/examples.
+
+$Id: twm.README.Debian 1244 2004-04-13 22:02:31Z branden $
+
+vim:set ai et sts=4 sw=4 tw=80:
Added: trunk/debian/twm.examples
===================================================================
--- trunk/debian/twm.examples 2005-05-17 02:03:19 UTC (rev 99)
+++ trunk/debian/twm.examples 2005-05-17 02:08:59 UTC (rev 100)
@@ -0,0 +1,3 @@
+build-tree/xc/programs/twm/sample-twmrc/jim.twmrc
+build-tree/xc/programs/twm/sample-twmrc/keith.twmrc
+build-tree/xc/programs/twm/sample-twmrc/lemke.twmrc
Added: trunk/debian/twm.install
===================================================================
--- trunk/debian/twm.install 2005-05-17 02:03:19 UTC (rev 99)
+++ trunk/debian/twm.install 2005-05-17 02:08:59 UTC (rev 100)
@@ -0,0 +1,3 @@
+etc/X11/twm/system.twmrc-menu
+usr/X11R6/bin/twm
+usr/X11R6/man/man1/twm.1x
Added: trunk/debian/twm.links
===================================================================
--- trunk/debian/twm.links 2005-05-17 02:03:19 UTC (rev 99)
+++ trunk/debian/twm.links 2005-05-17 02:08:59 UTC (rev 100)
@@ -0,0 +1 @@
+etc/X11/twm usr/X11R6/lib/X11/twm
Added: trunk/debian/twm.menu
===================================================================
--- trunk/debian/twm.menu 2005-05-17 02:03:19 UTC (rev 99)
+++ trunk/debian/twm.menu 2005-05-17 02:08:59 UTC (rev 100)
@@ -0,0 +1,6 @@
+?package(twm):\
+ needs="wm"\
+ section="WindowManagers"\
+ longtitle="Twm: Tab Window Manager"\
+ title="Twm"\
+ command="twm"
Added: trunk/debian/twm.menu-method
===================================================================
--- trunk/debian/twm.menu-method 2005-05-17 02:03:19 UTC (rev 99)
+++ trunk/debian/twm.menu-method 2005-05-17 02:08:59 UTC (rev 100)
@@ -0,0 +1,35 @@
+#!/usr/sbin/install-menu
+# -*- mode: shell-script; -*-
+#I need menu-1!
+#
+#NOTE: the first line of this script _must_ be
+# equal to "#!/usr/sbin/install-menu", otherwise update-menus
+# will feed this script old-compat-mode data.
+#
+#More info: /usr/doc/menu/html.
+#
+compat="menu-1"
+
+!include menu.h
+
+compat="menu-2"
+
+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());
+# x11 = " \"" $title "\" f.exec \""$command " &\"\n";
+# text= " \"" $title "\" f.exec \"xterm -title \\\""
+# $title "\\\" -e " esc($command,"\"") " &\"\n";
+endsupported;
+startmenu= "menu \"" q($section) "\"\n{\n";
+endmenu= "}\n";
+submenutitle=" \"" q(title()) "\" f.menu \"" q($section) "\"\n";
+genmenu= "menudefs.hook";
+rcfile= "system.twmrc";
+examplercfile="system.twmrc-menu";
+rootprefix= "/etc/X11/twm/";
+userprefix= "/.twm/";
Added: trunk/debian/twm.postinst.in
===================================================================
--- trunk/debian/twm.postinst.in 2005-05-17 02:03:19 UTC (rev 99)
+++ trunk/debian/twm.postinst.in 2005-05-17 02:08:59 UTC (rev 100)
@@ -0,0 +1,34 @@
+#!/bin/sh
+# Debian twm package post-installation script
+# Copyright 1998--2001, 2004 Branden Robinson.
+# Licensed under the GNU General Public License, version 2. See the file
+# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
+# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
+
+set -e
+
+THIS_PACKAGE=twm
+THIS_SCRIPT=postinst
+
+#INCLUDE_SHELL_LIB#
+
+check_symlinks_and_bomb /usr/X11R6/lib/X11/twm
+
+# now safe to remove old twm dir
+if [ -e /usr/X11R6/lib/X11/twm.moved-by-preinst ] \
+ && [ -L /usr/X11R6/lib/X11/twm ]; then
+ rm -r /usr/X11R6/lib/X11/twm.moved-by-preinst
+fi
+
+#DEBHELPER#
+
+# clean up after older alternative that used different path
+update-alternatives --remove x-window-manager /usr/bin/X11/twm
+
+update-alternatives --install /usr/bin/x-window-manager x-window-manager \
+ /usr/X11R6/bin/twm 40 --slave /usr/share/man/man1/x-window-manager.1.gz \
+ x-window-manager.1.gz /usr/X11R6/man/man1/twm.1x.gz
+
+exit 0
+
+# vim:set ai et sts=2 sw=2 tw=0:
Added: trunk/debian/twm.postrm.in
===================================================================
--- trunk/debian/twm.postrm.in 2005-05-17 02:03:19 UTC (rev 99)
+++ trunk/debian/twm.postrm.in 2005-05-17 02:08:59 UTC (rev 100)
@@ -0,0 +1,33 @@
+#!/bin/sh
+# Debian twm package post-removal script
+# Copyright 1998--2001, 2004 Branden Robinson.
+# Licensed under the GNU General Public License, version 2. See the file
+# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
+# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
+
+set -e
+
+THIS_PACKAGE=twm
+THIS_SCRIPT=postrm
+
+#INCLUDE_SHELL_LIB#
+
+if [ "$1" = "abort-install" ] || [ "$1" = "abort-upgrade" ]; then
+ if [ -d /usr/X11R6/lib/X11/twm.moved-by-preinst ] \
+ && [ -L /usr/X11R6/lib/X11/twm ]; then
+ rm /usr/X11R6/lib/X11/twm
+ mv /usr/X11R6/lib/X11/twm.moved-by-preinst /usr/X11R6/lib/X11/twm
+ fi
+fi
+
+#DEBHELPER#
+
+if [ "$1" = "purge" ]; then
+ if [ -d /etc/X11/twm ]; then
+ rm -r /etc/X11/twm
+ fi
+fi
+
+exit 0
+
+# vim:set ai et sts=2 sw=2 tw=0:
Added: trunk/debian/twm.preinst.in
===================================================================
--- trunk/debian/twm.preinst.in 2005-05-17 02:03:19 UTC (rev 99)
+++ trunk/debian/twm.preinst.in 2005-05-17 02:08:59 UTC (rev 100)
@@ -0,0 +1,28 @@
+#!/bin/sh
+# Debian twm package pre-installation script
+# Copyright 1998--2001, 2004 Branden Robinson.
+# Licensed under the GNU General Public License, version 2. See the file
+# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
+# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
+
+set -e
+
+THIS_PACKAGE=twm
+THIS_SCRIPT=preinst
+
+#INCLUDE_SHELL_LIB#
+
+if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
+ # twm dir moved to /etc/X11 in 4.x
+ if [ -e /usr/X11R6/lib/X11/twm ] && ! [ -L /usr/X11R6/lib/X11/twm ]; then
+ observe "removing obsolete /usr/X11R6/lib/X11/twm directory"
+ mv /usr/X11R6/lib/X11/twm /usr/X11R6/lib/X11/twm.moved-by-preinst
+ fi
+ check_symlinks_and_warn /usr/X11R6/lib/X11/twm
+fi
+
+#DEBHELPER#
+
+exit 0
+
+# vim:set ai et sts=2 sw=2 tw=0:
Added: trunk/debian/twm.prerm.in
===================================================================
--- trunk/debian/twm.prerm.in 2005-05-17 02:03:19 UTC (rev 99)
+++ trunk/debian/twm.prerm.in 2005-05-17 02:08:59 UTC (rev 100)
@@ -0,0 +1,23 @@
+#!/bin/sh
+# Debian twm package pre-removal script
+# Copyright 1998--2001, 2004 Branden Robinson.
+# Licensed under the GNU General Public License, version 2. See the file
+# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
+# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
+
+set -e
+
+THIS_PACKAGE=twm
+THIS_SCRIPT=prerm
+
+#INCLUDE_SHELL_LIB#
+
+#DEBHELPER#
+
+if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
+ update-alternatives --remove x-window-manager /usr/X11R6/bin/twm
+fi
+
+exit 0
+
+# vim:set ai et sts=2 sw=2 tw=0:
Reply to: