--- wmii-3.1.orig/debian/watch +++ wmii-3.1/debian/watch @@ -0,0 +1,4 @@ +# watch control file for uscan + +version=3 +http://www.wmii.de/download/wmii-(.*)\.tar\.gz --- wmii-3.1.orig/debian/wm +++ wmii-3.1/debian/wm @@ -0,0 +1 @@ +/usr/bin/wmii --- wmii-3.1.orig/debian/docs +++ wmii-3.1/debian/docs @@ -0,0 +1 @@ +README --- wmii-3.1.orig/debian/copyright +++ wmii-3.1/debian/copyright @@ -0,0 +1,65 @@ +This package was debianized by Daniel Baumann on +Fri, 7 Oct 2005 11:26:13 +0200. + +It was downloaded from . + +Upstream Author: Anselm R. Garbe + +License (libcext/strlcat.c, libcext/strlcopy.c): + + Copyright (C) 1998 Todd C. Miller + + Permission to use, copy, modify, and distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +License (libcext/strtonum.c): + + Copyright (C) 2004 Todd C. Miller + Copyright (C) 2004 Ted Unangst + + Permission to use, copy, modify, and distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + + THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + +License (everything else): + + Copyright (C) 2003-2006 Anselm R. Garbe + Copyright (C) 2005 Georg Neis + + MIT/X Consortium License + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --- wmii-3.1.orig/debian/patches/03-xrandr.dpatch +++ wmii-3.1/debian/patches/03-xrandr.dpatch @@ -0,0 +1,120 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +## 03-xrandr.dpatch by Evan Deaubl +## +## DP: Adds support for xrandr (Closes: #398900). + +@DPATCH@ + +diff -Naur wmii-3.1.orig/cmd/wm/event.c wmii-3.1/cmd/wm/event.c +--- wmii-3.1.orig/cmd/wm/event.c 2006-06-17 11:44:30.000000000 +0000 ++++ wmii-3.1/cmd/wm/event.c 2006-11-16 15:58:40.000000000 +0000 +@@ -10,6 +10,8 @@ + + #include "wm.h" + ++#include ++ + /* local functions */ + static void handle_buttonpress(XEvent * e); + static void handle_buttonrelease(XEvent * e); +@@ -23,6 +25,7 @@ + static void handle_maprequest(XEvent * e); + static void handle_propertynotify(XEvent * e); + static void handle_unmapnotify(XEvent * e); ++static void handle_rrscreenchangenotify(XEvent * e); + + void (*handler[LASTEvent]) (XEvent *); + +@@ -53,7 +56,9 @@ + XEvent ev; + while(XPending(dpy)) { /* main event loop */ + XNextEvent(dpy, &ev); +- if(handler[ev.type]) ++ if (xrandr_supported && ev.type == xrandr_event_base + 0) ++ handle_rrscreenchangenotify (&ev); ++ else if(handler[ev.type]) + (handler[ev.type]) (&ev); /* call handler */ + } + } +@@ -199,6 +204,25 @@ + } + + static void ++handle_rrscreenchangenotify(XEvent *e) ++{ ++ XRRScreenChangeNotifyEvent *ev = (XRRScreenChangeNotifyEvent *)e; ++ if(ev->window == root) { ++ XRRUpdateConfiguration(e); ++ if (ev->rotation == RR_Rotate_90 || ev->rotation == RR_Rotate_270) { ++ rect.width = ev->height; ++ rect.height = ev->width; ++ } ++ else { ++ rect.width = ev->width; ++ rect.height = ev->height; ++ } ++ arrange_views(); ++ resize_bar(); ++ } ++} ++ ++static void + handle_destroynotify(XEvent *e) + { + Client *c; +diff -Naur wmii-3.1.orig/cmd/wm/view.c wmii-3.1/cmd/wm/view.c +--- wmii-3.1.orig/cmd/wm/view.c 2006-06-17 11:44:30.000000000 +0000 ++++ wmii-3.1/cmd/wm/view.c 2006-11-16 15:58:40.000000000 +0000 +@@ -385,3 +385,13 @@ + else + update_view_bars(); + } ++ ++void ++arrange_views() ++{ ++ unsigned int i; ++ ++ for(i = 0; i < view.size; i++) { ++ arrange_view(view.data[i]); ++ } ++} +diff -Naur wmii-3.1.orig/cmd/wm/wm.c wmii-3.1/cmd/wm/wm.c +--- wmii-3.1.orig/cmd/wm/wm.c 2006-06-17 11:44:30.000000000 +0000 ++++ wmii-3.1/cmd/wm/wm.c 2006-11-16 15:58:40.000000000 +0000 +@@ -260,6 +260,11 @@ + XSelectInput(dpy, root, SubstructureRedirectMask | EnterWindowMask); + XSync(dpy, False); + ++ int dummy = 0; ++ xrandr_supported = XRRQueryExtension(dpy, ++ &xrandr_event_base, &dummy); ++ XRRSelectInput(dpy, root, 1); ++ + if(other_wm_running) { + fprintf(stderr, + "wmiiwm: another window manager is already running\n"); +diff -Naur wmii-3.1.orig/cmd/wm/wm.h wmii-3.1/cmd/wm/wm.h +--- wmii-3.1.orig/cmd/wm/wm.h 2006-06-17 11:44:30.000000000 +0000 ++++ wmii-3.1/cmd/wm/wm.h 2006-11-16 15:58:40.000000000 +0000 +@@ -197,6 +197,8 @@ + unsigned int valid_mask; + unsigned int num_lock_mask; + unsigned int sel_screen; ++int xrandr_event_base; ++int xrandr_supported; + + /* area.c */ + Area *create_area(View *t); +diff -Naur wmii-3.1.orig/config.mk wmii-3.1/config.mk +--- wmii-3.1.orig/config.mk 2006-06-17 11:44:29.000000000 +0000 ++++ wmii-3.1/config.mk 2006-11-16 15:58:40.000000000 +0000 +@@ -11,7 +11,7 @@ + VERSION = 3.1 + + # includes and libs +-LIBS = -L${PREFIX}/lib -L/usr/lib -lc -L${X11LIB} -lX11 ++LIBS = -L${PREFIX}/lib -L/usr/lib -lc -L${X11LIB} -lX11 -lXrandr + + # Linux/BSD + CFLAGS = -O3 -I. -I${PREFIX}/include -I/usr/include -I${X11INC} \ --- wmii-3.1.orig/debian/patches/00list +++ wmii-3.1/debian/patches/00list @@ -0,0 +1,3 @@ +01-x-terminal-emulator +02-fontset-fix +03-xrandr --- wmii-3.1.orig/debian/patches/01-x-terminal-emulator.dpatch +++ wmii-3.1/debian/patches/01-x-terminal-emulator.dpatch @@ -0,0 +1,19 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +## 01-x-terminal-emulator.dpatch by Daniel Baumann +## +## DP: Replaces xterm with x-terminal-emulator. + +@DPATCH@ + +diff -Naur wmii-3.1.orig/rc/wmiirc wmii-3.1/rc/wmiirc +--- wmii-3.1.orig/rc/wmiirc 2006-06-17 11:44:30.000000000 +0000 ++++ wmii-3.1/rc/wmiirc 2006-06-18 09:22:45.000000000 +0000 +@@ -149,7 +149,7 @@ + $MODKEY-[0-9]) + xwrite /ctl view `echo $1 | sed 's/.*-//'`;; + $MODKEY-Return) +- PATH="$OLD_PATH" xterm &;; ++ PATH="$OLD_PATH" x-terminal-emulator &;; + $MODKEY-Shift-$LEFT) + xwrite /view/sel/sel/ctl sendto prev;; + $MODKEY-Shift-$RIGHT) --- wmii-3.1.orig/debian/patches/02-fontset-fix.dpatch +++ wmii-3.1/debian/patches/02-fontset-fix.dpatch @@ -0,0 +1,23 @@ +#!/bin/sh /usr/share/dpatch/dpatch-run +## 02-fontset-fix.dpatch by Gonzalo Tornaria set) { + XFreeFontSet(dpy, font->set); + font->set = nil; + } ++ */ + } + if(font->set) { + XFontSetExtents *font_extents; --- wmii-3.1.orig/debian/icon/wmii.png.uu +++ wmii-3.1/debian/icon/wmii.png.uu @@ -0,0 +1,10 @@ +begin 644 wmii.png.uu +MB5!.1PT*&@H````-24A$4@```"`````0"`8```!W`'U9````!F)+1T0````` +M``#Y0[M_````"7!(67,```W7```-UP%"*)MX````!W1)344'U0P<$Q8(73L" +MU@```+E)1$%42,?EDS$*PD`01=^(A5A96-C9*5HIVN82.82'\`#>(0>PS25L +MDSJEB+6M[;?9A66P3$C0#Q]F>.SN,#,+'@6U([Y+RA)V!O(T1')*\=GP-[$(\<6SISO[W$KZ` +M9Y*O@&F(WT#C.C=ONP.EI'VT>["1=(P./V0X(QC<#F1F5KAY12T33/@]',CZ+V`#\]/,^%1\,$W`````$E%3D2N0F"" +` +end --- wmii-3.1.orig/debian/compat +++ wmii-3.1/debian/compat @@ -0,0 +1 @@ +4 --- wmii-3.1.orig/debian/control +++ wmii-3.1/debian/control @@ -0,0 +1,23 @@ +Source: wmii +Section: x11 +Priority: optional +Maintainer: Daniel Baumann +Build-Depends: debhelper (>= 4.0), dpatch, libxrandr-dev, libx11-dev, sharutils +Standards-Version: 3.7.2 + +Package: wmii +Architecture: any +Depends: ${shlibs:Depends} +Conflicts: wmii2 +Replaces: wmii2 +Recommends: wmii-doc +Provides: x-window-manager +Description: lightweight tabbed and tiled X11 window manager, version 3 + wmii is a dynamic window manager for X11, which is highly customizable and + usable with keyboard and mouse. It supports conventional, tabbed and tiled + window management with low memory usage. It is highly modularized and uses an + inter-process communication interface which is oriented on the 9p protocol of + plan9. + . + This package contains version 3 of the window manager, wmii2 contains version + 2. --- wmii-3.1.orig/debian/rules +++ wmii-3.1/debian/rules @@ -0,0 +1,73 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/dpatch/dpatch.make + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +build: build-stamp +build-stamp: patch + dh_testdir + + # Building package + CFLAGS="$(CFLAGS)" $(MAKE) PREFIX=/usr CONFPREFIX=/etc/X11 MANPREFIX=/usr/share/man + + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp + + # Cleaning package + -$(MAKE) clean + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Installing package + $(MAKE) install DESTDIR=$(CURDIR)/debian/wmii PREFIX=/usr CONFPREFIX=/etc/X11 MANPREFIX=/usr/share/man + + # Installing desktop file + install -D -m 0644 debian/desktop/wmii debian/wmii/usr/share/xsessions/wmii.desktop + + # Installing icon file + install -d -m 0755 debian/wmii/usr/share/icons + uudecode debian/icon/wmii.png.uu -o debian/wmii/usr/share/icons/wmii.png + +binary-indep: build install + +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installexamples + dh_install + dh_installmenu + dh_installwm + dh_link + 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 install --- wmii-3.1.orig/debian/menu +++ wmii-3.1/debian/menu @@ -0,0 +1,3 @@ +?package(wmii):needs="wm" section="WindowManagers"\ + title="Wmii" longtitle="Window manager improved 3" \ + command="/usr/bin/wmii" --- wmii-3.1.orig/debian/desktop/wmii +++ wmii-3.1/debian/desktop/wmii @@ -0,0 +1,7 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Wmii +Comment=Window manager improved 3 +Exec=wmii +Icon=wmii.png +Type=XSession --- wmii-3.1.orig/debian/changelog +++ wmii-3.1/debian/changelog @@ -0,0 +1,69 @@ +wmii (3.1-5) unstable; urgency=medium + + * Added patch from Evan Deaubl to add support for xrandr + (Closes: #398900). + + -- Daniel Baumann Thu, 16 Nov 2006 17:04:00 +0100 + +wmii (3.1-4) unstable; urgency=medium + + * Updated upstream homepage (Closes: #395005). + + -- Daniel Baumann Sun, 29 Oct 2006 17:05:00 +0200 + +wmii (3.1-3) unstable; urgency=medium + + * Applied patch from Gonzalo Tornaria to fix fontset + problem with UTF (Closes: #394781). + + -- Daniel Baumann Mon, 23 Oct 2006 18:12:00 +0200 + +wmii (3.1-2) unstable; urgency=low + + * New email address. + + -- Daniel Baumann Tue, 4 Jul 2006 23:45:00 +0200 + +wmii (3.1-1) unstable; urgency=low + + * New upstream release. + + -- Daniel Baumann Sun, 18 Jun 2006 11:19:00 +0200 + +wmii (3.0-1) unstable; urgency=low + + * New upstream release. + + -- Daniel Baumann Fri, 19 May 2006 00:00:00 -0500 + +wmii (2.5.2-1) unstable; urgency=low + + * New upstream release. + * Adjusted confdir path. + * Adjusted 9base path in examples. + + -- Daniel Baumann Sat, 21 Jan 2006 01:14:00 +0100 + +wmii (2.5.1-1) unstable; urgency=low + + * New upstream release. + * Removed now obsolete binary-package python2.3-libixp. + * Removed conflict to wmifs, upstream did rename the binary accordingly. + * Added icon and desktop entry for login-session managers (Closes: #345390). + + -- Daniel Baumann Sat, 14 Jan 2006 14:42:00 +0100 + +wmii (2-2) unstable; urgency=low + + * Added temporary conflict to wmifs (Closes: #335446, #338033). I will + rename wmifs in the next revision, this conflict is just a quick fix. + * Modifing default configuration: + - using x-terminal-emulator instead of xterm (Closes: #334017). + + -- Daniel Baumann Thu, 3 Nov 2005 22:58:00 +0100 + +wmii (2-1) unstable; urgency=low + + * Initial release (Closes: #311567). + + -- Daniel Baumann Fri, 7 Oct 2005 11:26:13 +0200 --- wmii-3.1.orig/debian/examples +++ wmii-3.1/debian/examples @@ -0,0 +1 @@ +extra/*