--- wmii-3.6+debian.orig/.hg_archival.txt +++ wmii-3.6+debian/.hg_archival.txt @@ -0,0 +1,2 @@ +repo: 6a43be06dd04698b2db88a0a3bc14d6f22341270 +node: 2f3cf6cd70ebbd89231e3c852a7684ab1d1856c7 --- wmii-3.6+debian.orig/.hgtags +++ wmii-3.6+debian/.hgtags @@ -0,0 +1,19 @@ +ed4e359f174e83e28c1a32cde325932214ba9dd6 rc4 +feae5fe647febf11d832eb1118e3daa451ca63bd rc5 +27ed4a025123f834b65cd263b054ed463d13394c rc6 +f503db141bb3eedbf11bb8b2536478ad4b6047cf wmii-3 +decbb77e6bcc54be6ba70e61e4c8d424e1b31ad1 snap +fc6827a3e08e326f668c16bc4858367d4cbb744a snap +cdd67eb3a311e58f34ee4674ed99941054254588 snap +54c9b6b874992021417158ea9e7b2b062080703b tagbars +713381a0f5fcf97290256c3a76b992bd10dc0c7c 3.5-rc1 +ae6f371f92181de17471115ab2f6d88081c5e272 3.5-rc2 +18e79d2fd2dc08b02d3afc0f1912987a16979a67 wmii-3.5 +35e78ed93ee4e2949ec4ce293671ed246a1e8a27 3.5.1 +1cecdaf9309d1ad0678f61cb88424007969da15f snap +f66f9cdc468a83824a02f2b73372299dc7d74882 3.6-rc1 +178946176a9fe3b83962315552b0743decd4c332 3.6-rc2 +2a5862e7cfb326d96f29a6930f179a0861774a2d snap +3a6f482d7c506d20f94fdf732ad1150e202a441e snap20070218 +e9e7dddcacffa58d34820579fc6456403a793d54 snap +e9e7dddcacffa58d34820579fc6456403a793d54 snap20070303 --- wmii-3.6+debian.orig/debian/rules +++ wmii-3.6+debian/debian/rules @@ -0,0 +1,17 @@ +#!/usr/bin/make -f + +%: + dh ${@} --with quilt + +override_dh_auto_build: + CFLAGS="$(CFLAGS)" $(MAKE) PREFIX=/usr ETC=/etc/X11 LIBIXP=/usr/lib/libixp.a STATIC="" + +override_dh_auto_install: + $(MAKE) PREFIX=$(CURDIR)/debian/wmii/usr ETC=$(CURDIR)/debian/wmii/etc/X11 LIBIXP=/usr/lib/libixp.a install + + mkdir -p debian/wmii/usr/share/icons + uudecode debian/icons/wmii.png.uu -o debian/wmii/usr/share/icons/wmii.png + + # Removing useless files + rmdir debian/wmii/usr/include + rmdir debian/wmii/usr/lib --- wmii-3.6+debian.orig/debian/compat +++ wmii-3.6+debian/debian/compat @@ -0,0 +1 @@ +7 --- wmii-3.6+debian.orig/debian/wmii.wm +++ wmii-3.6+debian/debian/wmii.wm @@ -0,0 +1 @@ +/usr/bin/wmii --- wmii-3.6+debian.orig/debian/control +++ wmii-3.6+debian/debian/control @@ -0,0 +1,29 @@ +Source: wmii +Section: x11 +Priority: optional +Maintainer: Debian Suckless Maintainers +Uploaders: Daniel Baumann +Build-Depends: + debhelper (>= 7), libx11-dev, libxext-dev, libixp (>= 0.4), libxt-dev, + sharutils, quilt +Standards-Version: 3.8.3 +Homepage: http://www.suckless.org/ +Vcs-Browser: http://git.debian-maintainers.org/?p=suckless/wmii.git +Vcs-Git: git://git.debian-maintainers.org/git/suckless/wmii.git + +Package: wmii +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends}, dwm-tools +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.6+debian.orig/debian/wmii.menu +++ wmii-3.6+debian/debian/wmii.menu @@ -0,0 +1,4 @@ +?package(wmii):needs="wm" section="Window Managers"\ + title="Wmii" longtitle="Window manager improved 3"\ + description="wmii is a dynamic window manager for X11, which is highly customizable and usable with keyboard and mouse."\ + command="/usr/bin/wmii" --- wmii-3.6+debian.orig/debian/wmii.docs +++ wmii-3.6+debian/debian/wmii.docs @@ -0,0 +1 @@ +README --- wmii-3.6+debian.orig/debian/wmii.install +++ wmii-3.6+debian/debian/wmii.install @@ -0,0 +1 @@ +debian/desktop/* /usr/share/xsessions --- wmii-3.6+debian.orig/debian/changelog +++ wmii-3.6+debian/debian/changelog @@ -0,0 +1,221 @@ +wmii (3.6+debian-7) unstable; urgency=low + + * Updating maintainer field. + * Updating vcs fields. + * Updating package to standards version 3.8.3. + * Sorting depends. + * Correcting desktop file location. + + -- Daniel Baumann Thu, 20 Aug 2009 20:31:37 +0200 + +wmii (3.6+debian-6) unstable; urgency=low + + * Updating package to standards version 3.8.2. + * Using correct rfc-2822 date formats in changelog. + * Prefixing debhelper files with package name. + * Updating year in copyright file. + * Adding description field in menu file. + * Using quilt rather than dpatch. + * Minimizing rules file. + + -- Daniel Baumann Tue, 04 Aug 2009 16:09:38 +0200 + +wmii (3.6+debian-5) unstable; urgency=low + + * Applying patch from James Westby to define + IXP_NEEDAPI to 88, which is the required ixp API (Closes: #511954). + + -- Daniel Baumann Sun, 03 May 2009 10:01:00 +0200 + +wmii (3.6+debian-4) unstable; urgency=low + + * Bumped to new policy. + * Updated menu file to new policy. + * Removing empty directories. + * Added patch to complete manpage headers. + + -- Daniel Baumann Sun, 23 Dec 2007 20:52:00 +0100 + +wmii (3.6+debian-3) unstable; urgency=low + + * Replaced not available fixed variant with plain 'fixed' font. + + -- Daniel Baumann Fri, 23 Nov 2007 13:51:00 +0100 + +wmii (3.6+debian-2) unstable; urgency=low + + * Removing -std=c99 from CFLAGS, thanks to Dann Frazier + (Closes: #452015). + + -- Daniel Baumann Mon, 19 Nov 2007 21:25:00 +0100 + +wmii (3.6+debian-1) unstable; urgency=low + + * New upstream release. + * Rebuild upstream tarball without conflicting debian directory. + + -- Daniel Baumann Sun, 18 Nov 2007 17:39:00 +0100 + +wmii (3.6~rc2+20070518-3) unstable; urgency=medium + + * Added libxext-dev to build-depends. + + -- Daniel Baumann Tue, 04 Sep 2007 23:23:00 +0200 + +wmii (3.6~rc2+20070518-2) unstable; urgency=medium + + [ Don Armstrong ] + * Fix wmiirc and wmiiloop.sh to properly populate keys and the commands + to handle them (Closes: #423521) + + -- Daniel Baumann Thu, 12 Jul 2007 11:37:00 +0200 + +wmii (3.6~rc2+20070518-1) unstable; urgency=low + + * New upstream snapshot. + + -- Daniel Baumann Fri, 18 May 2007 09:08:00 +0200 + +wmii (3.6~rc2+20070501-2) unstable; urgency=low + + * Added lintian override. + * Do not compile wmiir statically. + + -- Daniel Baumann Tue, 15 May 2007 14:52:00 +0200 + +wmii (3.6~rc2+20070501-1) unstable; urgency=low + + * New upstream snapshot. + * Minor cleanups. + + -- Daniel Baumann Tue, 01 May 2007 09:10:00 +0200 + +wmii (3.6~rc2+20070329-3) unstable; urgency=low + + * Rebuild against fixed debhelper, see #420158 (Closes: #420119, #420146). + + -- Daniel Baumann Sat, 21 Apr 2007 07:33:00 +0200 + +wmii (3.6~rc2+20070329-2) unstable; urgency=low + + * Fixed ETC in rules (Closes: #418003). + + -- Daniel Baumann Thu, 19 Apr 2007 10:28:00 +0200 + +wmii (3.6~rc2+20070329-1) unstable; urgency=low + + * New upstream snapshot: + - Fixes problem with libixp (Closes: #416170). + - Temporarily using and shipping embedded libixp for this snapshot only, + this is not related to #416170. + * Minor cleanups. + + -- Daniel Baumann Thu, 05 Apr 2007 17:01:00 +0200 + +wmii (3.6~rc2-1) unstable; urgency=low + + * New upstream release. + + -- Daniel Baumann Wed, 07 Feb 2007 13:09:00 +0100 + +wmii (3.6~rc1-1) unstable; urgency=low + + * New upstream release. + + -- Daniel Baumann Tue, 06 Feb 2007 16:47:00 +0100 + +wmii (3.5.1+20070202-1) unstable; urgency=low + + * New upstream snapshot. + + -- Daniel Baumann Sat, 03 Feb 2007 10:32:00 +0100 + +wmii (3.5.1+20070116-1) unstable; urgency=medium + + * New upstream snapshot: + - fixes bug with tags. + * Removed libxrand-dev build-depends, xrand patch was not ported to wmii 3.5. + + -- Daniel Baumann Thu, 18 Jan 2007 20:16:00 +0100 + +wmii (3.5.1-2) unstable; urgency=low + + * Triggering rebuild (Closes: #405647). + + -- Daniel Baumann Mon, 15 Jan 2007 18:46:00 +0100 + +wmii (3.5.1-1) unstable; urgency=low + + * New upstream release. + + -- Daniel Baumann Tue, 02 Jan 2007 21:05:00 +0100 + +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, 04 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, 03 Nov 2005 22:58:00 +0100 + +wmii (2-1) unstable; urgency=low + + * Initial release (Closes: #311567). + + -- Daniel Baumann Fri, 07 Oct 2005 11:26:13 +0200 --- wmii-3.6+debian.orig/debian/copyright +++ wmii-3.6+debian/debian/copyright @@ -0,0 +1,47 @@ +Author: Kris Maglione +Download: http://wmii.suckless.org/ + +Files: * +Copyright: + (C) 2006-2007 Kris Maglione + (C) 2003-2006 Anselm R. Garbe + (C) 2005 Georg Neis +License: MIT + 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. + +Files: debian/* +Copyright: (C) 2005-2009 Daniel Baumann +License: MIT + 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.6+debian.orig/debian/wmii.lintian-overrides +++ wmii-3.6+debian/debian/wmii.lintian-overrides @@ -0,0 +1 @@ +wmii binary: unusual-interpreter ./etc/X11/wmii-3.5/rc.wmii #!wmii9rc --- wmii-3.6+debian.orig/debian/patches/05-ixp-api.patch +++ wmii-3.6+debian/debian/patches/05-ixp-api.patch @@ -0,0 +1,27 @@ +Author: James Westby +Description: + Adding patch define IXP_NEEDAPI to 88 so that we get the ixp API that is + required. File re-written in hg upstream to use the new API (Closes: #511954). + +diff -Naurp wmii.orig/cmd/wmii/dat.h wmii/cmd/wmii/dat.h +--- wmii.orig/cmd/wmii/dat.h 2009-08-04 10:37:35.000000000 +0000 ++++ wmii/cmd/wmii/dat.h 2009-08-04 13:58:48.000000000 +0000 +@@ -5,6 +5,7 @@ + #define _XOPEN_SOURCE 600 + #define IXP_P9_STRUCTS + #define IXP_NO_P9_ ++#define IXP_NEEDAPI 88 + #include + #include + #include +diff -Naurp wmii.orig/cmd/wmiir.c wmii/cmd/wmiir.c +--- wmii.orig/cmd/wmiir.c 2009-08-04 10:37:35.000000000 +0000 ++++ wmii/cmd/wmiir.c 2009-08-04 13:58:48.000000000 +0000 +@@ -3,6 +3,7 @@ + */ + #define IXP_NO_P9_ + #define IXP_P9_STRUCTS ++#define IXP_NEEDAPI 88 + #include + #include + #include --- wmii-3.6+debian.orig/debian/patches/04-manpage.patch +++ wmii-3.6+debian/debian/patches/04-manpage.patch @@ -0,0 +1,27 @@ +Author: Daniel Baumann +Description: Completes manpage headers. + +diff -Naurp wmii.orig/man/wmii.1 wmii/man/wmii.1 +--- wmii.orig/man/wmii.1 2009-08-04 10:37:35.000000000 +0000 ++++ wmii/man/wmii.1 2009-08-04 13:58:37.000000000 +0000 +@@ -12,7 +12,7 @@ + .. + .TH "WMII" "1" "03 July 2007" "" "" + .SH NAME +-wmii\-VERSION ++wmii\-VERSION \- lightweight tabbed and tiled X11 window manager + .PP + .SH SYNOPSIS + wmii +diff -Naurp wmii.orig/man/wmiiloop.1 wmii/man/wmiiloop.1 +--- wmii.orig/man/wmiiloop.1 2009-08-04 10:37:35.000000000 +0000 ++++ wmii/man/wmiiloop.1 2009-08-04 13:58:37.000000000 +0000 +@@ -13,7 +13,7 @@ + .TH "WMIILOOP" "1" "25 May 2007" "" "" + .SH NAME + +-wmiiloop\-VERSION ++wmiiloop\-VERSION \- tool for easy wmii event handling + .PP + .SH SYNOPSIS + --- wmii-3.6+debian.orig/debian/patches/01-x-terminal-emulator.patch +++ wmii-3.6+debian/debian/patches/01-x-terminal-emulator.patch @@ -0,0 +1,15 @@ +Author: Daniel Baumann +Description: Replaces xterm with x-terminal-emulator. + +diff -Naurp wmii.orig/rc/wmiirc.sh wmii/rc/wmiirc.sh +--- wmii.orig/rc/wmiirc.sh 2009-08-04 10:37:35.000000000 +0000 ++++ wmii/rc/wmiirc.sh 2009-08-04 13:58:05.000000000 +0000 +@@ -18,7 +18,7 @@ WMII_FONT='-*-fixed-medium-r-*-*-13-*-*- + set -- $(echo $WMII_NORMCOLORS $WMII_FOCUSCOLORS) + WMII_MENU="dmenu -b -fn '$WMII_FONT' -nf '$1' -nb '$2' -sf '$4' -sb '$5'" + WMII_9MENU="wmii9menu -font '$WMII_FONT' -nf '$1' -nb '$2' -sf '$4' -sb '$5' -br '$6'" +-WMII_TERM="xterm" ++WMII_TERM="x-terminal-emulator" + + # Column Rules + wmiir write /colrules < +Description: Replaces not available fixed variant with plain 'fixed' font. + +diff -Naurp wmii.orig/cmd/wmii/dat.h wmii/cmd/wmii/dat.h +--- wmii.orig/cmd/wmii/dat.h 2009-08-04 10:37:35.000000000 +0000 ++++ wmii/cmd/wmii/dat.h 2009-08-04 13:58:28.000000000 +0000 +@@ -13,7 +13,7 @@ + #include + #include "x11.h" + +-#define FONT "-*-fixed-medium-r-*-*-13-*-*-*-*-*-*-*" ++#define FONT "fixed" + #define FOCUSCOLORS "#ffffff #335577 #447799" + #define NORMCOLORS "#222222 #eeeeee #666666" + +diff -Naurp wmii.orig/rc/rc.wmii.rc wmii/rc/rc.wmii.rc +--- wmii.orig/rc/rc.wmii.rc 2009-08-04 10:37:35.000000000 +0000 ++++ wmii/rc/rc.wmii.rc 2009-08-04 13:58:28.000000000 +0000 +@@ -36,7 +36,7 @@ DOWN=j + LEFT=h + RIGHT=l + +-WMII_FONT='-*-fixed-medium-r-*-*-13-*-*-*-*-*-*-*' ++WMII_FONT='fixed' + WMII_NORMCOLORS=('#888888' '#222222' '#333333') + WMII_FOCUSCOLORS=('#ffffff' '#285577' '#4C7899') + WMII_BACKGROUND='#333333' +diff -Naurp wmii.orig/rc/wmiirc.sh wmii/rc/wmiirc.sh +--- wmii.orig/rc/wmiirc.sh 2009-08-04 10:37:35.000000000 +0000 ++++ wmii/rc/wmiirc.sh 2009-08-04 13:58:28.000000000 +0000 +@@ -13,7 +13,7 @@ WMII_NORMCOLORS='#888888 #222222 #333333 + WMII_FOCUSCOLORS='#ffffff #285577 #4c7899' + + WMII_BACKGROUND='#333333' +-WMII_FONT='-*-fixed-medium-r-*-*-13-*-*-*-*-*-*-*' ++WMII_FONT='fixed' + + set -- $(echo $WMII_NORMCOLORS $WMII_FOCUSCOLORS) + WMII_MENU="dmenu -b -fn '$WMII_FONT' -nf '$1' -nb '$2' -sf '$4' -sb '$5'" --- wmii-3.6+debian.orig/debian/patches/02-cflags.patch +++ wmii-3.6+debian/debian/patches/02-cflags.patch @@ -0,0 +1,12 @@ +Author: Dann Frazier +Description: Removing -std=c99 from CFLAGS (Closes: #452015). + +diff -Naurp wmii.orig/mk/gcc.mk wmii/mk/gcc.mk +--- wmii.orig/mk/gcc.mk 2009-08-04 10:37:35.000000000 +0000 ++++ wmii/mk/gcc.mk 2009-08-04 13:58:18.000000000 +0000 +@@ -1,5 +1,4 @@ + CFLAGS += \ +- -std=c99 \ + -pipe \ + -Wall \ + -Wno-parentheses \ --- wmii-3.6+debian.orig/debian/patches/series +++ wmii-3.6+debian/debian/patches/series @@ -0,0 +1,5 @@ +01-x-terminal-emulator.patch +02-cflags.patch +03-font.patch +04-manpage.patch +05-ixp-api.patch --- wmii-3.6+debian.orig/debian/icons/wmii.png.uu +++ wmii-3.6+debian/debian/icons/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.6+debian.orig/debian/desktop/wmii.desktop +++ wmii-3.6+debian/debian/desktop/wmii.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Wmii +Comment=Window manager improved 3 +Exec=wmii +Icon=wmii.png +Type=XSession