X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=skippy-debian.patch;fp=skippy-debian.patch;h=0000000000000000000000000000000000000000;hb=18dc514cab362f73c916a59f449a4134938e3f52;hp=b91c75d646115999d2145e63e0b50408a187fb96;hpb=c6e2f3a0576dfcb93d45328a40b3659aefc0473b;p=skippy-xd diff --git a/skippy-debian.patch b/skippy-debian.patch deleted file mode 100644 index b91c75d..0000000 --- a/skippy-debian.patch +++ /dev/null @@ -1,475 +0,0 @@ ---- skippy-0.5.1rc1.orig/debian/docs -+++ skippy-0.5.1rc1/debian/docs -@@ -0,0 +1 @@ -+debian/README.Debian ---- skippy-0.5.1rc1.orig/debian/menu -+++ skippy-0.5.1rc1/debian/menu -@@ -0,0 +1,2 @@ -+?package(skippy):needs="X11" section="Apps/Tools"\ -+ title="skippy" command="/usr/bin/skippy" ---- skippy-0.5.1rc1.orig/debian/control -+++ skippy-0.5.1rc1/debian/control -@@ -0,0 +1,20 @@ -+Source: skippy -+Section: x11 -+Priority: optional -+Maintainer: Niv Altivanik (Debian Packages) -+Build-Depends: debhelper (>= 4.1.0), libxft-dev, libimlib2-dev, libxmu-dev, cdbs, libpcre3-dev -+Standards-Version: 3.6.1 -+ -+Package: skippy -+Architecture: any -+Depends: ${shlibs:Depends} -+Description: full-screen X11 task/window switcher, similar to OSX Expose -+ Skippy provides an alternative to taskbars or regular task-switchers, -+ by showing full-screen view of all the open windows on the current -+ desktop. You can navigate among the windows and select using the -+ mouse or keyboard. Skippy will work with any NETWM or GNOME WM Specs -+ compliant window-manager. -+ . -+ If you are using X.org's Xserver with the XDamage, Xcomposite, and -+ XFixes extensions, you probably want skippy-xd instead. -+ (they will be packaged in debian when X.org is available). ---- skippy-0.5.1rc1.orig/debian/rules -+++ skippy-0.5.1rc1/debian/rules -@@ -0,0 +1,22 @@ -+#!/usr/bin/make -f -+# -*- makefile -*- -+ -+include /usr/share/cdbs/1/rules/debhelper.mk -+include /usr/share/cdbs/1/class/makefile.mk -+include /usr/share/cdbs/1/rules/simple-patchsys.mk -+ -+DEB_MAKE_INVOKE := CFLAGS="$(CFLAGS)" make -+DEB_MAKE_CLEAN_TARGET := clean -+DEB_MAKE_BUILD_TARGET := all -+DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/skippy/ PREFIX=/usr/ -+DEB_INSTALL_MANPAGES_skippy := debian/skippyrc.1 -+ -+install/skippy:: -+ mkdir -p $(CURDIR)/debian/skippy/etc/X11/skippy/ -+ mkdir -p $(CURDIR)/debian/skippy/usr/share/doc/skippy/ -+ -+ cp -a $(CURDIR)/skippyrc-default \ -+ $(CURDIR)/debian/skippy/etc/X11/skippy/skippyrc -+ cp -a $(CURDIR)/debian/examples \ -+ $(CURDIR)/debian/skippy/usr/share/doc/skippy -+ cat $(CURDIR)/skippyrc-default >> $(CURDIR)/debian/skippy/usr/share/doc/skippy/examples/skippyrc-default ---- skippy-0.5.1rc1.orig/debian/watch -+++ skippy-0.5.1rc1/debian/watch -@@ -0,0 +1,2 @@ -+version=2 -+http://thegraveyard.org/files/skippy-([0-9]+.*)\.tar\.bz2 ---- skippy-0.5.1rc1.orig/debian/changelog -+++ skippy-0.5.1rc1/debian/changelog -@@ -0,0 +1,53 @@ -+skippy (0.5.1rc1-1) unstable; urgency=low -+ -+ * The "All Bugs Free Release". -+ * New Upstream Release. -+ . ported debian/patches/10_config_file_overflow_fix.patch to the new code. -+ * Fixed the watch file. -+ * Bug fix: "skippy's postinst should not echo", thanks to Michael Urman -+ (Closes: #302091). -+ . removed the skippy.postinst notification, -+ ... let's hope the user will find the doc. -+ * Bug fix: "~/.skippyrc not loaded", thanks to Nick Hastings -+ (Closes: #302131). -+ . my patch was broken, this bug in fact was a missplaced printf. -+ -+ -- Niv Altivanik (Debian Packages) Wed, 30 Mar 2005 15:11:45 +0200 -+ -+skippy (0.5.0-3) unstable; urgency=low -+ -+ * The "Documentation Bugs Free Release". -+ * Bug fix: "README.Debian mistake: XSession.d instead of Xsession.d", -+ thanks to Adam Porter (Closes: #302055). -+ . fixed the (last ?) typo in README.Debian. -+ * Added a block to README.Debian about single user use -+ -+ -- Niv Altivanik (Debian Packages) Wed, 30 Mar 2005 01:03:56 +0200 -+ -+skippy (0.5.0-2) unstable; urgency=low -+ -+ * Added a note about auto-startup of skippy to Readme.Debian, skippy.postinst -+ and created the /usr/share/doc/skippy/examples directory. -+ (thanks to Steve Kemp). -+ * Added 11_find_skippyrc_in_etc.patch and copied the default skippyrc there. -+ (thanks to David Moreno Garza). -+ * Bug fix: "skippy: man page issues", thanks to Andre Lehovich and Zack Cerza -+ (Closes: #301581). -+ . the default skippyrc is now on the right place. -+ . fixed typo, removed useless SYNOPSYS field -+ * Bug fix: "Error:BadAccess (attempt to access private resource -+ denied); on startup", thanks to Wesley J. Landaker (Closes: #300991). -+ . Added a note on the README file. -+ -+ -- Niv Altivanik (Debian Packages) Sun, 27 Mar 2005 13:26:00 +0200 -+ -+skippy (0.5.0-1) unstable; urgency=low -+ -+ * Initial Release. -+ * Fixed typos and first packages stupidity, thanks to Steve Greenland. -+ . .skippyrc manpage. -+ . Description: field. -+ * Moved package to cdbs -+ * Uploaded to Debian (closes: #259096) -+ -+ -- Niv Altivanik (Debian Packages) Sun, 30 Jan 2005 01:42:41 +0100 ---- skippy-0.5.1rc1.orig/debian/manpages -+++ skippy-0.5.1rc1/debian/manpages -@@ -0,0 +1,2 @@ -+debian/skippy.1 -+debian/skippyrc.1 ---- skippy-0.5.1rc1.orig/debian/compat -+++ skippy-0.5.1rc1/debian/compat -@@ -0,0 +1 @@ -+4 ---- skippy-0.5.1rc1.orig/debian/skippy.1 -+++ skippy-0.5.1rc1/debian/skippy.1 -@@ -0,0 +1,75 @@ -+.\" Hey, EMACS: -*- nroff -*- -+.\" -+.\" -+.\" This manpage is free software; you can redistribute it and/or modify -+.\" it under the terms of the GNU General Public License as published by -+.\" the Free Software Foundation; version 2 dated June, 1991. -+.\" -+.\" This package is distributed in the hope that it will be useful, -+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of -+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+.\" GNU General Public License for more details. -+.\" -+.\" You should have received a copy of the GNU General Public License -+.\" along with this package; if not, write to the Free Software -+.\" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -+.\" 02111-1307, USA. -+.\" -+.\" On Debian systems, the complete text of the GNU General Public -+.\" License can be found in the file `/usr/share/common-licenses/GPL'. -+.\" -+.\" -+.\" First parameter, NAME, should be all caps -+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -+.\" other parameters are allowed: see man(7), man(1) -+.TH SKIPPY 1 "December 6, 2004" -+.\" Please adjust this date whenever revising the manpage. -+.\" -+.\" Some roff macros, for reference: -+.\" .nh disable hyphenation -+.\" .hy enable hyphenation -+.\" .ad l left justify -+.\" .ad b justify to both left and right margins -+.\" .nf disable filling -+.\" .fi enable filling -+.\" .br insert line break -+.\" .sp insert n+1 empty lines -+.\" for manpage-specific macros, see man(7) -+.SH NAME -+skippy \- Full Screen Task Switcher for X11 -+.SH SYNOPSIS -+.B skippy -+.SH DESCRIPTION -+.\" TeX users may be more comfortable with the \fB\fP and -+.\" \fI\fP escape sequences to invode bold face and italics, -+.\" respectively. -+\fBskippy\fP is a program that allows you to manage your windows in an -+efficient way. It is highly inspired by Apple Expose. -+.SH NOTE -+If you are using the X.org X server, there is a version of skippy, -+called skippy-xd that makes use of the new XDamage, XComposite and -+XFixes extensions. I suggest you use the xd version instead. -+ -+Please note that skippy won't launch when another application is using -+X_GrabKey ( such as xbindkeys ), please see the README.Debian file for -+more informations. -+ -+.SH USAGE -+Press the hotkey (the default hotkey is F11). Then choose a window -+with either the keyboard (you can use up, down, left and right to -+navigate) or the mouse (just hover over a window) and activate it by -+pressing the left mouse button or the return or spacebar key. -+ -+.SH FILES -+.BR ~/.skippyrc -+.BR /etc/X11/skippy/skippyrc -+ -+.SH SEE ALSO -+.BR skippyrc (1), -+.BR skippy-xd (1) -+ -+.SH AUTHOR -+skippy was written by Hyriand . -+.PP -+This manual page was written by Niv ALTIVANIK , -+for the Debian project (but may be used by others). ---- skippy-0.5.1rc1.orig/debian/README.Debian -+++ skippy-0.5.1rc1/debian/README.Debian -@@ -0,0 +1,25 @@ -+If you wish to have skippy automatically launched at X startup for all -+your users please add the /usr/share/doc/skippy/examples/99Skippy file -+to your /etc/X11/Xsession.d/ -+ -+If you only wish to have skippy loaded for single users, please add -+skippy & -+to your ~/.xsession ( for *dm based logins ) and ~/.xinitrc ( for startx -+based X logins ) -+ -+-- -+ -+Warning: skippy won't work in conjunction of others x-key-grabbing application, -+such as xbindkeys for example -+ -+If you get this error: -+ -+X Error of failed request: BadAccess (attempt to access private resource denied) -+ Major opcode of failed request: 33 (X_GrabKey) -+ Serial number of failed request: 90 -+ Current serial number in output stream: 90 -+ -+look for key-grabbing applications, and please report me if some package -+auto-launches at X startup per default and breaks skippy. -+ -+ -- Niv Altivanik (Debian Packages) , Wed Mar 30 01:03:51 2005 ---- skippy-0.5.1rc1.orig/debian/patches/10_config_file_overflow_fix.patch -+++ skippy-0.5.1rc1/debian/patches/10_config_file_overflow_fix.patch -@@ -0,0 +1,70 @@ -+--- skippy-0.5.1rc1/config.c 2004-09-13 19:41:37.000000000 +0200 -++++ skippy-0.5.1rc1-fixed/config.c 2005-03-30 15:17:18.000000000 +0200 -+@@ -70,14 +70,16 @@ -+ } -+ -+ static dlist * -+-config_parse(char *config) -++config_parse(char *config, long flen) -+ { -+ regex_t re_section, re_empty, re_entry; -+ regmatch_t matches[5]; -+- char line[8192], *section = 0; -++ char *line, *section = 0; -+ int ix = 0, l_ix = 0; -+ dlist *new_config = 0; -+ -++ line = (char *) malloc(sizeof(char)*flen); -++ -+ regcomp(&re_section, "^[[:space:]]*\\[[[:space:]]*([[:alnum:]]*?)[[:space:]]*\\][[:space:]]*$", REG_EXTENDED); -+ regcomp(&re_empty, "^[[:space:]]*#|^[[:space:]]*$", REG_EXTENDED); -+ regcomp(&re_entry, "^[[:space:]]*([[:alnum:]]+)[[:space:]]*=[[:space:]]*(.*?)[[:space:]]*$", REG_EXTENDED); -+@@ -117,24 +119,28 @@ -+ regfree(&re_empty); -+ regfree(&re_entry); -+ -++ free(line); -++ -+ return new_config; -+ } -+ -+ #else /* Use PCRE regexps */ -+ -+ static dlist * -+-config_parse(char *config) -++config_parse(char *config, long flen) -+ { -+ pcre * re_section, * re_empty, * re_entry; -+ const char * pcre_err; -+ int pcre_err_pos; -+ int ovec[30], matches; -+ -+- char line[8192]; -++ char *line; -+ const char *section = 0; -+ int ix = 0, l_ix = 0; -+ -+ dlist * new_config = 0; -++ -++ line = (char *) malloc(sizeof(char)*flen); -+ -+ re_section = pcre_compile("^\\s*\\[\\s*(\\w*)\\s*\\]\\s*$", 0, &pcre_err, &pcre_err_pos, 0); -+ re_empty = pcre_compile("^\\s*#|^\\s*$", 0, &pcre_err, &pcre_err_pos, 0); -+@@ -180,6 +186,8 @@ -+ pcre_free(re_section); -+ pcre_free(re_empty); -+ pcre_free(re_entry); -++ -++ free(line); -+ -+ return new_config; -+ } -+@@ -223,7 +231,7 @@ -+ -+ fclose(fin); -+ -+- config = config_parse(data); -++ config = config_parse(data, flen); -+ -+ free(data); -+ ---- skippy-0.5.1rc1.orig/debian/patches/11_find_skippyrc_in_etc.patch -+++ skippy-0.5.1rc1/debian/patches/11_find_skippyrc_in_etc.patch -@@ -0,0 +1,17 @@ -+--- skippy-0.5.0/skippy.c 2005-03-22 12:45:43.000000000 +0100 -++++ skippy-0.5.0-fixed/skippy.c 2005-03-30 14:27:09.000000000 +0200 -+@@ -232,8 +232,13 @@ -+ snprintf(cfgpath, 8191, "%s/%s", homedir, ".skippyrc"); -+ config = config_load(cfgpath); -+ } -+- else -++ else -+ fprintf(stderr, "WARNING: $HOME not set, not loading config.\n"); -++ if(config == 0) { -++ fprintf(stderr, "WARNING: $HOME/.skippyrc not found " -++ "loading default config.\n"); -++ config = config_load("/etc/X11/skippy/skippyrc"); -++ } -+ -+ wm_use_netwm_fullscreen(strcasecmp("true", config_get(config, "general", "useNETWMFullscreen", "true")) == 0); -+ wm_ignore_skip_taskbar(strcasecmp("true", config_get(config, "general", "ignoreSkipTaskbar", "false")) == 0); ---- skippy-0.5.1rc1.orig/debian/copyright -+++ skippy-0.5.1rc1/debian/copyright -@@ -0,0 +1,28 @@ -+This package was debianized by Niv ALTIVANIK on -+Mon, 6 Dec 2004 02:50:40 +0100. -+ -+It was downloaded from http://thegraveyard.org/skippy.php -+ -+Copyright: 2004 2005 Hyriand, TheGraveyard.org Project. -+ -+Upstream Author: Hyriand hyriand@thegraveyard.org -+ -+License: -+ -+ This package is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; version 2 dated June, 1991. -+ -+ This package is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this package; if not, write to the Free Software -+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -+ 02111-1307, USA. -+ -+ On Debian systems, the complete text of the GNU General Public -+ License can be found in the file `/usr/share/common-licenses/GPL'. -+ ---- skippy-0.5.1rc1.orig/debian/skippyrc.1 -+++ skippy-0.5.1rc1/debian/skippyrc.1 -@@ -0,0 +1,101 @@ -+.\" Hey, EMACS: -*- nroff -*- -+.\" -+.\" This manpage is free software; you can redistribute it and/or modify -+.\" it under the terms of the GNU General Public License as published by -+.\" the Free Software Foundation; version 2 dated June, 1991. -+.\" -+.\" This package is distributed in the hope that it will be useful, -+.\" but WITHOUT ANY WARRANTY; without even the implied warranty of -+.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+.\" GNU General Public License for more details. -+.\" -+.\" You should have received a copy of the GNU General Public License -+.\" along with this package; if not, write to the Free Software -+.\" Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -+.\" 02111-1307, USA. -+.\" -+.\" On Debian systems, the complete text of the GNU General Public -+.\" License can be found in the file `/usr/share/common-licenses/GPL'. -+.\" -+.\" First parameter, NAME, should be all caps -+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection -+.\" other parameters are allowed: see man(7), man(1) -+.TH SKIPPYRC 5 "December 6, 2004" -+.\" Please adjust this date whenever revising the manpage. -+.\" -+.\" Some roff macros, for reference: -+.\" .nh disable hyphenation -+.\" .hy enable hyphenation -+.\" .ad l left justify -+.\" .ad b justify to both left and right margins -+.\" .nf disable filling -+.\" .fi enable filling -+.\" .br insert line break -+.\" .sp insert n+1 empty lines -+.\" for manpage-specific macros, see man(7) -+.SH NAME -+skippyrc \- Configuration file for skippy, a Full Screen Task Switcher for X11 -+.SH DESCRIPTION -+.\" TeX users may be more comfortable with the \fB\fP and -+.\" \fI\fP escape sequences to invode bold face and italics, -+.\" respectively. -+\fBskippy\fP is a program that allows you to manage your windows in an -+efficient way. It is highly inspired by Apple Expose. -+ -+\fB~/.skippyrc\fP is its configuration file. -+ -+.SH FORMAT -+for each SECTION (see below), you can define the following variables: -+ -+.BR keysym -+ can be anything XStringToKeysym can handle -+ (like F11, KP_Enter or implementation specific keysyms) -+ -+.BR colors -+ can be anything XAllocNamedColor can handle -+ (like "black" or "#000000") -+ -+.BR distance -+ a relative number, and is scaled according to the scale -+ factor applied to windows -+ -+.BR fonts -+ Xft font descriptions -+ -+.BR booleans -+ "true" or anything but "true" (-> false) -+ -+.BR opacity -+ integer in the range of 0-255 -+ -+.BR brightness -+ floating point number (with 0.0 as neutral) -+ -+.SH SECTIONS -+.BR [general] -+.BR [xinerama] -+.BR [normal] -+.BR [highlight] -+.BR [tooltip] -+ -+.SH NOTE -+In Debian you can find a copy of the default skippyrc in -+/usr/share/doc/skippy/examples -+If no ~/.skippyrc exist, skippy will use /etc/X11/skippy/skippyrc -+ -+If you are using the X.org X server, there is a version of skippy, -+called skippy-xd that makes use of the new XDamage, XComposite and -+XFixes extensions. I suggest you use the xd version instead. -+ -+.SH FILES -+/etc/X11/skippy/skippyrc -+~/.skippyrc -+ -+.SH SEE ALSO -+.BR skippy (1), -+.BR skippy-xd (1) -+.SH AUTHOR -+skippy was written by Hyriand . -+.PP -+This manual page was written by Niv ALTIVANIK , -+for the Debian project (but may be used by others). ---- skippy-0.5.1rc1.orig/debian/examples/99skippy -+++ skippy-0.5.1rc1/debian/examples/99skippy -@@ -0,0 +1,5 @@ -+#!/bin/sh -+# Add this file to /etc/X11/XSession.d/ if you wish the program to be -+# started at login time for all the users on your system. -+ -+/usr/bin/skippy & ---- skippy-0.5.1rc1.orig/debian/examples/skippyrc-default -+++ skippy-0.5.1rc1/debian/examples/skippyrc-default -@@ -0,0 +1,3 @@ -+# This is the Default Debian skippy configuration, it is copied to -+# /etc/X11/skippy/skippyrc. -+# Copy this to ~/.skippyrc and edit it to fit your needs