From: Ben Hutchings Date: Sat, 24 Mar 2007 18:52:38 +0000 (+0000) Subject: [svn-inject] Applying Debian modifications to trunk X-Git-Tag: 20070318-1~11 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=7329232cac0c56809d39244969208012890b9647;p=ion3.git [svn-inject] Applying Debian modifications to trunk --- diff --git a/debian/NEWS b/debian/NEWS new file mode 100644 index 0000000..a91580f --- /dev/null +++ b/debian/NEWS @@ -0,0 +1,124 @@ +ion3 (20061029-1) unstable; urgency=low + + Mostly this release still fixes issues in the big 3ds-20061015 release, + but in addition there are some improvements in the query department: + + * Query activation key now cycles completions (So e.g. the + in the context menu activated with META+M, this same key + can be used to cycle through the alternatives.) This does + not work for queries activated by submap bindings. + + * Likewise, it is no longer necessary to specify the key to + use for cycling for `mod_menu.grabmenu`. + + * Control+R can now be used for history completion in queries. + (Currently matching is done for full string up to 'point', but + this may be changed to substring match.) + + * Note that the parametrisation of WEdln.complete has changed, + and the second cycle parameter must be 'next' now instead of + `true`. + + -- Norbert Tretkowski Sun, 29 Oct 2006 10:50:06 +0100 + +ion3 (20061020-1) unstable; urgency=low + + Fixes some (expected, but minor) issues in the previous release. + + -- Norbert Tretkowski Mon, 23 Oct 2006 20:01:47 +0200 + +ion3 (20061015-1) unstable; urgency=low + + * WIonWS and WFloatWS and the corresponding modules are also gone, and + your custom configuration files will be broken with regard to these. + However, a partial backwards compatibility hack exists for layout + savefiles. + + The F9 and META-F9 bindings now by default create workspaces with + a tiled layout of two frames. To create an "empty" workspace, + corresponding to the old WFloatWS, use the context menu (META-M) + and chose "new-empty-workspace". It is also possible to change + the default layout. + + * Note that if you restart from an old version to this new version of Ion, + transients will stop working as expected for already existing windows. + They will work for newly-created windows, however. + + * There are a few new sets of binding (including one for ^WClientWin!), + and some old bindings may not work exactly as expected anymore. In + particular, those for switching to full-screen mode. + + ** + It is probably best to start from scratch with your custom bindings. + ** + + * ^WFrame.set_tabbar is gone. If you absolutely want to get rid off + the tabs, you must change the frame's "mode" with ^WFrame.set_mode. + The mode "tiled-alt" has been intended for this, and the corresponding + "framed-tiled-alt" style defaults to ^Bar = "none". + + * The rather popular ^Detach.lua script from the scripts repository + is obsoleted now, as Ion includes detach functionality in itself. + To detach a window, use META-K D in the default bindings. To tile + an existing from an a workspace that doesn't have a tiling yet, + use META-K B. + + -- Norbert Tretkowski Tue, 17 Oct 2006 18:08:45 +0200 + +ion3 (20060317-1) unstable; urgency=low + + * Changes in the set of configuration files. + + - cfg_ion.lua now simply load cfg_ioncore.lua and cfg_modules.lua + with the default set of modules, and includes some of the most + commonly changed options commented-out. This deprecates cfg_user.lua + - cfg_menus.lua and cfg_bindings.lua are now cfg_ioncore.lua. This + better matches how things for different modules are in their own + files. + + -- Norbert Tretkowski Fri, 17 Mar 2006 21:57:14 +0100 + +ion3 (20060305-1) unstable; urgency=low + + * The scrachpad class was removed. The scratchpad is just a normal frame + now, with a few special attributes. Your scratchpad configuration from + the layout savefile will be lost (and complained of). A new one should + open with the toggle key. + + * There's generic size policy code that both mplexes and client windows + use (for transients). The default size policy for (framed) transients + keeps them glued to the borders they're touching even if the parent or + they themselves are resized (unless this could not be done because a + small size and position are requested). + + -- Norbert Tretkowski Mon, 6 Mar 2006 17:26:47 +0100 + +ion3 (20050322-1) unstable; urgency=low + + * Those with custom configuration files should note that many exported toggle + functions were changed and renamed, and now accept a string parameter + incidating whether to toggle, set or unset the property. + + - WClientwin.set_fullsreen (replaces WClientWin.toggle_fullscreen) + - WRegion.set_tagged (replaces WRegion.tag/untag/toggle_tag) + - WFrame.set_tabbar (replaces WFrame.toggle_tabbar) + - WFrame.set_shaded (replaces WFrame.toggle_shade) + - WFloatFrame.set_sticky (replaces WFloatFrame.toggle_sticky) + - WMPlex.l2_set_hidden (replaces WMPlex.l2_hide/show) + - mod_sp.set_shown(_on) (replaces mod_sp.toggle(_on)) + - mod_dock.set_floating_shown_on (replaces mod_dock.toggle_floating_on) + - WRegion.set_activity (replaces WRegion.clear_activity and + WRegion.notify_activity) + + For example, WRegion.set_tagged(_, 'toggle') should be used in place of + WRegion.toggle_tagged(_) now. + + -- Norbert Tretkowski Tue, 22 Mar 2005 17:24:35 +0100 + +ion3 (20041104-1) unstable; urgency=low + + * The configuration files were renamed and changed a lot since 20040703-1, + please read /usr/share/doc/ion3/RELNOTES.gz and remember that this is a + development snapshot before reporting bugs. + + -- Norbert Tretkowski Sun, 05 Dec 2004 18:31:23 +0100 diff --git a/debian/README b/debian/README new file mode 100644 index 0000000..0efd782 --- /dev/null +++ b/debian/README @@ -0,0 +1,11 @@ +ion3 (20060326-1) unstable; urgency=low + + * Binaries in this package are not stripped since 20050322-4, because of + upstreams request. The reason why there's no separate -dbg package is + because ion3 is the development branch. + * Ion3 has support KDE system tray icons natively, but the implementation + is KDE-specific. Unfortunately, this makes non-KDE (GNOME) system tray + icons appear broken, when they really aren't. To get a Gaim (and maybe + others) system tray icon, use the "docker" package. + + -- Norbert Tretkowski Sun, 26 Mar 2006 12:21:35 +0200 diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..ccc42b8 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,977 @@ +ion3 (20061223-2) unstable; urgency=medium + + * Added czech .desktop file translations from Miroslav Kure. + (closes: #394620) + + -- Norbert Tretkowski Sat, 3 Feb 2007 17:35:46 +0100 + +ion3 (20061223-1) unstable; urgency=medium + + * New upstream release. + * Removed backported patches (added in 20061029-3) which are part of + this new release. + + -- Norbert Tretkowski Sat, 23 Dec 2006 16:29:25 +0100 + +ion3 (20061029-3) unstable; urgency=low + + * Added a new patch from darcs to fix invalid setitimer values. + (closes: #376168, #394125) + * Added another new patch from darcs to fix a crash in tiling_placement_alt + handler. (closes: #396115) + + -- Norbert Tretkowski Tue, 31 Oct 2006 20:17:46 +0100 + +ion3 (20061029-2) unstable; urgency=low + + * Added groff-base to build-dependencies. (really closes: #395092) + + -- Norbert Tretkowski Sun, 29 Oct 2006 12:53:14 +0100 + +ion3 (20061029-1) unstable; urgency=medium + + * New upstream release. + * Fixed welcome message. (closes: #395092) + + -- Norbert Tretkowski Sun, 29 Oct 2006 10:50:06 +0100 + +ion3 (20061020-1) unstable; urgency=medium + + * New upstream release. + + Fixed workspace creation. (closes: #394198) + * Updated patch for new release: + + 207_bindings-manpage.diff + * Removed obsolete entries from lintian overrides file. (closes: #394191) + * Fixed copy & paste error in NEWS file. (closes: #394391) + + -- Norbert Tretkowski Mon, 23 Oct 2006 20:01:47 +0200 + +ion3 (20061015-1) unstable; urgency=low + + * New upstream release. + * Updated patches for new release: + + 204_fix-bindings.diff + + 208_build-docs-with-hevea.diff + * Fixed path to libs.mk, rules.mk and system-inc.mk. + * Added some more lintian overrides. + + -- Norbert Tretkowski Tue, 17 Oct 2006 20:18:09 +0200 + +ion3 (20060524-3) unstable; urgency=low + + * Depend on x-terminal-emulator | xterm. (closes: #389393) + + -- Norbert Tretkowski Tue, 26 Sep 2006 23:32:40 +0200 + +ion3 (20060524-2) unstable; urgency=low + + * Workaround bashism in debian/rules. (closes: #379588) + * Readded Debian-menu to default configuration. (closes: #376446) + + -- Norbert Tretkowski Mon, 31 Jul 2006 17:49:42 +0200 + +ion3 (20060524-1) unstable; urgency=low + + * New upstream release ion-3ds-20060524. + * Removed backported patches (added in 20060519-2, 20060519-3 and 20060519-4) + which are part of this new release. + + -- Norbert Tretkowski Thu, 25 May 2006 04:36:25 +0200 + +ion3 (20060519-4) experimental; urgency=low + + * Added yet another new patch which fixes more Lua 5.1 stuff. + + -- Norbert Tretkowski Sat, 20 May 2006 10:57:02 -0500 + +ion3 (20060519-3) experimental; urgency=low + + * Added another new patch which fixes more Lua 5.1 stuff. + + -- Norbert Tretkowski Fri, 19 May 2006 13:06:06 -0500 + +ion3 (20060519-2) experimental; urgency=low + + * Added a new patch from darcs to get ioncore_bindings.lua working properly + with Lua 5.1. + + -- Norbert Tretkowski Fri, 19 May 2006 10:01:02 -0500 + +ion3 (20060519-1) experimental; urgency=low + + * New upstream release ion-3ds-20060519. + + Switched to Lua 5.1. + * Upload to experimental, because most scripts from ion3-scripts package no + longer work with Lua 5.1. + * Removed backported patch (added in 20060326-2) which is part of this new + release. + * Updated patches for new release: + + 201_fix-paths.diff + + 207_bindings-manpage.diff + * Updated standards-version to 3.7.2.0, no changes required. + * Added pkg-config to build-dependencies. + + -- Norbert Tretkowski Fri, 19 May 2006 00:18:46 -0500 + +ion3 (20060326-2) unstable; urgency=medium + + * Added a new patch from darcs to fix default_ws_type lookup. + (closes: #358533) + + -- Norbert Tretkowski Fri, 31 Mar 2006 21:23:01 +0200 + +ion3 (20060326-1) unstable; urgency=medium + + * New upstream release ion-3ds-20060326. + + Increments counter in statusbar list building. (closes: #350848) + * Updated patch 202_fix-menus.diff. + * Added notes about unstripped binaries and libraries. (closes: #344027) + * Added notes about docker for gnome systray icons. (closes: #337512) + + -- Norbert Tretkowski Sun, 26 Mar 2006 12:10:23 +0200 + +ion3 (20060317-1) unstable; urgency=low + + * New upstream release ion-3ds-20060317. + * Updated patches 202_fix-menus.diff, 204_fix-bindings.diff and + 209_use-etc-default.diff. + * Added notes about changes in the set of configuration files. + + -- Norbert Tretkowski Fri, 17 Mar 2006 21:57:14 +0100 + +ion3 (20060305-2) unstable; urgency=low + + * Fixed build-dependencies. (closes: #355837) + + -- Norbert Tretkowski Wed, 8 Mar 2006 09:39:05 +0100 + +ion3 (20060305-1) unstable; urgency=low + + * New upstream release ion-3ds-20060305. + * Removed backported patches (added in 20060107-2 and 20060107-3) which + are part of this new release. + + -- Norbert Tretkowski Mon, 6 Mar 2006 17:26:47 +0100 + +ion3 (20060107-4) unstable; urgency=low + + * Added lintian override for usr-doc-symlink-without-dependency in ion3-dev, + it's handled via ion3-api-${Ion:ApiVersion}. + * Used /usr/bin/install-menu instead /usr/sbin/install-menu. + * Corrected FSF address in copyright file. + + -- Norbert Tretkowski Fri, 27 Jan 2006 14:24:41 +0100 + +ion3 (20060107-3) unstable; urgency=medium + + * Added a new patch from darcs which fixes unnecessary resize of the + statusbar. + + -- Norbert Tretkowski Wed, 25 Jan 2006 18:02:33 +0100 + +ion3 (20060107-2) unstable; urgency=medium + + * Added a new patch from darcs which fixes a segmentation fault. + + -- Norbert Tretkowski Wed, 25 Jan 2006 14:18:35 +0100 + +ion3 (20060107-1) unstable; urgency=low + + * New upstream release ion-3ds-20060107. + + -- Norbert Tretkowski Sun, 8 Jan 2006 12:13:01 +0100 + +ion3 (20051210-1) unstable; urgency=low + + * New upstream release ion-3ds-20051210. + * Removed backported patches (added in 20051029-3) which are part of this + new release. + * Moved the cfg_debian dopath in cfg_ion.lua above the default META and + ALTMETA keys settings. + + -- Norbert Tretkowski Sat, 10 Dec 2005 22:30:42 +0100 + +ion3 (20051029-3) unstable; urgency=low + + * Added two new patches from darcs to no longer keep an already deleted + logfile open. (closes: #340559) + * Tweaked dependencies to make backporting easier. + + -- Norbert Tretkowski Sat, 26 Nov 2005 21:45:24 +0100 + +ion3 (20051029-2) unstable; urgency=low + + * Fixed dependency of ion3-dev on ion3 to make it bin-nmu save. + (closes: #336377) + * Removed libtool from ion3-dev dependencies. + * Updated FAQ. + + -- Norbert Tretkowski Sat, 12 Nov 2005 18:12:35 +0100 + +ion3 (20051029-1) unstable; urgency=low + + * New upstream release ion-3ds-20051029. + + -- Norbert Tretkowski Sat, 29 Oct 2005 16:39:39 +0200 + +ion3 (20051023-1) unstable; urgency=low + + * New upstream release ion-3ds-20051023. + * Removed backported patch (added in 20050820-5) which is part of this new + release. + + -- Norbert Tretkowski Sun, 23 Oct 2005 18:48:51 +0200 + +ion3 (20050820-5) unstable; urgency=low + + * Recommend some font packages, because helvetica is used in some styles. + (closes: #332211) + * Added a new patch from darcs which removes the mail monitor from default + statusbar template. (closes: #332181) + + -- Norbert Tretkowski Wed, 5 Oct 2005 09:08:05 +0200 + +ion3 (20050820-4) unstable; urgency=low + + * Removed the Evolution kludge because it doesn't work anymore. + + -- Per Olofsson Mon, 29 Aug 2005 18:50:35 +0200 + +ion3 (20050820-3) unstable; urgency=low + + * Correctly calculate Ion:ApiVersion substvar so that we can provide + ion3-api-ION_API_VERSION. + + -- Per Olofsson Sun, 28 Aug 2005 00:38:00 +0200 + +ion3 (20050820-2) unstable; urgency=low + + * Fixed a bug when including /etc/default/ion3 in cfg_ion.lua, thanks + to Jaakko Niemi for reporting. + + -- Norbert Tretkowski Sat, 27 Aug 2005 20:49:12 +0200 + +ion3 (20050820-1) unstable; urgency=low + + * New upstream release ion-3ds-20050820. + * Removed backported patches (added in 20050728-1, -2 and -5) which are + part of this new release. + * Updated FAQ. + + -- Norbert Tretkowski Sat, 20 Aug 2005 14:36:09 +0200 + +ion3 (20050728-5) unstable; urgency=low + + * Added patch which makes Ion try to read configuration files without + extensions as well. Needed to be able to read /etc/default/ion3. + + -- Per Olofsson Tue, 16 Aug 2005 17:05:02 +0200 + +ion3 (20050728-4) unstable; urgency=low + + * New configuration file /etc/default/ion3, for an easy configuration + of the MOD1 and MOD2 keys. + * Used dh_install to install ion3 lintian overrides file. + + -- Norbert Tretkowski Sun, 14 Aug 2005 09:44:35 +0200 + +ion3 (20050728-3) unstable; urgency=low + + * Mention ion3-scripts package in README.Debian. (closes: #319872) + + -- Norbert Tretkowski Sat, 6 Aug 2005 20:19:52 +0200 + +ion3 (20050728-2) unstable; urgency=low + + * Reverted size selection of docked non-dockapps modifications. + + -- Norbert Tretkowski Sun, 31 Jul 2005 23:05:46 +0200 + +ion3 (20050728-1) unstable; urgency=low + + * New upstream release ion-3ds-20050728. + * Removed backported patches (added in 20050625-2, and -4) which are part + of this release. + * Added a new patch to disable WCOREDUMP(). + + -- Norbert Tretkowski Thu, 28 Jul 2005 20:17:46 +0200 + +ion3 (20050625-6) unstable; urgency=low + + * Used libxinerama-dev instead of libx11-dev in build-dependencies and + ion3-dev dependencies. + + -- Norbert Tretkowski Sat, 16 Jul 2005 19:30:25 +0200 + +ion3 (20050625-5) unstable; urgency=low + + * Updated FAQ. + * Revoked modifications from 20050625-3, sbuild can't handle the new + build-dependencies. + + -- Norbert Tretkowski Mon, 4 Jul 2005 08:12:57 +0200 + +ion3 (20050625-4) unstable; urgency=low + + * Added a new patch from darcs which improves the statusd_mail error + message. (closes: #303003) + + -- Norbert Tretkowski Sun, 3 Jul 2005 18:51:02 +0200 + +ion3 (20050625-3) unstable; urgency=low + + * Added Build-Depends libxinerama-dev, libxext-dev and libice-dev. This + seems to be the only way to get an updated version of ion3 into Ubuntu. + Nobody cares about the completely outdated ion3 package in Ubuntu, and + people keep asking me when I'm going to update it. + + -- Norbert Tretkowski Sat, 2 Jul 2005 11:55:45 +0200 + +ion3 (20050625-2) unstable; urgency=low + + * Added a new patch from darcs which fixes the "goto when scratchpad + is active" patch. + + -- Norbert Tretkowski Thu, 30 Jun 2005 09:25:11 +0200 + +ion3 (20050625-1) unstable; urgency=low + + * New upstream release ion-3ds-20050625. + * Removed backported patches (added in 20050607-2, -3, -4 and -5) which are + part of this release. + + -- Norbert Tretkowski Sun, 26 Jun 2005 17:49:35 +0200 + +ion3 (20050607-5) unstable; urgency=low + + * Added a new patch from darcs which adds a setlocale() call to statusd. + (closes: #313086) + * Updated Standards-Version to 3.6.2. + + -- Norbert Tretkowski Thu, 23 Jun 2005 09:06:39 +0200 + +ion3 (20050607-4) unstable; urgency=low + + * Even more patches from darcs for better completion. + + -- Norbert Tretkowski Wed, 22 Jun 2005 09:11:39 +0200 + +ion3 (20050607-3) unstable; urgency=low + + * Updated the german PO file, thanks to Jens Seidel. (closes: #314038) + * Added some more patches from darcs for better completion. + + -- Norbert Tretkowski Wed, 15 Jun 2005 09:12:58 +0200 + +ion3 (20050607-2) unstable; urgency=low + + * Added a new patch from darcs for better tracking of multiple pending + completions. + + -- Norbert Tretkowski Sat, 11 Jun 2005 00:39:46 +0200 + +ion3 (20050607-1) unstable; urgency=low + + * New upstream release ion-3ds-20050607. + * Removed backported patches (added in 20050502-2) which are part of this + release. + + -- Norbert Tretkowski Tue, 7 Jun 2005 18:06:24 +0200 + +ion3 (20050502-3) unstable; urgency=low + + * Added install-sh to ion3-dev. + + -- Norbert Tretkowski Sat, 28 May 2005 23:25:29 +0200 + +ion3 (20050502-2) unstable; urgency=medium + + * Added a new patch from darcs for faster fontset kludge when using utf-8 + locales. + * Added a new patch from darcs to fix initial height of dock. + + -- Norbert Tretkowski Tue, 10 May 2005 19:02:35 +0200 + +ion3 (20050502-1) unstable; urgency=low + + * New upstream release ion-3ds-20050502. + + Fixed activity notification. (closes: #305271) + + -- Norbert Tretkowski Mon, 2 May 2005 20:06:52 +0200 + +ion3 (20050406-1) unstable; urgency=low + + * New upstream release ion-3ds-20050406. + * Removed backported patches (added in 20050322-2, -4 and -6) which are part + of this release. + + -- Norbert Tretkowski Wed, 6 Apr 2005 14:01:32 +0200 + +ion3 (20050322-6) unstable; urgency=medium + + * Added a new patch from darcs to fix a crash in name allocation code. + + -- Norbert Tretkowski Sun, 3 Apr 2005 18:16:35 +0200 + +ion3 (20050322-5) unstable; urgency=medium + + * Added some lintian overrides for unstripped binaries and libraries. + + -- Norbert Tretkowski Sat, 2 Apr 2005 01:48:25 +0200 + +ion3 (20050322-4) unstable; urgency=medium + + * Added a new patch from darcs to fix a typo in de/fontset.c. + (closes: #302221) + * Added a new patch from darcs which should fix the BadMatch segfaults. + (closes: #302607) + * Disabled dh_strip on upstreams request. + + -- Norbert Tretkowski Sat, 2 Apr 2005 01:06:35 +0200 + +ion3 (20050322-3) unstable; urgency=low + + * Added libs.mk and libextl-mkexports to ion3-dev. (closes: #301728) + * Added a missing comma to an example in cfg_sp.lua. (closes: #302040) + + -- Norbert Tretkowski Wed, 30 Mar 2005 18:33:25 +0200 + +ion3 (20050322-2) unstable; urgency=low + + * Added a new patch from darcs which fixes the menu entry for tagging, it + wasn't updated to the renamed toggle functions. + + -- Norbert Tretkowski Sat, 25 Mar 2005 13:09:25 +0100 + +ion3 (20050322-1) unstable; urgency=low + + * New upstream release ion-3ds-20050322. + * Added note about changed or renamed exported toggle functions to NEWS + file. + * Updated patch which modifies documentation to build with hevea. + * Updated patch which adds ion-lock script. + + -- Norbert Tretkowski Tue, 22 Mar 2005 17:24:35 +0100 + +ion3 (20050304-1-1) unstable; urgency=low + + * New upstream release ion-3ds-20050304-1. + + Tab completion now handles spaces correct. (closes: #296060) + * Removed backported patches (added in 20050227-1) which are part of this + release. + * Updated patch which modifies documentation to build with hevea. + + -- Norbert Tretkowski Fri, 4 Mar 2005 11:16:51 +0100 + +ion3 (20050227-1) unstable; urgency=low + + * New upstream release ion-3ds-20050227. + * Removed reference to README.dock in README.Debian, it was removed in + 20050116-2 (closes: #297860). + * Added a new patch from darcs which fixes a bug that triggers an assertion + failure. + * Fixed path in ion3-doc.doc-base.config, it still used ion2-doc as + directory. + * Added changelog to ion3-doc package. + + -- Norbert Tretkowski Thu, 3 Mar 2005 23:06:25 +0100 + +ion3 (20050116-4) unstable; urgency=low + + * Build documentation using Hevea. + + -- Per Olofsson Wed, 23 Feb 2005 15:15:48 +0100 + +ion3 (20050116-3) unstable; urgency=medium + + * Fixed dangling symlink /etc/X11/ion3/draw.lua (closes: #295365). + * Added german translations (welcome message and manpages) from svn. + + -- Norbert Tretkowski Fri, 18 Feb 2005 20:45:35 +0100 + +ion3 (20050116-2) unstable; urgency=low + + * Package has stabilized and is ready for sarge (closes: #261121). + * Added a new patch 207_bindings-manpage.diff which moves WFrame bindings + above WScreen bindings in ion3 and pwm3 manpages (closes: #292561). + * Removed README.dock, it was written for ion2 and does no longer apply + for ion3 (closes: #260451). + * Switched maintainer and uploader values on Per's request, and used his + debian.org address. + * Removed extra license file /usr/share/doc/ion3/LICENSE.gz. + * Renamed upstream changelog to /usr/share/doc/ion3/changelog.gz. + * Lowered first capital in short package descriptions. + + -- Norbert Tretkowski Sun, 13 Feb 2005 16:32:25 +0100 + +ion3 (20050116-1) unstable; urgency=low + + * New upstream release ion-3ds-20050116. + + -- Norbert Tretkowski Sun, 16 Jan 2005 20:45:36 +0100 + +ion3 (20050102-1) unstable; urgency=low + + * New upstream release ion-3ds-20050102. + * Fixed wrong target name for docks in README.Debian (closes: #276939). + * Moved .desktop files to /usr/share/xsessions (closes: #275189). + + -- Norbert Tretkowski Sun, 2 Jan 2005 15:19:23 +0100 + +ion3 (20041104-1) unstable; urgency=low + + * New upstream release ion-3ds-20041104. + + Fixed segfault in ioncore/names.c (closes: #260106). + * New co-maintainer, added myself to uploaders. + * Corrected build-dependencies to reflect the new xfree86 library + arrangement. + * Split out some patches and converted to dpatch. + * Package ion3-dev is now arch:all. + * Removed outdated documentation. + * Removed libtool and libltdl3-dev from build-dependencies. + * Added NEWS.Debian file. + * Thanks to Jurij Smakov for testing and feedback. + + -- Norbert Tretkowski Mon, 13 Dec 2004 20:15:26 +0100 + +ion3 (20040703-1) unstable; urgency=low + + * New upstream release. + * Suggest menu (>= 2.1.9) because older versions don't support + outputencoding. + * Added ion-lock, a script which uses xscreensaver if it's available, + otherwise xlock. + * Automatically find headers to install so I don't have to keep track + of them manually. + + -- Per Olofsson Fri, 16 Jul 2004 23:00:02 +0200 + +ion3 (20040316-1-2) unstable; urgency=low + + * Use ISO-8859-1 as output encoding in the menu-method. + * Added generation of a special i18n menu using the current locale. + * Moved the generated menu files to /var/lib/ion3. + * Quote properly in menu-method. + * debian/update-faq now removes the old version. + * Don't compress Lua example files so that examples/index.html doesn't + get broken links. + * Removed the unnecessary creation of the include/ion symlink in + the source from debian/rules. + * Removed examples, because they're for Ion2. + * Renamed debian-menus.lua to debian-menu.lua. + + -- Per Olofsson Thu, 10 Jun 2004 19:12:07 +0200 + +ion3 (20040316-1-1) unstable; urgency=low + + * New branch. + * Removed the 0.0. from the version number. The dates are not likely to + go away. + * Changed all (most) occurences of ion2 to ion3, and pwm2 to pwm3. + * Lowered priority to extra. + * Remove *.out when cleaning in ion-doc/Makefile. + * Commented out the dummy os.execute in share/ioncorelib-luaext.lua. + * Lowered priority of alternatives by one point each. + * Added notes about the examples and the documentation being out of + date. + + -- Per Olofsson Mon, 26 Apr 2004 17:39:37 +0200 + +ion2 (0.0.20040407-1) UNRELEASED; urgency=low + + * New upstream release. + - Shouldn't get a box cursor when switching from fullscreen mode + too fast. Closes: #242153. + - Shouldn't take long time to start xterm now. Closes: #245518. + * Lowered ion2-doc's priority to extra. + * Created and added ion2.desktop and pwm2.desktop to /etc/dm/Sessions so + that Ion can be selected from gdm and similar. Closes: #245457. + * Updated the copyright file. + * Added kludge for wmdate to dock.lua. + * Create the include/ion symlink when building if it doesn't exist, + since Subversion doesn't allow symlinks. + + -- Per Olofsson Sat, 24 Apr 2004 00:50:57 +0200 + +ion2 (0.0.20040207-3) unstable; urgency=low + + * Versioned the Lua dependencies to >> 5.0.2. + * Still remove precompiled Lua files because they don't belong in share, + but this will be changed in next upstream release where they're placed + in /usr/lib. + * Removed bashism from ion2's prerm. + * Added example scripts from the website. + * Added FAQ from the website and wrote the update-faq script to automate + the downloading of the FAQ. + * Added debian/packaging-notes.txt with some notes about the packaging. + * Removed references to ion-devel from README.dock. + * Fixed pwm2's loading of debian-menus.lua. Closes: #239396. + * Quoted the needs value in the menu file because lintian complained + about it. + + -- Per Olofsson Fri, 2 Apr 2004 22:44:22 +0200 + +ion2 (0.0.20040207-2) unstable; urgency=low + + * Check if the menu package is installed before including + /usr/share/ion2/debian-menus.lua, to avoid errors if this is not the + case. Closes: #234343. + * Raised x-window-manager alternative priority to 50 per policy + 11.8.4. + * Also add pwm2 as an alternative to x-window-manager. But set priority + to 49 because it's less important than ion2. + * Removed leading "A" from ion2 synopsis. + * Updated description. + * Added website URL to description. + * Updated doc-base description as well. + * Generate PDF version of the documentation instead of PostScript. This + is what the developer's reference tells me to do and, well, why + not. You get nice hyperlinks. + + -- Per Olofsson Tue, 2 Mar 2004 00:19:34 +0100 + +ion2 (0.0.20040207-1) unstable; urgency=low + + * New upstream release. + * Removed the prebuilt documentation included in the new ion-doc + version. + * Removed the ionnotes manual because upstream doesn't think it's mature + enough. + * Use the target realclean when cleaning the documentation source + directory. + * Rewrote ion2-doc description. + * Small change in ion2 description. + * Modified debian/ion2.menu-method to use complete section names as + identifiers for submenus instead of just titles. This makes it + possible to have more than one submenu with the same title. + * Don't use absolute path when including debian-menus.lua from + ion-menus.lua. + * Place debian-menus.lua in /usr/share/ion2 instead of + /etc/X11/ion2. This makes sure the user doesn't accidentally copy it + to ~/.ion2/. + * Don't refer to /usr/share/doc/menu/README in the generated menu file + because it doesn't exist. + * Remove /usr/share/ion2/debian-menus.lua in debian/ion2.prerm when + removing the package. + + -- Per Olofsson Sun, 8 Feb 2004 01:09:57 +0100 + +ion2 (0.0.20040131-1) unstable; urgency=low + + * New upstream release. + * Changed reference in man/ion.1.in from X(1x) to X(7x) because the + former does not seem to exist in Debian. + * Hevea fix in ion-doc/ionconf.tex again (forgot to change %begin to + \begin etc.). + * Don't give option dvipdfm to hyperref in ion-doc/macros.tex because we + don't make pdf's in this package and it produces a lot of ugly + warnings when converting to Postscript. + + -- Per Olofsson Sun, 1 Feb 2004 15:50:57 +0100 + +ion2 (0.0.20040127-1) unstable; urgency=low + + * New upstream release. + * Depend on libtool/libltdl 1.4.1, not 1.4. + + -- Per Olofsson Wed, 28 Jan 2004 18:52:34 +0100 + +ion2 (0.0.20040121-1) unstable; urgency=low + + * New upstream release. + * Changed package name to ion2 and updated all references. + * Added reference to ion2-doc package to man/ion.1.in. + * Changed priority to optional. + * Added that extra .0 to Standards-Version :) + * Updated descriptions. + * Only depend on libtool (>> 1.4) and gcc (>> 3). + * Removed ion2-dev.preinst because there's no need to remove a doc + directory from ion-devel-dev anymore. + * Updated share/welcome_message.head. + * Added dependency on libtool and gcc (>> 3) to ion2-dev. + * Added conflict with ion versions which do not use alternatives for the + ion executable. + * Added copyright notice from dock/dock.c to debian/copyright and made + some small indentation changes. + * Uncommented POSIX_SOURCE and XOPEN_SOURCE in system.mk and removed + -ansi flag from them (we use C99). + * Install dock/README.dock. + * Added Ion menu-method and added code to include it in ion-menus.lua. + * Wrote a README.Debian for the ion2 package. + * Hevea fix in ion-doc/ionconf.tex. + * Added PWM2 to Debian menu. + * Restart to PWM2 instead of PWM in etc/ion-menus.lua. + * Updated PWM menus similar to the Ion menus (including adding Debian + menu). + + -- Per Olofsson Sun, 25 Jan 2004 01:17:04 +0100 + +ion-devel (0.0.20031211-3) unstable; urgency=low + + * Removed DEFAULT_MOD+Menu keybinding since the Menu keysym is not + available in all XFree86 keyboard models, and it generates an error + message on startup if it is not. This has already been done in the Ion SVN + repository. (closes: #226034) + + -- Per Olofsson Sun, 4 Jan 2004 17:07:26 +0100 + +ion-devel (0.0.20031211-2) unstable; urgency=low + + * Moved all Build-Depends-Indep to Build-Depends because the policy is + flawed and buildd's can't handle it. (closes: #225731) + + -- Per Olofsson Thu, 1 Jan 2004 13:37:55 +0100 + +ion-devel (0.0.20031211-1) unstable; urgency=low + + * New upstream release. + - Note that user configuration is now in ~/.ion2 instead of + ~/.ion-devel. + * ion-doc updated to version 20031211. + * Remove ion-doc/.log when doing make clean. + * Added copyright notice for the documentation to debian/copyright. + * Provide ion-devel-api-n where n is the API version. + * Don't rename ioncore in debian/rules because it doesn't exist anymore. + * Removed ion-devel-core manual page because ion-devel-core doesn't + exist anymore. + * Rename ion.1 not ion.1x in debian/rules. + * Rename pwm binary and manual page to pwm-devel in debian/rules. + * Modified man/pwm.1.in similarly to the ion manpage to point out that + it's the -devel version. + * Modified man/ion.1.in to refer to the ion-devel-doc package for + documentation. + * Rebuilt man/ion.1.in.txt. + * Modified share/welcome_message.head to fit the Debian package better. + * Pulled ion/ion.c from CVS to fix bug which caused + ~/.ion2/.welcome_msg_displayed to be created with weird permissions. + * Pulled etc/look-clean.lua from CVS to get a menu font size which exist + in the standard Debian X font packages. + * Pulled query/querylib.lua from CVS to make the default manpage work + (F1+Enter). + * Restructured debian/copyright once again and added some information + which were missing. + + -- Per Olofsson Fri, 26 Dec 2003 22:18:37 +0100 + +ion-devel (0.0.20031121-1) unstable; urgency=low + + * New upstream release. + * Added ion-devel-doc. (closes: #212719) + * Modified the source for the documentation to build HTML output with + hevea instead of latex2html, since latex2html is + non-free. Unfortunately the output is not as good, but it is probably + good enough. + * Added README.Debian to ion-devel-doc which informs about the above. + * Uncommented the XMMS kludges in etc/kludges.lua which was added by + upstream. + * Removed -D_GNU_SOURCE from POSIX_SOURCE variable in system.mk because + it's now defined in the affected source file (libtu/output.c). + * Modified query/querylib.lua to prompt "Manual page (ion-devel)" + instead of "Manual page (ion)" when F1 is pressed. + * Remove pre-compiled Lua files /usr/share/ion-devel/*.lc because lua + 5.0.0 is buggy. They will be included when lua 5.0.1 is in Debian. + * Use x-terminal-emulator and sensible-browser in etc/ioncore-menus.lua. + + -- Per Olofsson Mon, 8 Dec 2003 18:37:38 +0100 + +ion-devel (0.0.20030814-3) unstable; urgency=low + + * Show the ion-devel manpage when pressing Mod1+F1, not the ion + manpage. Also use the ion-devel manpage as default when pressing F1. + (closes: #215288) + * Disabled UTF-8 support because it causes problems for some + people. (closes: #216511) + * Restructured beginning of debian/copyright. + + -- Per Olofsson Thu, 6 Nov 2003 22:21:31 +0100 + +ion-devel (0.0.20030814-2) unstable; urgency=low + + * Call uname without -p in etc/ioncore-bindings.lua since that option is + not present in Debian. (closes: #212628) + * Split the rules in debian/rules into -indep and -arch for an + ion-devel-doc package, but removed the actual package for now because + of GFDL non-freeness. + * Restructured debian/copyright a little. + * Define _GNU_SOURCE when compiling so that asprintf gets declared. + * Took luaextl/luaextl.[ch] and ioncore/readconfig.c from the CVS + snapshot to fix the funky type coercion issue with va_list which made + Ion segfault on powerpc and (presumably) s390. (closes: #212781) + * Corrected build-deps: (closes: #214330, #214386) + - gcc needs to be at least 3.0 + - only debhelper >=4 is needed, not 4.1 + - libtool/libltdl only needs to be >=1.4.2 apparently, not 1.4.3 + * Added debian/examples/alt_resize.lua with code for more intuitive + resizing. (closes: #213903) + * Added debian/examples/mover.lua with code for moving client windows to + adjacent frames. + * Modified the description further and added some information about the + configuration language and the modularity. + * Sponsored by Joey Hess. + + -- Per Olofsson Fri, 10 Oct 2003 22:45:20 +0200 + +ion-devel (0.0.20030814-1) unstable; urgency=low + + * New upstream release. (closes: #205012) + - Should build on all archs now. (closes: #200981) + * Remove unused .a files in /usr/lib/ion-devel (only the shared + libraries are used). + * Updated Standards-Version to 3.6.1. + + -- Per Olofsson Wed, 24 Sep 2003 16:30:49 +0200 + +ion-devel (0.0.20030627-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Apply patch from Matt Kraai to get the package building on powerpc + and s390 (closes: #200981). + + -- Steve Langasek Mon, 8 Sep 2003 01:19:33 -0500 + +ion-devel (0.0.20030627-1) unstable; urgency=low + + * New upstream release. + * Dependency on Lua 5.0 added. + * UTF-8 support enabled. + * debian/rules: Don't make depend and don't pass unnecessary variables + to make. + * Include rules.mk and mkexports.lua in ion-devel-dev. + * Don't rename version.h and config.h anymore. Should be solved + upstream. ION_DEBIAN_PACKAGE makefile variable removed. + * Helper scripts have been moved to share and lib upstream, so manual + pages have been removed and name changes for the scripts skipped. + * Moved config.h and system.mk to /usr/lib/ion-devel, the other + development files are in /usr/share/ion-devel. + * License change and copyright file cleanup. + * Various changes to accommodate upstream changes. + * A lot of changes removed due to successful upstream coordination :) + * Use x-terminal-emulator instead of xterm, this had apparently + disappeared in some version. (closes: #196410) + * Remove /etc/X11/ion-devel and everything in it if purging. + * Rewrote most of the package descriptions. + * Removed some Galeon stuff from kludges.lua as upstream now provides + one kludge for Galeon, and it is probably enough (better to keep close + to upstream). + + -- Per Olofsson Sun, 29 Jun 2003 18:33:08 +0200 + +ion-devel (0.0.20030327-2) unstable; urgency=low + + * Use -fPIC when compiling modules (closes: #188917). + + -- Per Olofsson Thu, 24 Apr 2003 20:41:15 +0200 + +ion-devel (0.0.20030327-1) unstable; urgency=low + + * New upstream release (closes: #183900). + * Various changes to accommodate new source layout. + * system*.mk and ion-config.h now placed in /usr/lib/ion-devel/dev + because modules will be placed directly in /usr/lib/ion-devel per new + upstream default. + * draw.conf is now symlinked to look-clean.conf in ion-devel.postinst + per new upstream default. + * Added ion-devel.postrm and moved removal of draw.conf symlink from + ion-devel.prerm to ion-devel.postrm. + * Added #DEBHELPER# tag to ion-devel.preinst and ion-devel.postrm. + * Changed the paths in system.mk to proper values so that modules can + use them. + * Added ION_DEBIAN_PACKAGE variable to system.mk to make it possible for + add-on modules to determine if they are to be built against the Debian + package. + * Disabled Xft support because it is broken when using non-truetype + fonts. + * Added conflict with incompatible ion-devel-dock versions. + * Added workaround for make realclean bug to debian/rules. + * Renamed ioncore to ion-devel-core and made sure it was called from the + script. + * Fixed the ion and pwm scripts so they use the correct ETCDIR. + * Added ion-devel-core manual page. + * Updated to standards version 3.5.9. + + -- Per Olofsson Sun, 30 Mar 2003 21:43:24 +0200 + +ion-devel (0.0.20030225-1) unstable; urgency=low + + * New upstream release. + * Switched to debhelper. + * Added conflict with ion-devel-metadome. + * Added version.h to ion-devel-dev as ion-version.h. + * Added system-inc.mk to ion-devel-dev. + * Switched to libxft2. + * Moved system.mk, system-inc.mk and ion-config.h to /usr/lib/ion-devel + and added symlinks. + * Renamed /usr/include/ion to /usr/include/ion-devel. + * Moved some things from debian/rules to system.mk. + * CF_XFT back in system.mk, wmcore/common.h less modified. + * Changed ion-devel-dev's package description. + * Moved manual pages to debian/man. + * Changed package description. + * Some small changes to the manual pages. + + -- Per Olofsson Sun, 2 Mar 2003 00:23:07 +0100 + +ion-devel (0.0.20030131-2) unstable; urgency=low + + * Added dependency on xlibs-dev to ion-devel-dev. + * Install libtu headers in /usr/include/ion/libtu/include/libtu instead + of /usr/include/ion/libtu since that is what modules expect. + * system.mk is now installed to /usr/include/ion. + * /usr/share/doc/ion-devel-dev is now a symlink to ion-devel. + * Added some kludges for Galeon and Evolution to kludges.conf + (closes: #180568) + + -- Per Olofsson Fri, 14 Feb 2003 18:19:00 +0100 + +ion-devel (0.0.20030131-1) unstable; urgency=low + + * New upstream release. + * Xft support enabled. + * Added ion-devel-dev package (for compiling modules). + * Changed reference to ion-runinxterm in query/query.c to + ion-devel-runinxterm. + * Uses ion-config.h instead of config.h (build process creates symlink). + * Moved CF_XFT define from system.mk to config.h. + + -- Per Olofsson Sat, 1 Feb 2003 00:52:45 +0100 + +ion-devel (0.0.20021229-1) unstable; urgency=low + + * New upstream release. + * ion-devel-view now runs sensible-browser instead of Mozilla when + viewing a URL. + * The compilation option -pedantic-errors was changed to -pedantic in + system.mk because it breaks on /usr/include/regex.h. + * Patch to make Emacs 21 not freeze during startup was applied (modifies + wmcore/clientwin.c). + * Will hopefully be added to Debian (closes: #173593) + + -- Per Olofsson Tue, 31 Dec 2002 01:03:45 +0100 + +ion-devel (0.0.20021104-3) unstable; urgency=low + + * The /etc/X11/ion-devel/draw.conf symlink is not listed as a conffile + anymore, it is instead created and removed by postinst and prerm. + + -- Per Olofsson Sat, 7 Dec 2002 17:49:59 +0100 + +ion-devel (0.0.20021104-2) unstable; urgency=low + + * Added -devel to the name of all executables, the manual page and + updated affected references. Removed conflict with ion from + debian/control. + * When ion-devel is the default window manager, + /etc/alternatives/x-window-manager.1.gz now points to the correct + file. + * draw.conf is now also listed as a conffile. + * Wrote manual pages for the scripts (ion-devel-*) + * ion-devel-view now uses Mozilla instead of Netscape to open URLs + + -- Per Olofsson Fri, 6 Dec 2002 22:57:00 +0100 + +ion-devel (0.0.20021104-1) unstable; urgency=low + + * Initial release. Started out with diff from Tommi Virtanen's stable + ion package. + + -- Per Olofsson Mon, 2 Dec 2002 23:54:31 +0100 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..b8626c4 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +4 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..5d0b33f --- /dev/null +++ b/debian/control @@ -0,0 +1,52 @@ +Source: ion3 +Section: x11 +Priority: extra +Maintainer: Norbert Tretkowski +Uploaders: Per Olofsson +Standards-Version: 3.7.2.0 +Build-Depends: debhelper (>> 4), gcc (>> 3), libxinerama-dev, libsm-dev, liblua5.1-0-dev, lua5.1, dpatch, pkg-config, groff-base + +Package: ion3 +Section: x11 +Architecture: any +Depends: ${shlibs:Depends}, xterm | x-terminal-emulator +Suggests: menu (>= 2.1.9) +Conflicts: ion (<< 0.0.20020207-7) +Recommends: xfonts-75dpi | xfonts-75dpi-transcoded | xfonts-100dpi | xfonts-100dpi-transcoded +Provides: x-window-manager, ion3-api-${Ion:ApiVersion} +Description: keyboard-friendly window manager with tiled windows (devel) + Ion, based on PWM, is an unusual window manager with no overlapping + windows. Windows are placed in tabbed frames which may be arbitrarily + split to create additional frames, making keyboard navigation much + easier. Flexible configuration is possible thanks to Lua, which is + used as the configuration language. + . + There is also support for so-called "floating workspaces" where + windows are managed the conventional way, so that you can still run + applications which do not fit very well into Ion's window management + approach. A pwm3 binary is included which starts Ion with floating + workspaces as the default, thus replacing the now obsolete PWM window + manager. + . + This is the current development branch of Ion. + . + Website: http://iki.fi/tuomov/ion/ + +Package: ion3-dev +Section: devel +Priority: extra +Architecture: all +Depends: ion3-api-${Ion:ApiVersion}, libxinerama-dev, libsm-dev, lua5.1, gcc (>> 3) +Description: ion3 development files + This package contains the files necessary for building extension + modules to the window manager Ion. + +Package: ion3-doc +Section: doc +Architecture: all +Recommends: lynx | www-browser +Suggests: doc-base, dwww | doc-central | dhelp +Description: ion3 documentation + This package contains the document "Configuring and extending Ion3 + with Lua" which explains how to configure and extend the window + manager Ion. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..850683c --- /dev/null +++ b/debian/copyright @@ -0,0 +1,408 @@ +This package is maintained by: Per Olofsson + +It is based on the ion package which was created by Tommi Virtanen + + +It was downloaded from: http://iki.fi/tuomov/ion/ + +Upstream author: Tuomo Valkonen + +Copyright: + +The following copyright notice appears in the source files: + +/* + * ion/ioncore/init.c + * + * Copyright (c) Tuomo Valkonen 1999-2004. + * + * Ion is free software; you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation; either version 2.1 of the License, or + * (at your option) any later version. + */ + +The GNU Lesser General Public License can be found in +/usr/share/common-licenses/LGPL on Debian systems. + +The README also states: + +-- +Ion was written by Tuomo Valkonen. + +The autoconf script written by Tom Payne for the most part. + +The dock module was written by Tom Payne and Per Olofsson. + +share/ion-completefile/ion-completefile.c is based on editline, (c) +1992 Simmule Turner and Rich Salz. See the file for details. + +libtu/snprintf_2.2/ was written by Mark Martinec, see the README there +or for more. I made some minor +modifications. + +The code that de/fontset.c is based on was apparently originally written +by Tomohiro Kubota; see +. + +Various patches have been contributed by other individuals unlisted here. +(See the mailing list archives.) +-- + +The licences for editline and snprintf_2.2 are reproduced at the +bottom of this file. Note that snprintf_2.2 isn't normally linked to +to the binaries on Debian GNU/Linux systems. + +The source files in the libtu library which is enclosed within Ion +include the following copyright notice: + +/* + * libtu/misc.c + * + * Copyright (c) Tuomo Valkonen 1999-2002. + * + * You may distribute and modify this library under the terms of either + * the Clarified Artistic License or the GNU LGPL, version 2.1 or later. + */ + +The Clarified Artistic License is reproduced at the end of this file. + +dock/dock.c includes the following copyright notice: + +/* + * Ion dock module + * Copyright (C) 2003 Tom Payne + * Copyright (C) 2003 Per Olofsson + * + * by Tom Payne + * based on code by Per Olofsson + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library 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 + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + * + * $Header: /home/twp/cvsroot/twp/ion/ion-devel-dock/dock.c,v 1.17 2003/12/21 11:59:48 twp Exp $ + * + */ + +The GNU Lesser General Public License can be found in +/usr/share/common-licenses/LGPL on Debian systems. + +The document "Ion: Configuring and extending with Lua" in the ion3-doc +package has the following copyright notice: + + Ion: Configuring and extending with Lua + Copyright (C) 2003 Tuomo Valkonen. + + This document is free; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This document 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 + chapter entitled ''GNU General Public License'' for more details. + +The GNU General Public License can be found in +/usr/share/common-licenses/GPL on Debian systems. + +The licence from share/ion-completefile/ion-completefile.c: + +/****************************************************************************/ +/* */ +/* Copyright 1992 Simmule Turner and Rich Salz. All rights reserved. */ +/* */ +/* This software is not subject to any license of the American Telephone */ +/* and Telegraph Company or of the Regents of the University of California. */ +/* */ +/* Permission is granted to anyone to use this software for any purpose on */ +/* any computer system, and to alter it and redistribute it freely, subject */ +/* to the following restrictions: */ +/* 1. The authors are not responsible for the consequences of use of this */ +/* software, no matter how awful, even if they arise from flaws in it. */ +/* 2. The origin of this software must not be misrepresented, either by */ +/* explicit claim or by omission. Since few users ever read sources, */ +/* credits must appear in the documentation. */ +/* 3. Altered versions must be plainly marked as such, and must not be */ +/* misrepresented as being the original software. Since few users */ +/* ever read sources, credits must appear in the documentation. */ +/* 4. This notice may not be removed or altered. */ +/* */ +/****************************************************************************/ +/* */ +/* This is a line-editing library, it can be linked into almost any */ +/* program to provide command-line editing and recall. */ +/* */ +/* Posted to comp.sources.misc Sun, 2 Aug 1992 03:05:27 GMT */ +/* by rsalz@osf.org (Rich $alz) */ +/* */ +/****************************************************************************/ +/* */ +/* The version contained here has some modifications by awb@cstr.ed.ac.uk */ +/* (Alan W Black) in order to integrate it with the Edinburgh Speech Tools */ +/* library and Scheme-in-one-defun in particular. All modifications to */ +/* to this work are continued with the same copyright above. That is */ +/* This version editline does not have the the "no commercial use" */ +/* restriction that some of the rest of the EST library may have */ +/* awb Dec 30 1998 */ +/* */ +/****************************************************************************/ + +The licence for the files in libtu/snprintf_2.2: + +-- +The Frontier Artistic License Version 1.0 +Derived from the Artistic License at OpenSource.org. +Submitted to OpenSource.org for Open Source Initiative certification. + +Preamble + +The intent of this document is to state the conditions under which a +Package may be copied, such that the Copyright Holder maintains some +semblance of artistic control over the development of the package, +while giving the users of the package the right to use and distribute +the Package in a more-or-less customary fashion, plus the right to +make reasonable modifications. + +Definitions + + "Package" refers to the script, suite, file, or collection of + scripts, suites, and/or files distributed by the Copyright Holder, + and to derivatives of that Package created through textual modification. + + "Standard Version" refers to such a Package if it has not been + modified, or has been modified in accordance with the wishes of + the Copyright Holder. + + "Copyright Holder" is whoever is named in the copyright statement + or statements for the package. + + "You" is you, if you're thinking about copying or distributing + this Package. + + "Reasonable copying fee" is whatever you can justify on the basis + of media cost, duplication charges, time of people involved, and + so on. (You will not be required to justify it to the Copyright + Holder, but only to the computing community at large as a market + that must bear the fee.) + + "Freely Available" means that no fee is charged for the item + itself, though there may be fees involved in handling the item. + It also means that recipients of the item may redistribute it under + the same conditions they received it. + + +Terms + +1. You may make and give away verbatim copies of the source form of +the Standard Version of this Package without restriction, provided +that you duplicate all of the original copyright notices and +associated disclaimers. + +2. You may apply bug fixes, portability fixes, and other modifications +derived from the Public Domain or from the Copyright Holder. A Package +modified in such a way shall still be considered the Standard Version. + +3. You may otherwise modify your copy of this Package in any way, +provided that you insert a prominent notice in each changed script, +suite, or file stating how and when you changed that script, suite, +or file, and provided that you do at least ONE of the following: + + a) Use the modified Package only within your corporation or + organization, or retain the modified Package solely for personal use. + + b) Place your modifications in the Public Domain or otherwise make + them Freely Available, such as by posting said modifications to Usenet + or an equivalent medium, or placing the modifications on a major archive + site such as ftp.uu.net, or by allowing the Copyright Holder to include + your modifications in the Standard Version of the Package. + + c) Rename any non-standard executables so the names do not conflict + with standard executables, which must also be provided, and provide + a separate manual page (or equivalent) for each non-standard executable + that clearly documents how it differs from the Standard Version. + + d) Make other distribution arrangements with the Copyright Holder. + +4. You may distribute the programs of this Package in object code or +executable form, provided that you do at least ONE of the following: + + a) Distribute a Standard Version of the executables and library + files, together with instructions (in the manual page or + equivalent) on where to get the Standard Version. + + b) Accompany the distribution with the machine-readable source of + the Package with your modifications. + + c) Accompany any non-standard executables with their corresponding + Standard Version executables, give the non-standard executables + non-standard names, and clearly document the differences in manual + pages (or equivalent), together with instructions on where to get + the Standard Version. + + d) Make other distribution arrangements with the Copyright Holder. + +5. You may charge a reasonable copying fee for any distribution of +this Package. You may charge any fee you choose for support of this +Package. You may not charge a fee for this Package itself. However, +you may distribute this Package in aggregate with other (possibly +commercial) programs as part of a larger (possibly commercial) +software distribution provided that you do not advertise this Package +as a product of your own. + +6. The scripts and library files supplied as input to or produced as +output from the programs of this Package do not automatically fall +under the copyright of this Package, but belong to whomever generated +them, and may be sold commercially, and may be aggregated with this +Package. + +7. Scripts, suites, or programs supplied by you that depend on or +otherwise make use of this Package shall not be considered part of +this Package. + +8. The name of the Copyright Holder may not be used to endorse or +promote products derived from this software without specific prior +written permission. + +9. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF +MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. + + The End + + +http://www.spinwardstars.com/frontier/fal.html +-- + +The Clarified Artistic License: + +-- +The Clarified Artistic License + +Preamble + +The intent of this document is to state the conditions under which a +Package may be copied, such that the Copyright Holder maintains some +semblance of artistic control over the development of the package, while +giving the users of the package the right to use and distribute the Package +in a more-or-less customary fashion, plus the right to make reasonable +modifications. + +Definitions: + +"Package" refers to the collection of files distributed by the Copyright +Holder, and derivatives of that collection of files created through textual +modification. +"Standard Version" refers to such a Package if it has not been modified, or +has been modified in accordance with the wishes of the Copyright Holder as +specified below. +"Copyright Holder" is whoever is named in the copyright or copyrights for +the package. +"You" is you, if you're thinking about copying or distributing this +Package. +"Distribution fee" is a fee you charge for providing a copy of this Package +to another party. +"Freely Available" means that no fee is charged for the right to use the +item, though there may be fees involved in handling the item. It also means +that recipients of the item may redistribute it under the same conditions +they received it. + + 1. You may make and give away verbatim copies of the source form of the + Standard Version of this Package without restriction, provided that you + duplicate all of the original copyright notices and associated + disclaimers. + 2. You may apply bug fixes, portability fixes and other modifications + derived from the Public Domain, or those made Freely Available, or from + the Copyright Holder. A Package modified in such a way shall still be + considered the Standard Version. + 3. You may otherwise modify your copy of this Package in any way, provided + that you insert a prominent notice in each changed file stating how and + when you changed that file, and provided that you do at least ONE of + the following: + + 1. place your modifications in the Public Domain or otherwise make them + Freely Available, such as by posting said modifications to Usenet + or an equivalent medium, or placing the modifications on a major + network archive site allowing unrestricted access to them, or by + allowing the Copyright Holder to include your modifications in the + Standard Version of the Package. + 2. use the modified Package only within your corporation or + organization. + 3. rename any non-standard executables so the names do not conflict + with standard executables, which must also be provided, and provide + a separate manual page for each non-standard executable that + clearly documents how it differs from the Standard Version. + 4. make other distribution arrangements with the Copyright Holder. + 5. permit and encourge anyone who receives a copy of the modified + Package permission to make your modifications Freely Available in + some specific way. + + 4. You may distribute the programs of this Package in object code or + executable form, provided that you do at least ONE of the following: + + 1. distribute a Standard Version of the executables and library files, + together with instructions (in the manual page or equivalent) on + where to get the Standard Version. + 2. accompany the distribution with the machine-readable source of the + Package with your modifications. + 3. give non-standard executables non-standard names, and clearly + document the differences in manual pages (or equivalent), together + with instructions on where to get the Standard Version. + 4. make other distribution arrangements with the Copyright Holder. + 5. offer the machine-readable source of the Package, with your + modifications, by mail order. + + 5. You may charge a distribution fee for any distribution of this Package. + If you offer support for this Package, you may charge any fee you + choose for that support. You may not charge a license fee for the right + to use this Package itself. You may distribute this Package in + aggregate with other (possibly commercial and possibly nonfree) + programs as part of a larger (possibly commercial and possibly nonfree) + software distribution, and charge license fees for other parts of that + software distribution, provided that you do not advertise this Package + as a product of your own. If the Package includes an interpreter, You + may embed this Package's interpreter within an executable of yours (by + linking); this shall be construed as a mere form of aggregation, + provided that the complete Standard Version of the interpreter is so + embedded. + 6. The scripts and library files supplied as input to or produced as output + from the programs of this Package do not automatically fall under the + copyright of this Package, but belong to whoever generated them, and + may be sold commercially, and may be aggregated with this Package. If + such scripts or library files are aggregated with this Package via the + so-called "undump" or "unexec" methods of producing a binary executable + image, then distribution of such an image shall neither be construed as + a distribution of this Package nor shall it fall under the restrictions + of Paragraphs 3 and 4, provided that you do not represent such an + executable image as a Standard Version of this Package. + 7. C subroutines (or comparably compiled subroutines in other languages) + supplied by you and linked into this Package in order to emulate + subroutines and variables of the language defined by this Package shall + not be considered part of this Package, but are the equivalent of input + as in Paragraph 6, provided these subroutines do not change the + language in any way that would cause it to fail the regression tests + for the language. + 8. Aggregation of the Standard Version of the Package with a commercial + distribution is always permitted provided that the use of this Package + is embedded; that is, when no overt attempt is made to make this + Package's interfaces visible to the end user of the commercial + distribution. Such use shall not be construed as a distribution of this + Package. + 9. The name of the Copyright Holder may not be used to endorse or promote + products derived from this software without specific prior written + permission. +10. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED + WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF + MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. +-- diff --git a/debian/default/ion3 b/debian/default/ion3 new file mode 100644 index 0000000..49aa188 --- /dev/null +++ b/debian/default/ion3 @@ -0,0 +1,2 @@ +META="Mod1+" +ALTMETA="" diff --git a/debian/faq.html b/debian/faq.html new file mode 100644 index 0000000..f6e5c9f --- /dev/null +++ b/debian/faq.html @@ -0,0 +1,125 @@ + + + + +Ion FAQ + + + + + + + + + +
+ + + +Ion/ + + + +
+ + + + + + + +
+

+Ion FAQ +

+ +

These pages attempt to answer some of the questions most frequently asked +regarding Ion.

+ +

+Ion FAQ – All entries
+ +Posted 2006-08-12 12:37 EEST + + +

+ +

+Ion FAQ – Features
+ +Posted 2005-03-14 00:15 EET + + +

+ +

+Ion FAQ – Bug candidates
+ +Posted 2005-03-14 00:15 EET + + +

+ +

+Ion FAQ – How to
+ +Posted 2005-03-14 00:15 EET + + +

+ +

+Ion FAQ – Miscellaneous
+ +Posted 2005-03-14 00:15 EET + + +

+ +
+ + + + + + diff --git a/debian/ion3-dev.dirs b/debian/ion3-dev.dirs new file mode 100644 index 0000000..1da8fba --- /dev/null +++ b/debian/ion3-dev.dirs @@ -0,0 +1 @@ +usr/share/lintian/overrides diff --git a/debian/ion3-dev.install b/debian/ion3-dev.install new file mode 100644 index 0000000..fef7544 --- /dev/null +++ b/debian/ion3-dev.install @@ -0,0 +1,5 @@ +build/system-inc.mk build/rules.mk usr/share/ion3/build +install-sh config.h system.mk usr/lib/ion3 +build/libs.mk usr/lib/ion3/build +libextl/libextl-mkexports usr/lib/ion3/libextl +debian/overrides/ion3-dev usr/share/lintian/overrides diff --git a/debian/ion3-dev.links b/debian/ion3-dev.links new file mode 100644 index 0000000..fb8fea1 --- /dev/null +++ b/debian/ion3-dev.links @@ -0,0 +1,6 @@ +usr/share/ion3/build/system-inc.mk usr/include/ion3/build/system-inc.mk +usr/share/ion3/build/rules.mk usr/include/ion3/build/rules.mk +usr/lib/ion3/config.h usr/include/ion3/config.h +usr/lib/ion3/system.mk usr/include/ion3/system.mk +usr/lib/ion3/build/libs.mk usr/include/ion3/build/libs.mk +usr/lib/ion3/libextl/libextl-mkexports usr/include/ion3/libextl/libextl-mkexports diff --git a/debian/ion3-doc.doc-base.config b/debian/ion3-doc.doc-base.config new file mode 100644 index 0000000..2bd6463 --- /dev/null +++ b/debian/ion3-doc.doc-base.config @@ -0,0 +1,14 @@ +Document: ion3-doc-config +Title: Ion: Configuring and extending with Lua (ion3) +Author: Tuomo Valkonen +Abstract: This document describes how to configure and extend the window + manager Ion (version 3). +Section: WindowManagers + +Format: HTML +Index: /usr/share/doc/ion3-doc/ionconf/index.html +Files: /usr/share/doc/ion3-doc/ionconf/* + +Format: HTML +Index: /usr/share/doc/ion3-doc/ionnotes/index.html +Files: /usr/share/doc/ion3-doc/ionnotes/* diff --git a/debian/ion3-doc.docs b/debian/ion3-doc.docs new file mode 100644 index 0000000..3e65e4f --- /dev/null +++ b/debian/ion3-doc.docs @@ -0,0 +1,2 @@ +doc/ionconf +doc/ionnotes diff --git a/debian/ion3.README.Debian b/debian/ion3.README.Debian new file mode 100644 index 0000000..0e4b90f --- /dev/null +++ b/debian/ion3.README.Debian @@ -0,0 +1,15 @@ +Ion3 +---- + +Instructions for using Ion can be found in the manual page +("man ion3"). There's documentation for the configuration files in the +ion3-doc package. + +Note that this is a development snapshot. Some of the examples, and +some of the documentation, is out of date. Most notably, the binding +configuration syntax has changed. + +Ion2 included some nice scripts, which have been moved into a separate package +for Ion3, called ion3-scripts. + + -- Norbert Tretkowski Sat, 6 Aug 2005 20:19:25 +0200 diff --git a/debian/ion3.desktop b/debian/ion3.desktop new file mode 100644 index 0000000..f669301 --- /dev/null +++ b/debian/ion3.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Ion3 +Comment=Ion window manager (version 3) +Comment[cs]=Správce oken Ion (verze 3) +Exec=/usr/bin/ion3 +Type=Application diff --git a/debian/ion3.dirs b/debian/ion3.dirs new file mode 100644 index 0000000..f19247e --- /dev/null +++ b/debian/ion3.dirs @@ -0,0 +1,3 @@ +var/lib/ion3 +usr/share/xsessions +usr/share/lintian/overrides diff --git a/debian/ion3.docs b/debian/ion3.docs new file mode 100644 index 0000000..6f89bd3 --- /dev/null +++ b/debian/ion3.docs @@ -0,0 +1 @@ +debian/faq.html diff --git a/debian/ion3.install b/debian/ion3.install new file mode 100644 index 0000000..bd82f5f --- /dev/null +++ b/debian/ion3.install @@ -0,0 +1,3 @@ +debian/ion3.desktop debian/pwm3.desktop usr/share/xsessions +debian/default etc +debian/overrides/ion3 usr/share/lintian/overrides diff --git a/debian/ion3.links b/debian/ion3.links new file mode 100644 index 0000000..0a55d40 --- /dev/null +++ b/debian/ion3.links @@ -0,0 +1,3 @@ +var/lib/ion3/debian-menu.lua usr/share/ion3/debian-menu.lua +var/lib/ion3/debian-menu-i18n.lua usr/share/ion3/debian-menu-i18n.lua +etc/default/ion3 etc/X11/ion3/cfg_debian.lua diff --git a/debian/ion3.menu b/debian/ion3.menu new file mode 100644 index 0000000..df00a9b --- /dev/null +++ b/debian/ion3.menu @@ -0,0 +1,4 @@ +?package(ion3):needs="wm" section="WindowManagers" \ + title="Ion3" command="/usr/bin/ion3" +?package(ion3):needs="wm" section="WindowManagers" \ + title="PWM3" command="/usr/bin/pwm3" diff --git a/debian/ion3.menu-method b/debian/ion3.menu-method new file mode 100644 index 0000000..b8035f3 --- /dev/null +++ b/debian/ion3.menu-method @@ -0,0 +1,38 @@ +#!/usr/bin/install-menu +# by Iwan Heskamp +# http://tdm120.el.utwente.nl/~hkp/pwm/ +# Modified for Ion by Per Olofsson + +compat="menu-1" + +!include menu.h + +compat="menu-2" + +outputencoding="ISO-8859-1"; + +function q($arg) = esc($arg, "\\\""); +function qc($arg) = esc($arg, "\\'"); + +function entry($action)=" menuentry(\"" q(title()) "\", \"" + q($action) "\"),\n"; +function entry_exec($command)=entry("ioncore.exec('" qc($command) "')"); + +supported; + x11 = entry_exec($command); + wm = entry("ioncore.restart_other('" qc($command) "')"); + text = entry_exec(term()); +endsupported; + + +startmenu="defmenu(\"" $section "\", {\n"; +endmenu="})\n\n"; +genmenu="debian-menu.lua"; +submenutitle=" submenu(\"" $title "\", \"" $section "\"),\n"; +preoutput="\n"; +mainmenutitle="Debian"; +rootsection="Debian"; +rootprefix="/var/lib/ion3/"; +userprefix="/.ion3/"; + +preoutput= "-- Automatically generated file. Do not edit.\n-- (See /usr/share/doc/menu/menu.txt.gz)\n\n"; diff --git a/debian/ion3.menu-method.i18n b/debian/ion3.menu-method.i18n new file mode 100644 index 0000000..529e7a5 --- /dev/null +++ b/debian/ion3.menu-method.i18n @@ -0,0 +1,38 @@ +#!/usr/bin/install-menu +# by Iwan Heskamp +# http://tdm120.el.utwente.nl/~hkp/pwm/ +# Modified for Ion by Per Olofsson + +compat="menu-1" + +!include menu.h + +compat="menu-2" + +outputencoding="LOCALE"; + +function q($arg) = esc($arg, "\\\""); +function qc($arg) = esc($arg, "\\'"); + +function entry($action)=" menuentry(\"" q(title()) "\", \"" + q($action) "\"),\n"; +function entry_exec($command)=entry("ioncore.exec('" qc($command) "')"); + +supported; + x11 = entry_exec($command); + wm = entry("ioncore.restart_other('" qc($command) "')"); + text = entry_exec(term()); +endsupported; + + +startmenu="defmenu(\"" $section "\", {\n"; +endmenu="})\n\n"; +genmenu="debian-menu-i18n.lua"; +submenutitle=" submenu(\"" $title "\", \"" $section "\"),\n"; +preoutput="\n"; +mainmenutitle="Debian"; +rootsection="Debian"; +rootprefix="/var/lib/ion3/"; +userprefix="/.ion3/"; + +preoutput= "-- Automatically generated file. Do not edit.\n-- (See /usr/share/doc/menu/menu.txt.gz)\n\n"; diff --git a/debian/ion3.postinst b/debian/ion3.postinst new file mode 100644 index 0000000..00db807 --- /dev/null +++ b/debian/ion3.postinst @@ -0,0 +1,33 @@ +#!/bin/sh +set -e + +if [ -h /etc/X11/ion3/draw.lua ]; then + rm -f /etc/X11/ion3/draw.lua +fi + +ln -s look_clean.lua /etc/X11/ion3/draw.lua + +update-alternatives --install /usr/bin/ion ion /usr/bin/ion3 29 \ + --slave /usr/share/man/man1/ion.1.gz ion.1.gz \ + /usr/share/man/man1/ion3.1.gz + +update-alternatives --install \ + /usr/bin/x-window-manager x-window-manager /usr/bin/ion3 49 \ + --slave /usr/share/man/man1/x-window-manager.1.gz x-window-manager.1.gz \ + /usr/share/man/man1/ion3.1.gz + +update-alternatives --install \ + /usr/bin/x-window-manager x-window-manager /usr/bin/pwm3 48 \ + --slave /usr/share/man/man1/x-window-manager.1.gz x-window-manager.1.gz \ + /usr/share/man/man1/pwm3.1.gz + +# i18n menu method +inst=/etc/menu-methods/ion3-i18n +if [ -f $inst ]; then + chmod a+x $inst +fi + +#DEBHELPER# + +# Remove the old now-renamed generated Debian menu +rm -f /var/lib/ion3/debian-menus.lua diff --git a/debian/ion3.postrm b/debian/ion3.postrm new file mode 100644 index 0000000..b0c1812 --- /dev/null +++ b/debian/ion3.postrm @@ -0,0 +1,12 @@ +#!/bin/sh +set -e + +if [ "$1" = purge ]; then + rm -rf /etc/X11/ion3 +fi + +# i18n menu method +inst=/etc/menu-methods/ion3-i18n +if [ "$1" = "remove" ] && [ -f "$inst" ]; then chmod a-x $inst ; fi + +#DEBHELPER# diff --git a/debian/ion3.prerm b/debian/ion3.prerm new file mode 100644 index 0000000..a950ac5 --- /dev/null +++ b/debian/ion3.prerm @@ -0,0 +1,15 @@ +#!/bin/sh +set -e + +if [ "$1" = remove ] || [ "$1" = deconfigure ]; then + update-alternatives --remove x-window-manager /usr/bin/pwm3 + update-alternatives --remove x-window-manager /usr/bin/ion3 + update-alternatives --remove ion /usr/bin/ion3 +fi + +if [ "$1" = remove ]; then + rm -f /var/lib/ion3/debian-menu.lua + rm -f /var/lib/ion3/debian-menu-i18n.lua +fi + +#DEBHELPER# diff --git a/debian/overrides/ion3 b/debian/overrides/ion3 new file mode 100644 index 0000000..512095e --- /dev/null +++ b/debian/overrides/ion3 @@ -0,0 +1,13 @@ +ion3: unstripped-binary-or-object ./usr/lib/ion3/mod_query.so +ion3: unstripped-binary-or-object ./usr/lib/ion3/mod_menu.so +ion3: unstripped-binary-or-object ./usr/lib/ion3/mod_dock.so +ion3: unstripped-binary-or-object ./usr/lib/ion3/mod_sp.so +ion3: unstripped-binary-or-object ./usr/lib/ion3/mod_sm.so +ion3: unstripped-binary-or-object ./usr/lib/ion3/de.so +ion3: unstripped-binary-or-object ./usr/lib/ion3/mod_mgmtmode.so +ion3: unstripped-binary-or-object ./usr/lib/ion3/mod_tiling.so +ion3: binary-has-unneeded-section ./usr/lib/ion3/ion-statusd .comment +ion3: unstripped-binary-or-object ./usr/lib/ion3/mod_statusbar.so +ion3: binary-has-unneeded-section ./usr/lib/ion3/ion-completefile .comment +ion3: unstripped-binary-or-object ./usr/bin/ion3 +ion3: unstripped-binary-or-object ./usr/bin/pwm3 diff --git a/debian/overrides/ion3-dev b/debian/overrides/ion3-dev new file mode 100644 index 0000000..782fa64 --- /dev/null +++ b/debian/overrides/ion3-dev @@ -0,0 +1,3 @@ +ion3-dev: usr-doc-symlink-without-dependency ion3 +ion3-dev: script-not-executable ./usr/lib/ion3/libextl/libextl-mkexports +ion3-dev: unusual-interpreter ./usr/lib/ion3/libextl/libextl-mkexports #!/usr/bin/lua5.1 diff --git a/debian/packaging-notes.txt b/debian/packaging-notes.txt new file mode 100644 index 0000000..2900df0 --- /dev/null +++ b/debian/packaging-notes.txt @@ -0,0 +1,8 @@ +Debian packaging notes for Ion +------------------------------ + +The FAQ (debian/faq.html) can be updated from the web site by doing: + +sh update-faq + + -- Per Olofsson diff --git a/debian/patches/00list b/debian/patches/00list new file mode 100644 index 0000000..be9c541 --- /dev/null +++ b/debian/patches/00list @@ -0,0 +1,7 @@ +201_fix-paths.diff +202_fix-menus.diff +204_fix-bindings.diff +205_ion-lock.diff +206_use-xterm.diff +207_bindings-manpage.diff +209_use-etc-default.diff diff --git a/debian/patches/201_fix-paths.diff b/debian/patches/201_fix-paths.diff new file mode 100755 index 0000000..d9e744e --- /dev/null +++ b/debian/patches/201_fix-paths.diff @@ -0,0 +1,105 @@ +#! /bin/sh -e +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 +@DPATCH@ +diff -Nur ion-3ds-20060519.orig/system.mk ion-3ds-20060519/system.mk +--- ion-3ds-20060519.orig/system.mk 2006-05-18 18:06:53.000000000 -0500 ++++ ion-3ds-20060519/system.mk 2006-05-18 23:51:23.000000000 -0500 +@@ -7,7 +7,7 @@ + ## Installation paths + ## + +-PREFIX=/usr/local ++PREFIX=/usr + + # Unless you are creating a package conforming to some OS's standards, you + # probably do not want to modify the following directories: +@@ -15,7 +15,7 @@ + # Main binaries + BINDIR=$(PREFIX)/bin + # Configuration .lua files +-ETCDIR=$(PREFIX)/etc/ion3 ++ETCDIR=/etc/X11/ion3 + # Some .lua files and ion-* shell scripts + SHAREDIR=$(PREFIX)/share/ion3 + # Manual pages +@@ -27,11 +27,11 @@ + # Nothing at the moment + LIBDIR=$(PREFIX)/lib + # Modules +-MODULEDIR=$(LIBDIR)/ion3/mod ++MODULEDIR=$(LIBDIR)/ion3 + # Compiled Lua source code + LCDIR=$(LIBDIR)/ion3/lc + # ion-completefile (does not belong in SHAREDIR being a binary file) +-EXTRABINDIR=$(LIBDIR)/ion3/bin ++EXTRABINDIR=$(LIBDIR)/ion3 + # For ion-completeman system-wide cache + VARDIR=/var/cache/ion3 + # Message catalogs +@@ -56,18 +56,18 @@ + + # If you have installed Lua 5.1 from the official tarball without changing + # paths, this should do it. +-LUA_DIR=/usr/local +-LUA_LIBS = -L$(LUA_DIR)/lib -llua +-LUA_INCLUDES = -I$(LUA_DIR)/include +-LUA=$(LUA_DIR)/bin/lua +-LUAC=$(LUA_DIR)/bin/luac ++#LUA_DIR=/usr/local ++#LUA_LIBS = -L$(LUA_DIR)/lib -llua ++#LUA_INCLUDES = -I$(LUA_DIR)/include ++#LUA=$(LUA_DIR)/bin/lua ++#LUAC=$(LUA_DIR)/bin/luac + + # If you are using the Debian packages, the following settings should be + # what you want. +-#LUA_LIBS=`pkg-config --libs lua5.1` +-#LUA_INCLUDES=`pkg-config --cflags lua5.1` +-#LUA=`which lua5.1` +-#LUAC=`which luac5.1` ++LUA_LIBS=`pkg-config --libs lua5.1` ++LUA_INCLUDES=`pkg-config --cflags lua5.1` ++LUA=`which lua5.1` ++LUAC=`which luac5.1` + + + ## +@@ -107,7 +107,7 @@ + # asprintf and vasprintf in the c library. (gnu libc has.) + # If HAS_SYSTEM_ASPRINTF is not defined, an implementation + # in sprintf_2.2/ is used. +-#HAS_SYSTEM_ASPRINTF=1 ++HAS_SYSTEM_ASPRINTF=1 + + + # If you're on an archaic system (such as relatively recent *BSD releases) +@@ -144,14 +144,14 @@ + + #C89_SOURCE=-ansi + +-#POSIX_SOURCE=-D_POSIX_SOURCE ++POSIX_SOURCE=-D_POSIX_SOURCE + + # Most systems +-#XOPEN_SOURCE=-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED ++XOPEN_SOURCE=-D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED + # SunOS, (Irix) + #XOPEN_SOURCE=-D__EXTENSIONS__ + +-#C99_SOURCE=-std=c99 -DCF_HAS_VA_COPY ++C99_SOURCE=-std=c99 -DCF_HAS_VA_COPY + + # The -DCF_HAS_VA_COPY option should allow for some optimisations, and + # in some cases simply defining diff --git a/debian/patches/202_fix-menus.diff b/debian/patches/202_fix-menus.diff new file mode 100755 index 0000000..968ffa4 --- /dev/null +++ b/debian/patches/202_fix-menus.diff @@ -0,0 +1,44 @@ +#! /bin/sh -e +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac +exit 0 +@DPATCH@ +diff -Nur ion3-20060524.orig/etc/cfg_ioncore.lua ion3-20060524/etc/cfg_ioncore.lua +--- ion3-20060524.orig/etc/cfg_ioncore.lua 2006-05-24 18:23:26.000000000 +0200 ++++ ion3-20060524/etc/cfg_ioncore.lua 2006-07-29 11:14:57.000000000 +0200 +@@ -276,22 +276,20 @@ + defmenu("mainmenu", { + submenu("Programs", "appmenu"), + menuentry("Lock screen", "ioncore.exec_on(_, 'xlock')"), ++ menuentry("Lock screen", ++ "ioncore.exec_on(_, ioncore.lookup_script('ion-lock'))"), + menuentry("Help", "mod_query.query_man(_)"), + menuentry("About Ion", "mod_query.show_about_ion(_)"), + submenu("Styles", "stylemenu"), ++ submenu("Debian", "Debian"), + submenu("Session", "sessionmenu"), + }) + + + -- Application menu + defmenu("appmenu", { +- menuentry("XTerm", "ioncore.exec_on(_, 'xterm')"), +- menuentry("W3M", "ioncore.exec_on(_, ':w3m -v')"), +- menuentry("Rxvt", "ioncore.exec_on(_, 'rxvt')"), +- menuentry("Opera", "ioncore.exec_on(_, 'opera')"), +- menuentry("Links", "ioncore.exec_on(_, ':links')"), +- menuentry("Konqueror", "ioncore.exec_on(_, 'konqueror')"), +- menuentry("Dillo", "ioncore.exec_on(_, 'dillo')"), ++ menuentry("Terminal", "ioncore.exec_on(_, 'x-terminal-emulator')"), ++ menuentry("Browser", "ioncore.exec_on(_, 'sensible-browser')"), + menuentry("Run...", "mod_query.query_exec(_)"), + }) diff --git a/debian/patches/204_fix-bindings.diff b/debian/patches/204_fix-bindings.diff new file mode 100755 index 0000000..935cfe2 --- /dev/null +++ b/debian/patches/204_fix-bindings.diff @@ -0,0 +1,28 @@ +#! /bin/sh -e +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -Nur ion3-20061223.orig/etc/cfg_ioncore.lua ion3-20061223/etc/cfg_ioncore.lua +--- ion3-20061223.orig/etc/cfg_ioncore.lua 2006-12-23 15:59:43.000000000 +0100 ++++ ion3-20061223/etc/cfg_ioncore.lua 2006-12-23 16:39:46.000000000 +0100 +@@ -145,7 +145,7 @@ + kpress(META.."F1", "ioncore.exec_on(_, ':man ion3')"), + + bdoc("Run a terminal emulator."), +- kpress(ALTMETA.."F2", "ioncore.exec_on(_, XTERM or 'xterm')"), ++ kpress(ALTMETA.."F2", "ioncore.exec_on(_, XTERM or 'x-terminal-emulator')"), + + bdoc("Query for command line to execute."), + kpress(ALTMETA.."F3", "mod_query.query_exec(_)"), diff --git a/debian/patches/205_ion-lock.diff b/debian/patches/205_ion-lock.diff new file mode 100755 index 0000000..630d13b --- /dev/null +++ b/debian/patches/205_ion-lock.diff @@ -0,0 +1,38 @@ +#! /bin/sh -e +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -Nur ion3-20050322.orig/utils/Makefile ion3-20050322/utils/Makefile +--- ion3-20050322.orig/utils/Makefile 2005-03-22 14:31:06.000000000 +0000 ++++ ion3-20050322/utils/Makefile 2005-03-22 16:29:37.197355881 +0000 +@@ -11,7 +11,7 @@ + SUBDIRS=ion-completefile + INSTALL_SUBDIRS=$(SUBDIRS) + +-SHELLSCRIPTS = ion-runinxterm ion-completeman ++SHELLSCRIPTS = ion-runinxterm ion-completeman ion-lock + + TARGETS = ion-completeman + +diff -Nur ion3-20050322.orig/utils/ion-lock ion3-20050322/utils/ion-lock +--- ion3-20050322.orig/utils/ion-lock 1970-01-01 00:00:00.000000000 +0000 ++++ ion3-20050322/utils/ion-lock 2005-03-22 16:29:19.550092305 +0000 +@@ -0,0 +1,6 @@ ++#!/bin/sh ++if xscreensaver-command -version >/dev/null 2>&1; then ++ exec xscreensaver-command -lock ++else ++ exec xlock ++fi diff --git a/debian/patches/206_use-xterm.diff b/debian/patches/206_use-xterm.diff new file mode 100755 index 0000000..0f85ca4 --- /dev/null +++ b/debian/patches/206_use-xterm.diff @@ -0,0 +1,27 @@ +#! /bin/sh -e +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -Nur ion-3ds-20041104.orig/utils/ion-runinxterm ion-3ds-20041104/utils/ion-runinxterm +--- ion-3ds-20041104.orig/utils/ion-runinxterm 2003-05-30 21:17:53.000000000 +0000 ++++ ion-3ds-20041104/utils/ion-runinxterm 2004-12-05 15:57:53.000000000 +0000 +@@ -1,6 +1,6 @@ + #!/bin/sh + +-test "$XTERMCMD" || XTERMCMD="xterm" ++test "$XTERMCMD" || XTERMCMD="x-terminal-emulator" + + if test $# -lt 1; then + echo error diff --git a/debian/patches/207_bindings-manpage.diff b/debian/patches/207_bindings-manpage.diff new file mode 100755 index 0000000..5eee61e --- /dev/null +++ b/debian/patches/207_bindings-manpage.diff @@ -0,0 +1,133 @@ +#! /bin/sh -e +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -Nur ion3-20061020.orig/man/ion3.cs.in ion3-20061020/man/ion3.cs.in +--- ion3-20061020.orig/man/ion3.cs.in 2006-10-20 17:43:37.000000000 +0200 ++++ ion3-20061020/man/ion3.cs.in 2006-10-23 20:42:12.000000000 +0200 +@@ -81,6 +81,10 @@ + + .SS Globální pøiøazení + ++BINDINGS:WFrame ++ ++.SS Pøiøazení pro pøesun/zmìnu velikosti ++ + BINDINGS:WScreen + + .SS Pøiøazení pro práci s nejvy¹¹ími rámy a obrazovkami a jejich potomky +diff -Nur ion3-20061020.orig/man/ion3.fi.in ion3-20061020/man/ion3.fi.in +--- ion3-20061020.orig/man/ion3.fi.in 2006-10-20 17:43:36.000000000 +0200 ++++ ion3-20061020/man/ion3.fi.in 2006-10-23 20:42:12.000000000 +0200 +@@ -84,6 +84,10 @@ + + .SS Yleisesti saatavilla olevat sidonnat + ++BINDINGS:WFrame ++ ++.SS Siirto ja koonmuutostilan sidonnat ++ + BINDINGS:WScreen + + .SS Näytöillä tai ylimmän tason kehyksissä toimivat sidonnat +diff -Nur ion3-20061020.orig/man/ion3.in ion3-20061020/man/ion3.in +--- ion3-20061020.orig/man/ion3.in 2006-10-20 17:43:36.000000000 +0200 ++++ ion3-20061020/man/ion3.in 2006-10-23 20:42:12.000000000 +0200 +@@ -82,6 +82,10 @@ + + .SS Globally available bindings + ++BINDINGS:WFrame ++ ++.SS Move/resize mode bindings ++ + BINDINGS:WScreen + + .SS Bindings operating on top-level frames and screens and their children +diff -Nur ion3-20061020.orig/man/pwm3.cs.in ion3-20061020/man/pwm3.cs.in +--- ion3-20061020.orig/man/pwm3.cs.in 2006-10-20 17:43:36.000000000 +0200 ++++ ion3-20061020/man/pwm3.cs.in 2006-10-23 20:42:12.000000000 +0200 +@@ -56,6 +56,10 @@ + + .SS Globální pøiøazení + ++BINDINGS:WFrame ++ ++.SS Pøiøazení pro pøesun/zmìnu velikosti ++ + BINDINGS:WScreen + + .".SS Pøiøazení pro práci s rámy, obrazovkami a jejich potomky +@@ -64,10 +68,6 @@ + + .SS Pøiøazení pro práci s rámy a jejich potomky + +-BINDINGS:WFrame +- +-.SS Pøiøazení pro pøesun/zmìnu velikosti +- + BINDINGS:WMoveresMode + + .SS Pøiøazení pro plovoucí pracovní plochy [mod_floatws] +diff -Nur ion3-20061020.orig/man/pwm3.fi.in ion3-20061020/man/pwm3.fi.in +--- ion3-20061020.orig/man/pwm3.fi.in 2006-10-20 17:43:36.000000000 +0200 ++++ ion3-20061020/man/pwm3.fi.in 2006-10-23 20:42:12.000000000 +0200 +@@ -57,6 +57,10 @@ + + .SS Yleisesti saatavilla olevat sidonnat + ++BINDINGS:WFrame ++ ++.SS Siirto ja koonmuutostilan sidonnat ++ + BINDINGS:WScreen + + .\".SS Kehyksiä ja näyttöjä, sekä niiden lapsia käsittelevät sidonnat +@@ -65,10 +69,6 @@ + + .SS Kehyksiä, sekä niiden lapsia käsittelevät sidonnat + +-BINDINGS:WFrame +- +-.SS Siirto ja koonmuutostilan sidonnat +- + BINDINGS:WMoveresMode + + .SS Kelluvien työpöytien ja kehyksien sidonnat [mod_floatws] +diff -Nur ion3-20061020.orig/man/pwm3.in ion3-20061020/man/pwm3.in +--- ion3-20061020.orig/man/pwm3.in 2006-10-20 17:43:36.000000000 +0200 ++++ ion3-20061020/man/pwm3.in 2006-10-23 20:42:12.000000000 +0200 +@@ -57,6 +57,10 @@ + + .SS Globally available bindings + ++BINDINGS:WFrame ++ ++.SS Move/resize mode bindings ++ + BINDINGS:WScreen + + .".SS Bindings operating on both frames and screens and their children +@@ -65,10 +69,6 @@ + + .SS Bindings operating on frames and their children + +-BINDINGS:WFrame +- +-.SS Move/resize mode bindings +- + BINDINGS:WMoveresMode + + .SS Bindings for floating workspaces and frames [mod_floatws] diff --git a/debian/patches/208_build-docs-with-hevea.diff b/debian/patches/208_build-docs-with-hevea.diff new file mode 100644 index 0000000..8e9d026 --- /dev/null +++ b/debian/patches/208_build-docs-with-hevea.diff @@ -0,0 +1,261 @@ +#! /bin/sh -e +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -Nur ion3-20061015.orig/doc/artikel3.hva ion3-20061015/doc/artikel3.hva +--- ion3-20061015.orig/doc/artikel3.hva 1970-01-01 01:00:00.000000000 +0100 ++++ ion3-20061015/doc/artikel3.hva 2006-10-17 18:20:49.000000000 +0200 +@@ -0,0 +1 @@ ++\input{article.hva} +diff -Nur ion3-20061015.orig/doc/gpl.tex ion3-20061015/doc/gpl.tex +--- ion3-20061015.orig/doc/gpl.tex 2006-10-15 20:00:49.000000000 +0200 ++++ ion3-20061015/doc/gpl.tex 2006-10-17 18:20:49.000000000 +0200 +@@ -1,21 +1,29 @@ + \xchapter{The GNU General Public License} + + \begin{center} ++%BEGIN LATEX + {\parindent 0in ++%END LATEX + + Version 2, June 1991 + + Copyright \copyright\ 1989, 1991 Free Software Foundation, Inc. + ++%BEGIN LATEX + \bigskip ++%END LATEX + + 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + ++%BEGIN LATEX + \bigskip ++%END LATEX + + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. ++%BEGIN LATEX + } ++%END LATEX + \end{center} + + \begin{center} +diff -Nur ion3-20061015.orig/doc/ionconf.tex ion3-20061015/doc/ionconf.tex +--- ion3-20061015.orig/doc/ionconf.tex 2006-10-15 20:00:51.000000000 +0200 ++++ ion3-20061015/doc/ionconf.tex 2006-10-17 18:20:49.000000000 +0200 +@@ -56,17 +56,21 @@ + \markboth{\MakeUppercase{List of functions}}% + {\MakeUppercase{List of functions}}% + +-%begin{latexonly} ++\begin{latexonly} + \makeatletter + \def\fnlisti#1{\@dottedtocline{1}{0em}{1.5em}{\lstinline!#1!}{\pageref{fn:#1}}} + {\parskip\z@\input{fnlist}} + \makeatother +-%end{latexonly} ++\end{latexonly} + ++%BEGIN LATEX + \begin{htmlonly} ++%END LATEX + \newcommand{\fnlisti}[1]{\fnref{#1}\\} + \input{fnlist} ++%BEGIN LATEX + \end{htmlonly} ++%END LATEX + + \printindex + +diff -Nur ion3-20061015.orig/doc/macros.tex ion3-20061015/doc/macros.tex +--- ion3-20061015.orig/doc/macros.tex 2006-10-15 20:00:50.000000000 +0200 ++++ ion3-20061015/doc/macros.tex 2006-10-17 18:20:49.000000000 +0200 +@@ -14,6 +14,25 @@ + \usepackage[a4paper]{geometry} + \usepackage{calc} + ++% hevea style ++%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% ++ ++%BEGIN LATEX ++\begin{htmlonly} ++%END LATEX ++ ++\remakesection ++ {\chapter}{-1}{chapter} ++ {\@open{H1}{}}{\thechapter}{\quad}{\@close{H1}} ++\setcounter{tocdepth}{3} ++\setcounter{indexcols}{1} ++\renewcommand{\@table@attributes}{CELLSPACING=10 CELLPADDING=0} ++ ++%BEGIN LATEX ++\end{htmlonly} ++%END LATEX ++ ++ + % URL settings + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +@@ -23,7 +42,7 @@ + % listings package + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +-%begin{latexonly} ++%BEGIN LATEX + \usepackage{listings} + + \lstset{ +@@ -33,7 +52,7 @@ + alsoletter={",}, + alsoother={\_}, + } +-%end{latexonly} ++%END LATEX + + % Some markup + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +@@ -44,7 +63,7 @@ + \newcommand{\spec}[1]{#1} + \newcommand{\indextype}[1]{\index{#1@\type{#1}}} + +-%begin{latexonly} ++%BEGIN LATEX + \newcommand{\key}[1]{\mbox{\textbf{#1}}} + \newcommand{\code}[1]{\lstinline!#1!} + \newcommand{\var}[1]{\lstinline!#1!} +@@ -54,28 +73,33 @@ + \newcommand{\fnrefx}[2]{\hyperlink{fn:#1.#2}{\code{#2}}} + \newcommand{\fnref}[1]{\hyperlink{fn:#1}{\code{#1}}} + \newcommand{\myhref}[2]{\hyperlink{#1}{#2}} ++%END LATEX + +-%end{latexonly} ++%BEGIN LATEX + \begin{htmlonly} +- ++%END LATEX + \newcommand{\key}[1]{\textbf{#1}} + \newcommand{\code}[1]{\texttt{#1}} + \newcommand{\var}[1]{\texttt{#1}} + \newcommand{\command}[1]{\texttt{#1}} + +-\newcommand{\hyperlabel}[1]{\label{#1}} +-\newcommand{\fnref}[1]{\htmlref{\texttt{#1}}{fn:#1}} +-\newcommand{\fnrefx}[2]{\htmlref{\texttt{#2}}{fn:#1.#2}} +-\newcommand{\myhref}[2]{\htmlref{#2}{#1}} ++% docode is not present nor needed in hevea ++\newcommand{\docode}{} + ++\newcommand{\hyperlabel}[1]{\label{#1}} ++\newcommand{\fnref}[1]{\aname{fn:#1}{\texttt{#1}}} ++\newcommand{\fnrefx}[2]{\aname{fn:#1.#2}{\texttt{#1}}} ++\newcommand{\myhref}[2]{\ahref{#2}{#1}} ++%BEGIN LATEX + \end{htmlonly} ++%END LATEX + + \newcommand{\tabhead}[1]{\hline #1 \\ \hline} + + % function tables + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +-%begin{latexonly} ++%BEGIN LATEX + + \newcommand{\funclistlabel}[1]{#1\hfill} + \newenvironment{function}{ +@@ -96,8 +120,11 @@ + \end{list} + } + +-%end{latexonly} ++%END LATEX ++ ++%BEGIN LATEX + \begin{htmlonly} ++%END LATEX + + \newenvironment{function}{ + \begin{description} +@@ -105,7 +132,9 @@ + \end{description} + } + ++%BEGIN LATEX + \end{htmlonly} ++%END LATEX + + + \newcommand{\synopsis}[1]{ +@@ -128,7 +157,7 @@ + % While rapport3/artikel3 are otherwise nice classes, + % itemize looks awful. + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +-%begin{latexonly} ++%BEGIN LATEX + \makeatletter + \renewenvironment{itemize}{% + \ifnum \@itemdepth >3 +@@ -148,4 +177,4 @@ + \fi} + {\global\@ignoretrue \endlist} + \makeatletter +-%end{latexonly} ++%END LATEX +diff -Nur ion3-20061015.orig/doc/Makefile ion3-20061015/doc/Makefile +--- ion3-20061015.orig/doc/Makefile 2006-10-15 20:00:50.000000000 +0200 ++++ ion3-20061015/doc/Makefile 2006-10-17 18:21:16.000000000 +0200 +@@ -1,10 +1,13 @@ + # Settings + ###################################### + +-TOPDIR=../ion-3 ++TOPDIR=.. + + include $(TOPDIR)/build/system-inc.mk + ++HEVEA=hevea ++HACHA=hacha ++ + L2H=latex2html -show_section_numbers -short_index -local_icons -noaddress \ + -up_url http://iki.fi/tuomov/ion/ -up_title "Ion homepage" -nofootnode\ + ## -style greyviolet.css +@@ -58,8 +61,11 @@ + makeindex ionconf.idx + latex ionconf + +-ionconf-html: +- $(L2H) -split 3 ionconf ++ionconf-html: ++ $(HEVEA) -fix ionconf 2>&1 | grep -v 'occuring outside math mode' ++ rm -rf ionconf ++ mkdir ionconf ++ cd ionconf && $(HACHA) ../ionconf.html + + fntexes: $(FNTEXES) + +@@ -97,6 +103,7 @@ + rm -f $(FNTEXES) fnlist.tex + rm -f *.aux *.toc *.log + rm -f *.idx *.ild *.ilg *.ind ++ rm -f *.haux *.hind *.htoc *.html .log + + realclean: clean + rm -f *.ps *.pdf *.dvi +diff -Nur ion3-20061015.orig/doc/rapport3.hva ion3-20061015/doc/rapport3.hva +--- ion3-20061015.orig/doc/rapport3.hva 1970-01-01 01:00:00.000000000 +0100 ++++ ion3-20061015/doc/rapport3.hva 2006-10-17 18:20:49.000000000 +0200 +@@ -0,0 +1 @@ ++\input{report.hva} diff --git a/debian/patches/209_use-etc-default.diff b/debian/patches/209_use-etc-default.diff new file mode 100755 index 0000000..190bc8b --- /dev/null +++ b/debian/patches/209_use-etc-default.diff @@ -0,0 +1,29 @@ +#! /bin/sh -e +if [ $# -ne 1 ]; then + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1 +fi +case "$1" in + -patch) patch -f --no-backup-if-mismatch -p1 < $0;; + -unpatch) patch -f --no-backup-if-mismatch -R -p1 < $0;; + *) + echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" + exit 1;; +esac + +exit 0 + +@DPATCH@ +diff -Nur ion3-20060317.orig/etc/cfg_ion.lua ion3-20060317/etc/cfg_ion.lua +--- ion3-20060317.orig/etc/cfg_ion.lua 2006-03-17 20:43:04.000000000 +0100 ++++ ion3-20060317/etc/cfg_ion.lua 2006-03-17 22:16:02.000000000 +0100 +@@ -12,6 +12,9 @@ + --META="Mod1+" + --ALTMETA="" + ++-- Debian sets the META and ALTMETA keys in /etc/default/ion3. ++dopath("cfg_debian") ++ + -- Some basic settings + ioncore.set{ + -- Maximum delay between clicks in milliseconds to be considered a diff --git a/debian/patches/extra/debian-menu.cfg b/debian/patches/extra/debian-menu.cfg new file mode 100644 index 0000000..03b5007 --- /dev/null +++ b/debian/patches/extra/debian-menu.cfg @@ -0,0 +1,9 @@ + +-- Auto-generated Debian menu definitions +if os.execute("test -x /usr/bin/update-menus") == 0 then + if ioncore.is_i18n() then + dopath("debian-menu-i18n") + else + dopath("debian-menu") + end +end diff --git a/debian/pwm3.desktop b/debian/pwm3.desktop new file mode 100644 index 0000000..e0a0916 --- /dev/null +++ b/debian/pwm3.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=PWM3 +Comment=PWM window manager (version 3) +Comment[cs]=Správce oken PWM (verze 3) +Exec=/usr/bin/pwm3 +Type=Application diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..ecb721e --- /dev/null +++ b/debian/rules @@ -0,0 +1,164 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +export SHELL=/bin/bash + +include /usr/share/dpatch/dpatch.make + +PACKAGE := ion3 +PACKAGE_DEV := $(PACKAGE)-dev +INSTDIR := debian/$(PACKAGE) +INSTDIR_DEV := debian/$(PACKAGE_DEV) + +doc-orig: + cp -R doc doc-orig + +build-indep: build-indep-stamp +build-indep-stamp: doc-orig patch + dh_testdir + + cd libextl && $(MAKE) libextl-mkexports + #cd doc && $(MAKE) all all-pdf + + touch build-indep-stamp + +build-arch: build-arch-stamp +build-arch-stamp: doc-orig patch + dh_testdir + + $(MAKE) + + touch build-arch-stamp + +build: build-indep build-arch + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-indep-stamp build-arch-stamp + + $(MAKE) realclean + + if [ -d doc-orig ]; then \ + rm -rf doc; \ + mv doc-orig doc; \ + fi + + dh_clean + +install-indep: build-indep + dh_testdir + dh_testroot + dh_clean -i -k + dh_installdirs -i + dh_install -i + +# install headers + find . \( -name debian -o -name config.h -o -name snprintf.h \) \ + -prune -o -name '*.h' -exec install -m644 -D {} \ + $(INSTDIR_DEV)/usr/include/$(PACKAGE)/{} \; + +install-arch: build-arch + dh_testdir + dh_testroot + dh_clean -a -k + dh_installdirs -a + + $(MAKE) install \ + PREFIX=$(CURDIR)/$(INSTDIR)/usr \ + ETCDIR=$(CURDIR)/$(INSTDIR)/etc/X11/$(PACKAGE) + +# install other things (mainly -dev) + dh_install -a + +# fix the installation + rm -f $(INSTDIR)/etc/X11/$(PACKAGE)/draw.lua + +binary-indep: build-indep install-indep + dh_testdir + dh_testroot + +# automatically keep track of api version + echo Ion:ApiVersion=$$((cat version.h; echo ION_API_VERSION) \ + | cpp -P | tail -1 | sed 's/"//g') >>debian/ion3-dev.substvars + + dh_link -p$(PACKAGE_DEV) usr/share/doc/$(PACKAGE) \ + usr/share/doc/$(PACKAGE_DEV) + + dh_installchangelogs -i + dh_installdocs -i + +# dh_installexamples -i +# dh_install -i +# dh_installmenu -i +# dh_installdebconf -i +# dh_installlogrotate -i +# dh_installemacsen -i +# dh_installpam -i +# dh_installmime -i +# dh_installinit -i +# dh_installcron -i +# dh_installinfo -i +# dh_undocumented -i +# dh_installman -i +# dh_link -i +# dh_strip -i + dh_compress -i + dh_fixperms -i +# dh_perl -i +# dh_python -i +# dh_makeshlibs -i + dh_installdeb -i +# dh_shlibdeps -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +binary-arch: build-arch install-arch + dh_testdir + dh_testroot + +# automatically keep track of api version + echo Ion:ApiVersion=$$((cat version.h; echo ION_API_VERSION) \ + | cpp -P | tail -1 | sed 's/"//g') >>debian/ion3.substvars + + dh_installchangelogs -a + dh_installdocs -a + rm -f $(INSTDIR)/usr/share/doc/ion3/LICENSE + mv $(INSTDIR)/usr/share/doc/ion3/ChangeLog $(INSTDIR)/usr/share/doc/ion3/changelog +# dh_installexamples -a +# dh_install -a + dh_installmenu -a + install -m644 debian/ion3.menu-method.i18n \ + $(INSTDIR)/etc/menu-methods/ion3-i18n + + cat $(CURDIR)/debian/patches/extra/debian-menu.cfg >> $(INSTDIR)/etc/X11/ion3/cfg_ioncore.lua + +# dh_installdebconf -a +# dh_installlogrotate -a +# dh_installemacsen -a +# dh_installpam -a +# dh_installmime -a +# dh_installinit -a +# dh_installcron -a +# dh_installinfo -a +# dh_undocumented -a +# dh_installman -a + dh_link -a +# dh_strip -a + dh_compress -a -X.lua + dh_fixperms -a +# dh_perl -a +# dh_python -a +# dh_makeshlibs -a + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-indep binary-arch +.PHONY: build-indep build-arch build clean binary-indep binary-arch binary \ + install-indep install-arch unpatch diff --git a/debian/update-faq b/debian/update-faq new file mode 100644 index 0000000..cf1a5bd --- /dev/null +++ b/debian/update-faq @@ -0,0 +1,7 @@ +#!/bin/sh +set -e +mv faq.html faq.html.old +wget --convert-links http://modeemi.fi/~tuomov/ion/faq.html +sed 's/ faq.html~ +mv faq.html~ faq.html +rm faq.html.old