From 3b45e98059a6786ced3fcce450bb177adbb18bbb Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 4 Nov 2007 16:27:19 +0000 Subject: [PATCH] Started renaming. Removed postinst version check from particleman. Changed debian/rules and debian/get-orig-source to get the package name from the changelog. --- debian/NEWS | 6 ++ debian/changelog | 6 ++ debian/control | 44 +++++----- debian/copyright | 88 +++---------------- debian/get-orig-source | 11 ++- debian/ion3-dev.install | 5 -- debian/ion3-dev.links | 6 -- debian/ion3-doc.doc-base.config | 10 --- debian/ion3-doc.doc-base.notes | 10 --- debian/ion3.desktop | 7 -- debian/ion3.install | 4 - debian/ion3.links | 3 - debian/ion3.menu | 4 - debian/ion3.postinst | 77 ---------------- debian/ion3.prerm | 15 ---- debian/overrides/ion3-dev | 2 - debian/overrides/particleman-dev | 2 + .../{ion3-dev.dirs => particleman-dev.dirs} | 0 debian/particleman-dev.install | 5 ++ debian/particleman-dev.links | 9 ++ debian/particleman-doc.doc-base.config | 10 +++ debian/particleman-doc.doc-base.notes | 10 +++ .../{ion3-doc.docs => particleman-doc.docs} | 0 ...EADME.Debian => particleman.README.Debian} | 46 +++++----- debian/particleman.desktop | 7 ++ debian/{ion3.dirs => particleman.dirs} | 2 +- debian/particleman.install | 3 + debian/particleman.links | 5 ++ debian/particleman.menu | 4 + ...n3.menu-method => particleman.menu-method} | 2 +- ...thod.i18n => particleman.menu-method.i18n} | 2 +- debian/particleman.postinst | 33 +++++++ debian/{ion3.postrm => particleman.postrm} | 6 +- debian/particleman.prerm | 15 ++++ .../{ion3.templates => particleman.templates} | 0 debian/rules | 16 ++-- 36 files changed, 190 insertions(+), 285 deletions(-) delete mode 100644 debian/ion3-dev.install delete mode 100644 debian/ion3-dev.links delete mode 100644 debian/ion3-doc.doc-base.config delete mode 100644 debian/ion3-doc.doc-base.notes delete mode 100644 debian/ion3.desktop delete mode 100644 debian/ion3.install delete mode 100644 debian/ion3.links delete mode 100644 debian/ion3.menu delete mode 100644 debian/ion3.postinst delete mode 100644 debian/ion3.prerm delete mode 100644 debian/overrides/ion3-dev create mode 100644 debian/overrides/particleman-dev rename debian/{ion3-dev.dirs => particleman-dev.dirs} (100%) create mode 100644 debian/particleman-dev.install create mode 100644 debian/particleman-dev.links create mode 100644 debian/particleman-doc.doc-base.config create mode 100644 debian/particleman-doc.doc-base.notes rename debian/{ion3-doc.docs => particleman-doc.docs} (100%) rename debian/{ion3.README.Debian => particleman.README.Debian} (50%) create mode 100644 debian/particleman.desktop rename debian/{ion3.dirs => particleman.dirs} (70%) create mode 100644 debian/particleman.install create mode 100644 debian/particleman.links create mode 100644 debian/particleman.menu rename debian/{ion3.menu-method => particleman.menu-method} (96%) rename debian/{ion3.menu-method.i18n => particleman.menu-method.i18n} (96%) create mode 100644 debian/particleman.postinst rename debian/{ion3.postrm => particleman.postrm} (57%) create mode 100644 debian/particleman.prerm rename debian/{ion3.templates => particleman.templates} (100%) diff --git a/debian/NEWS b/debian/NEWS index aaa58bd..7c6dcd9 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,3 +1,9 @@ +particleman (20070927-1) unstable; urgency=low + + * Renamed to produce a DFSG-compliant package + + -- Ben Hutchings Sun, 04 Nov 2007 15:08:50 +0000 + ion3 (20070506-1) unstable; urgency=low * Ion3 is now in the non-free section due to a trademark claim and diff --git a/debian/changelog b/debian/changelog index e23c951..2bd7da0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +particleman (20070927-1) unstable; urgency=low + + * Renamed to produce a DFSG-compliant package + + -- Ben Hutchings Sun, 04 Nov 2007 14:49:46 +0000 + ion3 (20070927-1) unstable; urgency=low * New upstream release diff --git a/debian/control b/debian/control index 1f2fba9..2bd33f7 100644 --- a/debian/control +++ b/debian/control @@ -1,19 +1,21 @@ -Source: ion3 -Section: non-free/x11 +Source: particleman +Section: x11 Priority: extra Maintainer: Ben Hutchings Standards-Version: 3.7.2.0 Build-Depends: debhelper (>= 4.1.16), gcc (>> 3), libx11-dev, libxext-dev, libsm-dev, liblua5.1-0-dev, lua5.1, quilt, pkg-config, groff-base, po-debconf -Package: ion3 -Section: non-free/x11 +Package: particleman +Section: x11 Architecture: any Depends: ${shlibs:Depends}, xterm | x-terminal-emulator, debconf, xbase-clients -Recommends: devscripts, libwww-perl, xfonts-75dpi | xfonts-75dpi-transcoded | xfonts-100dpi | xfonts-100dpi-transcoded +Recommends: xfonts-75dpi | xfonts-75dpi-transcoded | xfonts-100dpi | xfonts-100dpi-transcoded Suggests: menu (>= 2.1.9), docker, ion3-scripts -Conflicts: ion (<< 0.0.20020207-7), ion3-old -Provides: x-window-manager, ion3-api-${Ion:ApiVersion} +Conflicts: ion (<< 0.0.20020207-7), ion3, ion3-old +Provides: x-window-manager, ion3, ion3-api-${Ion:ApiVersion} Description: keyboard-friendly window manager with tiled windows + ParticleMan is a free version of the Ion3 window manager. + . 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 @@ -23,27 +25,27 @@ Description: keyboard-friendly window manager with tiled windows 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. - . - Homepage: http://iki.fi/tuomov/ion/ + approach. A pwm3 binary is included which starts ParticleMan with + floating workspaces as the default, thus replacing the now obsolete + PWM window manager. -Package: ion3-dev -Section: non-free/devel +Package: particleman-dev +Section: devel Priority: extra Architecture: all Depends: libx11-dev, libsm-dev, lua5.1, gcc (>> 3) -Description: ion3 development files +Conflicts: ion3-dev +Provides: ion3-dev +Description: development files This package contains the files necessary for building extension - modules to the Ion window manager. + modules to the ParticleMan or Ion3 window managers. -Package: ion3-doc -Section: non-free/doc +Package: particleman-doc +Section: doc Architecture: all Recommends: lynx | www-browser Suggests: doc-base, dwww | doc-central | dhelp -Description: ion3 documentation +Description: ParticleMan documentation This package contains the document 'Configuring and extending Ion3 - with Lua' which explains how to configure and extend the Ion window - manager. + with Lua' which explains how to configure and extend the ParticleMan + or Ion3 window managers. diff --git a/debian/copyright b/debian/copyright index 7e986a0..d10dff3 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,5 @@ -This is the Debian-packaged version of Ion3. +This is a Debian-packaged version of Ion3, renamed to ParticleMan to +comply with the Debian Free Software Guidelines. The package was put together by Per Olofsson , based on the ion package created by Tommi Virtanen . It uses @@ -10,87 +11,18 @@ The author of Ion3 is Tuomo Valkonen . --- -The following notice applies to the Ion3 code and to the names "Ion", -"Ion3", etc.: +The following notice applies to the Ion3 code: Copyright (c) Tuomo Valkonen 1999-2007. The code of this project is "essentially" licensed under the LGPL, version -2.1, unless otherwise indicated in components taken from elsewhere. It is -reproduced below. Additionally, the following terms apply to the use of -the name of the project, Ion(tm), names of particular "branches" such as -Ion3(tm), and other derived names: - - If the name Ion(tm) or other names that can be associated with the Ion - project are used to distribute this software, then: - - - A version that does not significantly differ from one of the - original author's versions must be provided by default. - - - When there are no further prominent notices of possible out-datedness, - and no prominent original author's version qualifiers present (resp. - only branch qualifier is present), then the version distributed online - may not significantly differ from the original author's latest stable - release (resp. latest release on the branch) within a reasonable delay - (normally 28 days). The holders of physical distribution media must - be provided ways to upgrade to the latest release within this delay. - - - Significantly altered versions may be provided only if the user - explicitly requests for those modifications to be applied, and - is prominently notified that the software is no longer considered - the standard version, and is not supported by the original author. - The version string displayed by the program must describe these - modifications and the "support void" status. - - Derived works that do not satisfy the above terms must be renamed so - that they can not be associated with the Ion project, their executables - must be given names that do not conflict with the original author's - version, and this author may not be referred to for support. - - Modules and other (standalone) extensions to Ion must also be named - so that they can not be confused to be supported by the original - author. If "Ion" occurs in the name, it must be in the form - "Foo for Ion" instead of "Ion Foo", etc. - - This name policy notice may not be altered, and must be included in - any altered versions and binary redistributions. It may only be - removed when using small portions of the code in unrelated projects. - - The original author and the Ion project retain the same rights to - your modifications that it would have under the LGPL or GPL without - these or similar additional terms. - - If you fail to follow these terms, you lose the rights granted to - you by the LGPL. - -Explanations: - -Significant change: Bug fixes are a priori insignificant as additions. -Basic changes that are needed to install or run the software on a target -platform are a priori insignificant. Additionally, basic configuration -changes to better integrate the software with the target platform, -without obstructing the standard behaviour, are a priori insignificant. -Everything else is significant. The author reserves the right to refine -the definition of significant changes on a per-case basis. Please consult -when in doubt. - -Distributions: For example, suppose an aggregate distribution of software -provides an `installpkg` command for installing packages. Then the action -`installpkg ion3` (resp. `installpkg ion`) should within a reasonable -delay install the latest release of Ion3 (resp. the latest stable release), -or prominently notify the user that the provided version is not or may not -be the latest. The action `installpkg ion-3ds-20070318` may at any date -install this particular mentioned release. Likewise, the action `installpkg ---support-void-featurex ion3` may apply additional patches to the latest -Ion3, within the further constraints set above. - -The intent of these terms is to curb the power that "distributions", as -the primary sources of software for many users, have in defining what -is perceived as Ion. By providing significantly modified versions and -out-dated development snapshots without prominently mentioning this fact, -they do not present the work in a light that the author can agree with, -and create a burden of dealing with (new) users seeking for support for -such versions. +2.1, unless otherwise indicated in components taken from elsewhere. + +--- + +The "Ion" and "Ion3" names are claimed as trademarks; additional terms +apply if you redistribute under these names; see "LICENSE" in the source +package. --- diff --git a/debian/get-orig-source b/debian/get-orig-source index 35cca88..c990c05 100755 --- a/debian/get-orig-source +++ b/debian/get-orig-source @@ -2,6 +2,9 @@ set -e +PACKAGE="$(dpkg-parsechangelog | sed 's/^Source: //; t; d')" +test -n "$PACKAGE" + # Get the main upstream tarball URL and version via uscan. while read line; do if [ "${line#http://}" != "$line" -a "${line#* }" = "$line" ]; then @@ -31,9 +34,9 @@ test -z "$(tar tzf $doc_file | grep -v "^$doc_dir/")" # Unpack, combine and repack. tar xzf $main_file tar xzf $doc_file -mv $main_dir ion3-$version.orig -mv $doc_dir ion3-$version.orig/doc -tar cf - ion3-$version.orig | gzip -c9 > ion3_$version.orig.tar.gz +mv $main_dir $PACKAGE-$version.orig +mv $doc_dir $PACKAGE-$version.orig/doc +tar cf - $PACKAGE-$version.orig | gzip -c9 > $PACKAGE_$version.orig.tar.gz # Clean up. -rm -rf $main_file $doc_file ion3-$version.orig +rm -rf $main_file $doc_file $PACKAGE-$version.orig diff --git a/debian/ion3-dev.install b/debian/ion3-dev.install deleted file mode 100644 index fef7544..0000000 --- a/debian/ion3-dev.install +++ /dev/null @@ -1,5 +0,0 @@ -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 deleted file mode 100644 index fb8fea1..0000000 --- a/debian/ion3-dev.links +++ /dev/null @@ -1,6 +0,0 @@ -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 deleted file mode 100644 index 3ad6474..0000000 --- a/debian/ion3-doc.doc-base.config +++ /dev/null @@ -1,10 +0,0 @@ -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/* diff --git a/debian/ion3-doc.doc-base.notes b/debian/ion3-doc.doc-base.notes deleted file mode 100644 index fb1e77f..0000000 --- a/debian/ion3-doc.doc-base.notes +++ /dev/null @@ -1,10 +0,0 @@ -Document: ion3-doc-notes -Title: Ion: Notes for the module and patch writer (ion3) -Author: Tuomo Valkonen -Abstract: This document is an unorganized collection of notes for those who - want to write modules or patches to Ion (version 3). -Section: WindowManagers - -Format: HTML -Index: /usr/share/doc/ion3-doc/ionnotes/index.html -Files: /usr/share/doc/ion3-doc/ionnotes/* diff --git a/debian/ion3.desktop b/debian/ion3.desktop deleted file mode 100644 index f669301..0000000 --- a/debian/ion3.desktop +++ /dev/null @@ -1,7 +0,0 @@ -[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.install b/debian/ion3.install deleted file mode 100644 index 4d58e30..0000000 --- a/debian/ion3.install +++ /dev/null @@ -1,4 +0,0 @@ -debian/ion3.desktop debian/pwm3.desktop usr/share/xsessions -debian/default etc -debian/watch usr/share/ion3/debian -debian/install-ion3-cfg usr/sbin diff --git a/debian/ion3.links b/debian/ion3.links deleted file mode 100644 index 0a55d40..0000000 --- a/debian/ion3.links +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 83a5432..0000000 --- a/debian/ion3.menu +++ /dev/null @@ -1,4 +0,0 @@ -?package(ion3):needs="wm" section="Window Managers" \ - title="Ion3" command="/usr/bin/ion3" -?package(ion3):needs="wm" section="Window Managers" \ - title="PWM3" command="/usr/bin/pwm3" diff --git a/debian/ion3.postinst b/debian/ion3.postinst deleted file mode 100644 index 9ec3567..0000000 --- a/debian/ion3.postinst +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/sh -set -e -. /usr/share/debconf/confmodule - -UPSTREAM_VERSION= -DEBIAN_VERSION= - -if [ "$1" = configure ] \ - && dpkg --compare-versions "$2" lt "$DEBIAN_VERSION"; then - # Installing for the first time or upgrading. - # To comply with the Ion trademark licence terms, we must ensure - # that this version is up-to-date or that the user acknowledges - # it is not. I freely admit that this is a horrible abuse of - # debconf, but it seems slightly less unpleasant than maintaining - # a renamed version. - benh - uscan_output="$(uscan 2>&1 --no-conf --report-status \ - --package ion3 --upstream-version "$UPSTREAM_VERSION" \ - --watchfile /usr/share/ion3/debian/watch \ - || true)" - case "$uscan_output" in - *"up to date"*) - question='' - ;; - *"Newer version"*) - question=ion3/acknowledge-outdated - ;; - *) - question=ion3/acknowledge-maybe-outdated - ;; - esac - if [ -n "$question" ]; then - db_fset $question seen false - db_subst $question version $UPSTREAM_VERSION - db_input high $question || true - db_go || true - db_get $question - if [ "$RET" != true ]; then - db_input high ion3/did-not-acknowledge-outdated || true - db_go || true - exit 1 - fi - fi -fi - -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 - -# Initialise extra configuration file list if missing -[ -f /etc/X11/ion3/cfg_debian_ext.lua ] || >/etc/X11/ion3/cfg_debian_ext.lua - -#DEBHELPER# - -# Remove the old now-renamed generated Debian menu -rm -f /var/lib/ion3/debian-menus.lua diff --git a/debian/ion3.prerm b/debian/ion3.prerm deleted file mode 100644 index a950ac5..0000000 --- a/debian/ion3.prerm +++ /dev/null @@ -1,15 +0,0 @@ -#!/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-dev b/debian/overrides/ion3-dev deleted file mode 100644 index 321fb6b..0000000 --- a/debian/overrides/ion3-dev +++ /dev/null @@ -1,2 +0,0 @@ -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/overrides/particleman-dev b/debian/overrides/particleman-dev new file mode 100644 index 0000000..e45bf42 --- /dev/null +++ b/debian/overrides/particleman-dev @@ -0,0 +1,2 @@ +particleman-dev: script-not-executable ./usr/lib/ion3/libextl/libextl-mkexports +particleman-dev: unusual-interpreter ./usr/lib/ion3/libextl/libextl-mkexports #!/usr/bin/lua5.1 diff --git a/debian/ion3-dev.dirs b/debian/particleman-dev.dirs similarity index 100% rename from debian/ion3-dev.dirs rename to debian/particleman-dev.dirs diff --git a/debian/particleman-dev.install b/debian/particleman-dev.install new file mode 100644 index 0000000..aee3d39 --- /dev/null +++ b/debian/particleman-dev.install @@ -0,0 +1,5 @@ +build/system-inc.mk build/rules.mk usr/share/particleman/build +install-sh config.h system.mk usr/lib/particleman +build/libs.mk usr/lib/particleman/build +libextl/libextl-mkexports usr/lib/particleman/libextl +debian/overrides/particleman-dev usr/share/lintian/overrides diff --git a/debian/particleman-dev.links b/debian/particleman-dev.links new file mode 100644 index 0000000..4529fa3 --- /dev/null +++ b/debian/particleman-dev.links @@ -0,0 +1,9 @@ +usr/share/particleman usr/share/ion3 +usr/share/particleman/build/system-inc.mk usr/include/particleman/build/system-inc.mk +usr/share/particleman/build/rules.mk usr/include/particleman/build/rules.mk +usr/lib/particleman usr/lib/ion3 +usr/lib/particleman/config.h usr/include/particleman/config.h +usr/lib/particleman/system.mk usr/include/particleman/system.mk +usr/lib/particleman/build/libs.mk usr/include/particleman/build/libs.mk +usr/lib/particleman/libextl/libextl-mkexports usr/include/particleman/libextl/libextl-mkexports +usr/include/particleman usr/include/ion3 diff --git a/debian/particleman-doc.doc-base.config b/debian/particleman-doc.doc-base.config new file mode 100644 index 0000000..5701008 --- /dev/null +++ b/debian/particleman-doc.doc-base.config @@ -0,0 +1,10 @@ +Document: particleman-doc-config +Title: Configuring and extending Ion3 with Lua (particleman) +Author: Tuomo Valkonen +Abstract: This document describes how to configure and extend the window + managers Ion3 and ParticleMan. +Section: WindowManagers + +Format: HTML +Index: /usr/share/doc/particleman-doc/ionconf/index.html +Files: /usr/share/doc/particleman-doc/ionconf/* diff --git a/debian/particleman-doc.doc-base.notes b/debian/particleman-doc.doc-base.notes new file mode 100644 index 0000000..30b8ad3 --- /dev/null +++ b/debian/particleman-doc.doc-base.notes @@ -0,0 +1,10 @@ +Document: particleman-doc-notes +Title: Ion: Notes for the module and patch writer (particleman) +Author: Tuomo Valkonen +Abstract: This document is an unorganized collection of notes for those who + want to write modules or patches to Ion3 or ParticleMan. +Section: WindowManagers + +Format: HTML +Index: /usr/share/doc/particleman-doc/ionnotes/index.html +Files: /usr/share/doc/particleman-doc/ionnotes/* diff --git a/debian/ion3-doc.docs b/debian/particleman-doc.docs similarity index 100% rename from debian/ion3-doc.docs rename to debian/particleman-doc.docs diff --git a/debian/ion3.README.Debian b/debian/particleman.README.Debian similarity index 50% rename from debian/ion3.README.Debian rename to debian/particleman.README.Debian index 4db759c..83a27d7 100644 --- a/debian/ion3.README.Debian +++ b/debian/particleman.README.Debian @@ -1,28 +1,28 @@ -Ion3 -==== +ParticleMan +=========== -This is a release candidate for version 3.0 and should be quite -stable. There have been substantial changes from earlier development -snapshots. +This is based on a release candidate for Ion version 3.0 and should be +quite stable. There have been substantial changes from earlier +development snapshots. -Instructions for using Ion3 can be found in the manual page ("man -ion3"). Additional documentation is included in the ion3-doc package: -"Configuring and extending Ion3 with Lua" and "Ion: Notes for the -module and patch writer". There is an FAQ online at -. +Instructions for using ParticleMan can be found in the manual page +("man particleman"). Additional documentation is included in the +particleman-doc package: "Configuring and extending Ion3 with Lua" and +"Ion: Notes for the module and patch writer". There is an FAQ online +at . -Some scripts extending Ion3 are available in the ion3-scripts package, -though this is not currently maintained. +Some scripts extending ParticleMan are available in the ion3-scripts +package, though this is not currently maintained. -There is an unofficial module adding Xinerama support in the -mod-xinerama-for-ion package. +There is a module adding Xinerama support in the mod-xinerama-for-ion +package. Docks and system trays ---------------------- -Ion3 is compatible with the docking protocols used by WindowMaker and -KDE. It can place docked applications windows either in a corner -dock, or in a "system tray" in the status bar. +ParticleMan is compatible with the docking protocols used by +WindowMaker and KDE. It can place docked applications windows either +in a corner dock, or in a "system tray" in the status bar. For a corner dock, add: @@ -57,7 +57,7 @@ You can also configure specific windows to appear in the status bar: GNOME unfortunately uses a different dock protocol. However, the docker program can adapt from this to the WindowMaker protocol. So you can include a GNOME system tray in your status bar by including docker -in your X session and this in your Ion3 configuration: +in your X session and this in your ParticleMan configuration: -- In cfg_ion.lua: defwinprop { @@ -74,11 +74,11 @@ in your X session and this in your Ion3 configuration: Adding configuration files to the defaults ------------------------------------------ -Ion3 extension packages may add and remove configuration files to -those included by cfg_defaults.lua. The configuration files must be -installed under /etc/X11/ion3. Run "install-ion3-cfg cfg_foo" in the -postinst script to add the configuration file +Ion3/ParticleMan extension packages may add and remove configuration +files to those included by cfg_defaults.lua. The configuration files +must be installed under /etc/X11/ion3. Run "install-ion3-cfg cfg_foo" +in the postinst script to add the configuration file /etc/X11/ion3/cfg_foo.lua. Run "install-ion3-cfg --remove cfg_foo" in the prerm script to remove it. - -- Ben Hutchings , Thu, 27 Sep 2007 22:27:11 +0100 + -- Ben Hutchings , Sun, 4 Nov 2007 15:32:47 +0000 diff --git a/debian/particleman.desktop b/debian/particleman.desktop new file mode 100644 index 0000000..480c639 --- /dev/null +++ b/debian/particleman.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=ParticleMan +Comment=ParticleMan window manager +Comment[cs]=Správce oken ParticleMan +Exec=/usr/bin/particleman +Type=Application diff --git a/debian/ion3.dirs b/debian/particleman.dirs similarity index 70% rename from debian/ion3.dirs rename to debian/particleman.dirs index f19247e..3a65d69 100644 --- a/debian/ion3.dirs +++ b/debian/particleman.dirs @@ -1,3 +1,3 @@ -var/lib/ion3 +var/lib/particleman usr/share/xsessions usr/share/lintian/overrides diff --git a/debian/particleman.install b/debian/particleman.install new file mode 100644 index 0000000..6c6cd81 --- /dev/null +++ b/debian/particleman.install @@ -0,0 +1,3 @@ +debian/particleman.desktop debian/pwm3.desktop usr/share/xsessions +debian/default etc +debian/install-ion3-cfg usr/sbin diff --git a/debian/particleman.links b/debian/particleman.links new file mode 100644 index 0000000..a46f952 --- /dev/null +++ b/debian/particleman.links @@ -0,0 +1,5 @@ +var/lib/particleman/debian-menu.lua usr/share/particleman/debian-menu.lua +var/lib/particleman/debian-menu-i18n.lua usr/share/particleman/debian-menu-i18n.lua +etc/default/particleman etc/X11/particleman/cfg_debian.lua +usr/bin/particleman usr/bin/ion3 +usr/share/man/man1/particleman.1 usr/share/man/man1/ion3.1 diff --git a/debian/particleman.menu b/debian/particleman.menu new file mode 100644 index 0000000..feb7527 --- /dev/null +++ b/debian/particleman.menu @@ -0,0 +1,4 @@ +?package(particleman):needs="wm" section="Window Managers" \ + title="ParticleMan" command="/usr/bin/particleman" +?package(particleman):needs="wm" section="Window Managers" \ + title="PWM3" command="/usr/bin/pwm3" diff --git a/debian/ion3.menu-method b/debian/particleman.menu-method similarity index 96% rename from debian/ion3.menu-method rename to debian/particleman.menu-method index b8035f3..0e43fc7 100644 --- a/debian/ion3.menu-method +++ b/debian/particleman.menu-method @@ -32,7 +32,7 @@ submenutitle=" submenu(\"" $title "\", \"" $section "\"),\n"; preoutput="\n"; mainmenutitle="Debian"; rootsection="Debian"; -rootprefix="/var/lib/ion3/"; +rootprefix="/var/lib/particleman/"; 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/particleman.menu-method.i18n similarity index 96% rename from debian/ion3.menu-method.i18n rename to debian/particleman.menu-method.i18n index 529e7a5..cc038b4 100644 --- a/debian/ion3.menu-method.i18n +++ b/debian/particleman.menu-method.i18n @@ -32,7 +32,7 @@ submenutitle=" submenu(\"" $title "\", \"" $section "\"),\n"; preoutput="\n"; mainmenutitle="Debian"; rootsection="Debian"; -rootprefix="/var/lib/ion3/"; +rootprefix="/var/lib/particleman/"; userprefix="/.ion3/"; preoutput= "-- Automatically generated file. Do not edit.\n-- (See /usr/share/doc/menu/menu.txt.gz)\n\n"; diff --git a/debian/particleman.postinst b/debian/particleman.postinst new file mode 100644 index 0000000..483a267 --- /dev/null +++ b/debian/particleman.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/particleman 29 \ + --slave /usr/share/man/man1/ion.1.gz ion.1.gz \ + /usr/share/man/man1/particleman.1.gz + +update-alternatives --install \ + /usr/bin/x-window-manager x-window-manager /usr/bin/particleman 49 \ + --slave /usr/share/man/man1/x-window-manager.1.gz x-window-manager.1.gz \ + /usr/share/man/man1/particleman.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/particleman-i18n +if [ -f $inst ]; then + chmod a+x $inst +fi + +# Initialise extra configuration file list if missing +[ -f /etc/X11/ion3/cfg_debian_ext.lua ] || >/etc/X11/ion3/cfg_debian_ext.lua + +#DEBHELPER# diff --git a/debian/ion3.postrm b/debian/particleman.postrm similarity index 57% rename from debian/ion3.postrm rename to debian/particleman.postrm index b0c1812..f1de62b 100644 --- a/debian/ion3.postrm +++ b/debian/particleman.postrm @@ -1,12 +1,8 @@ #!/bin/sh set -e -if [ "$1" = purge ]; then - rm -rf /etc/X11/ion3 -fi - # i18n menu method -inst=/etc/menu-methods/ion3-i18n +inst=/etc/menu-methods/particleman-i18n if [ "$1" = "remove" ] && [ -f "$inst" ]; then chmod a-x $inst ; fi #DEBHELPER# diff --git a/debian/particleman.prerm b/debian/particleman.prerm new file mode 100644 index 0000000..1f51abf --- /dev/null +++ b/debian/particleman.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/particleman + update-alternatives --remove ion /usr/bin/particleman +fi + +if [ "$1" = remove ]; then + rm -f /var/lib/particleman/debian-menu.lua + rm -f /var/lib/particleman/debian-menu-i18n.lua +fi + +#DEBHELPER# diff --git a/debian/ion3.templates b/debian/particleman.templates similarity index 100% rename from debian/ion3.templates rename to debian/particleman.templates diff --git a/debian/rules b/debian/rules index f14715a..f7ed172 100755 --- a/debian/rules +++ b/debian/rules @@ -7,7 +7,7 @@ export SHELL=/bin/bash include /usr/share/quilt/quilt.make -PACKAGE := ion3 +PACKAGE := $(shell dpkg-parsechangelog | sed -r 's/^Source: //; t; d') PACKAGE_DEV := $(PACKAGE)-dev PACKAGE_DOC := $(PACKAGE)-doc INSTDIR := debian/$(PACKAGE) @@ -86,7 +86,7 @@ binary-indep: build-indep install-indep # 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 + | cpp -P | tail -1 | sed 's/"//g') >>debian/$(PACKAGE_DEV).substvars dh_installchangelogs -i dh_installdocs -i @@ -129,17 +129,17 @@ binary-arch: build-arch install-arch # 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 + | cpp -P | tail -1 | sed 's/"//g') >>debian/$(PACKAGE).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 + rm -f $(INSTDIR)/usr/share/doc/$(PACKAGE)/LICENSE + mv $(INSTDIR)/usr/share/doc/$(PACKAGE)/ChangeLog $(INSTDIR)/usr/share/doc/$(PACKAGE)/changelog # dh_installexamples -a # dh_install -a dh_installmenu -a - install -m644 debian/ion3.menu-method.i18n \ - $(INSTDIR)/etc/menu-methods/ion3-i18n + install -m644 debian/$(PACKAGE).menu-method.i18n \ + $(INSTDIR)/etc/menu-methods/$(PACKAGE)-i18n dh_installdebconf -a # dh_installlogrotate -a @@ -160,7 +160,7 @@ binary-arch: build-arch install-arch # dh_makeshlibs -a dh_installdeb -a sed -i 's/^DEBIAN_VERSION=/&$(DEBIAN_VERSION)/; s/^UPSTREAM_VERSION=/&$(UPSTREAM_VERSION)/' \ - debian/ion3/DEBIAN/postinst + $(INSTDIR)/DEBIAN/postinst dh_shlibdeps -a dh_gencontrol -a dh_md5sums -a -- 2.39.5