--- 9wm-1.2.orig/menu.c +++ 9wm-1.2/menu.c @@ -1,6 +1,8 @@ /* Copyright (c) 1994-1996 David Hogan, see README for licence details */ +#include #include #include +#include #include #include #include @@ -191,7 +193,7 @@ } XUnmapWindow(dpy, c->parent); XUnmapWindow(dpy, c->window); - setstate(c, IconicState); + setwinstate(c, IconicState); if (c == current) nofocus(); hiddenc[numhidden] = c; @@ -222,7 +224,7 @@ if (map) { XMapWindow(dpy, c->window); XMapRaised(dpy, c->parent); - setstate(c, NormalState); + setwinstate(c, NormalState); active(c); top(c); } --- 9wm-1.2.orig/manage.c +++ 9wm-1.2/manage.c @@ -50,7 +50,7 @@ /* Figure out what to do with the window from hints */ - if (!getstate(c->window, &state)) + if (!getwinstate(c->window, &state)) state = hints ? hints->initial_state : NormalState; dohide = (state == IconicState); @@ -135,7 +135,7 @@ active(c); else setactive(c, 0); - setstate(c, NormalState); + setwinstate(c, NormalState); } if (current && (current != c)) cmapfocus(current); @@ -195,7 +195,7 @@ XReparentWindow(dpy, c->window, c->screen->root, c->x, c->y); gravitate(c, 0); XRemoveFromSaveSet(dpy, c->window); - setstate(c, WithdrawnState); + setwinstate(c, WithdrawnState); /* flush any errors */ ignore_badwindow = 1; @@ -452,7 +452,7 @@ } void -setstate(c, state) +setwinstate(c, state) Client *c; int state; { @@ -467,7 +467,7 @@ } int -getstate(w, state) +getwinstate(w, state) Window w; int *state; { --- 9wm-1.2.orig/client.c +++ 9wm-1.2/client.c @@ -1,5 +1,7 @@ /* Copyright (c) 1994-1996 David Hogan, see README for licence details */ +#include #include +#include #include #include #include --- 9wm-1.2.orig/main.c +++ 9wm-1.2/main.c @@ -1,4 +1,5 @@ /* Copyright (c) 1994-1996 David Hogan, see README for licence details */ +#include #include #include #include --- 9wm-1.2.orig/event.c +++ 9wm-1.2/event.c @@ -1,4 +1,5 @@ /* Copyright (c) 1994-1996 David Hogan, see README for licence details */ +#include #include #include #include @@ -200,7 +201,7 @@ XMapWindow(dpy, c->window); XMapRaised(dpy, c->parent); top(c); - setstate(c, NormalState); + setwinstate(c, NormalState); if (c->trans != None && current && c->trans == current->window) active(c); break; --- 9wm-1.2.orig/error.c +++ 9wm-1.2/error.c @@ -1,4 +1,5 @@ /* Copyright (c) 1994-1996 David Hogan, see README for licence details */ +#include #include #include #include --- 9wm-1.2.orig/fns.h +++ 9wm-1.2/fns.h @@ -46,8 +46,8 @@ char *getprop(); Window getwprop(); int getiprop(); -int getstate(); -void setstate(); +int getwinstate(); +void setwinstate(); void setlabel(); void getproto(); void gettrans(); --- 9wm-1.2.orig/debian/compat +++ 9wm-1.2/debian/compat @@ -0,0 +1 @@ +5 --- 9wm-1.2.orig/debian/9wm.manpages +++ 9wm-1.2/debian/9wm.manpages @@ -0,0 +1 @@ +9wm.man --- 9wm-1.2.orig/debian/control +++ 9wm-1.2/debian/control @@ -0,0 +1,18 @@ +Source: 9wm +Section: x11 +Priority: optional +Maintainer: Decklin Foster +Build-Depends: debhelper (>= 5.0), xutils-dev, x11proto-core-dev, libx11-dev, libxext-dev +Standards-Version: 3.8.0 + +Package: 9wm +Architecture: any +Depends: ${shlibs:Depends} +Provides: x-window-manager +Suggests: 9menu +Description: emulation of the Plan 9 window manager 8-1/2 + 9wm is an X window manager which attempts to emulate the Plan 9 window + manager 8-1/2 as far as possible within the constraints imposed by X. + . + It provides a simple yet comfortable user interface, without garish + decorations or title-bars. Or icons. And it's click-to-type. --- 9wm-1.2.orig/debian/9wm.postinst +++ 9wm-1.2/debian/9wm.postinst @@ -0,0 +1,15 @@ +#!/bin/sh -e + +if [ "$1" = configure ]; then + update-alternatives --install /usr/bin/x-window-manager \ + x-window-manager \ + /usr/bin/9wm \ + 20 \ + --slave /usr/share/man/man1/x-window-manager.1.gz \ + x-window-manager.1.gz \ + /usr/share/man/man1/9wm.1.gz +fi + +#DEBHELPER# + +exit 0 --- 9wm-1.2.orig/debian/rules +++ 9wm-1.2/debian/rules @@ -0,0 +1,61 @@ +#!/usr/bin/make -f +# Derived from dh_make example. + +#export DH_VERBOSE=1 + +CC = gcc +DEB_CFLAGS = -Wall -g +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) +DEB_CFLAGS += -O0 +else +DEB_CFLAGS += -O2 +endif + +export DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +build: build-stamp +build-stamp: + dh_testdir + xmkmf + $(MAKE) CC="$(CC)" CFLAGS="$(DEB_CFLAGS)" + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp install-stamp + -$(MAKE) clean + rm -f Makefile Makefile.bak + dh_clean + +install: install-stamp +install-stamp: build-stamp + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + install -m755 9wm debian/9wm/usr/bin + touch install-stamp + +binary-indep: build install +# We have nothing to do by default. + +binary-arch: build install + dh_testdir + dh_testroot + dh_installdocs + dh_installmenu + dh_installman + dh_installchangelogs + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary --- 9wm-1.2.orig/debian/changelog +++ 9wm-1.2/debian/changelog @@ -0,0 +1,97 @@ +9wm (1.2-9) unstable; urgency=low + + * Add Suggests: 9menu + * Update Standards-Version to 3.8.0 + * Update imake build-dep from xutils to xutils-dev (Closes: #485190) + + -- Decklin Foster Sat, 14 Jun 2008 15:46:19 -0400 + +9wm (1.2-8) unstable; urgency=low + + * Update ancient build deps: x-dev -> x11proto-core-dev. + * Don't thwart dh_strip in rules by always stripping. (Closes: #436252) + * Policy 3.7.2, debhelper 5. Nothing left in /usr/X11R6, thankfully. + + -- Decklin Foster Mon, 13 Aug 2007 00:58:19 -0400 + +9wm (1.2-7) unstable; urgency=low + + * Change build deps from xlibs-dev to x-dev, libx11-dev, libxext-dev. + * Include for getenv, rename getstate/setstate out of the way. + (Closes: #323153) + * Also add and includes to get rid of implicit + definition errors. + * Remove x-window-manager.1.gz alternative on purge. + * Bump Standards-Version to 3.6.2. + + -- Decklin Foster Mon, 15 Aug 2005 11:23:19 -0400 + +9wm (1.2-6) unstable; urgency=low + + * Rebuild to remove /usr/doc symlink (I thought I had killed this years + ago... oops.) + * Use debhelper v4 while I'm at it, update Standards-Version to 3.6.1. + * Fix DEB_BUILD_OPTIONS support. + * Fix package description in debian/control. + + -- Decklin Foster Mon, 22 Nov 2004 10:13:01 -0500 + +9wm (1.2-5) unstable; urgency=low + + * New maintainer. (Closes: #129955) + * Acknowledge NMU (Closes: #80859) + * Added menu file. + + -- Decklin Foster Sun, 27 Jan 2002 17:44:37 -0500 + +9wm (1.2-4.3) unstable; urgency=low + + * Non-maintainer upload. + * Standards-Version: 3.5.2: + - Build dependencies (closes: #70111). + - Support DEB_BUILD_OPTIONS. + - Move X11 binaries to FHS-compliant locations. + - Provide x-window-manager and the related alternatives + (closes: #53690). + * Moved to debhelper v3, since v1 is now deprecated. + + -- Colin Watson Sat, 3 Mar 2001 17:06:42 +0000 + +9wm (1.2-4.2) unstable; urgency=low + + * new maintainer + + -- Raul Miller Sat, 9 Oct 1999 08:28:05 -0400 + +9wm (1.2-4.1) unstable; urgency=low + + * Non-maintainer upload. + * Moved debian/rules to debhelper; changed other debian/* files little. + + -- Josip Rodin Fri, 18 Jun 1999 22:01:11 +0200 + +9wm (1.2-4) unstable; urgency=low + + * Orphaned the package. + + -- Joel Klecker Sun, 28 Dec 1997 20:30:00 -0800 + +9wm (1.2-3) unstable; urgency=low + + * New maintainer. + + -- Joel Klecker Thu, 18 Dec 1997 20:13:00 -0800 + +9wm (1.2-2) unstable; urgency=low + + * Compilied against libc6 (non-maintainer) + + -- Karl Sackett Mon, 3 Nov 1997 15:37:11 -0500 + +9wm (1.2-1) unstable; urgency=low + + * Lastest upstream release. + * Converted to new package standards. + * Maintainer address changed. + + -- Karl Sackett Thu, 10 Oct 1996 10:24:25 -0500 --- 9wm-1.2.orig/debian/9wm.copyright +++ 9wm-1.2/debian/9wm.copyright @@ -0,0 +1,23 @@ +This is the Debian Linux prepackaged version of 9wm. +This package was put together by Karl Sackett , +from sources obtained from: + + ftp://ftp.cs.su.oz.au/dhog/9wm/pre-9wm-1.2.shar + +Licence: + + 9wm is free software, and is Copyright (c) 1994-1996 by David Hogan. + Permission is granted to all sentient beings to use this software, + to make copies of it, and to distribute those copies, provided + that: + + (1) the copyright and licence notices are left intact + (2) the recipients are aware that it is free software + (3) any unapproved changes in functionality are either + (i) only distributed as patches + or (ii) distributed as a new program which is not called 9wm + and whose documentation gives credit where it is due + (4) the author is not held responsible for any defects + or shortcomings in the software, or damages caused by it. + + There is no warranty for this software. Have a nice day. --- 9wm-1.2.orig/debian/9wm.docs +++ 9wm-1.2/debian/9wm.docs @@ -0,0 +1 @@ +README --- 9wm-1.2.orig/debian/9wm.prerm +++ 9wm-1.2/debian/9wm.prerm @@ -0,0 +1,10 @@ +#!/bin/sh -e + +if [ "$1" = "remove" ]; then + update-alternatives --remove x-window-manager \ + /usr/bin/9wm + update-alternatives --remove x-window-manager.1.gz \ + /usr/share/man/man1/9wm.1.gz +fi + +#DEBHELPER# --- 9wm-1.2.orig/debian/9wm.dirs +++ 9wm-1.2/debian/9wm.dirs @@ -0,0 +1,2 @@ +usr/bin +usr/share/man/man1 --- 9wm-1.2.orig/debian/9wm.menu +++ 9wm-1.2/debian/9wm.menu @@ -0,0 +1,2 @@ +?package(9wm):needs="wm" section="Window Managers" \ + title="9wm" command="/usr/bin/9wm"