]> git.decadent.org.uk Git - ion3.git/commitdiff
Started renaming.
authorBen Hutchings <ben@decadent.org.uk>
Sun, 4 Nov 2007 16:27:19 +0000 (16:27 +0000)
committerBen Hutchings <ben@decadent.org.uk>
Sun, 2 Nov 2008 13:05:30 +0000 (13:05 +0000)
Removed postinst version check from particleman.
Changed debian/rules and debian/get-orig-source to get the package name from the changelog.

44 files changed:
debian/NEWS
debian/changelog
debian/control
debian/copyright
debian/get-orig-source
debian/ion3-dev.dirs [deleted file]
debian/ion3-dev.install [deleted file]
debian/ion3-dev.links [deleted file]
debian/ion3-doc.doc-base.config [deleted file]
debian/ion3-doc.doc-base.notes [deleted file]
debian/ion3-doc.docs [deleted file]
debian/ion3.README.Debian [deleted file]
debian/ion3.desktop [deleted file]
debian/ion3.dirs [deleted file]
debian/ion3.install [deleted file]
debian/ion3.links [deleted file]
debian/ion3.menu [deleted file]
debian/ion3.menu-method [deleted file]
debian/ion3.menu-method.i18n [deleted file]
debian/ion3.postinst [deleted file]
debian/ion3.postrm [deleted file]
debian/ion3.prerm [deleted file]
debian/ion3.templates [deleted file]
debian/overrides/ion3-dev [deleted file]
debian/overrides/particleman-dev [new file with mode: 0644]
debian/particleman-dev.dirs [new file with mode: 0644]
debian/particleman-dev.install [new file with mode: 0644]
debian/particleman-dev.links [new file with mode: 0644]
debian/particleman-doc.doc-base.config [new file with mode: 0644]
debian/particleman-doc.doc-base.notes [new file with mode: 0644]
debian/particleman-doc.docs [new file with mode: 0644]
debian/particleman.README.Debian [new file with mode: 0644]
debian/particleman.desktop [new file with mode: 0644]
debian/particleman.dirs [new file with mode: 0644]
debian/particleman.install [new file with mode: 0644]
debian/particleman.links [new file with mode: 0644]
debian/particleman.menu [new file with mode: 0644]
debian/particleman.menu-method [new file with mode: 0644]
debian/particleman.menu-method.i18n [new file with mode: 0644]
debian/particleman.postinst [new file with mode: 0644]
debian/particleman.postrm [new file with mode: 0644]
debian/particleman.prerm [new file with mode: 0644]
debian/particleman.templates [new file with mode: 0644]
debian/rules

index aaa58bd4dee030d74a706026e6cfc83d946e21b0..7c6dcd97d0bb0ed180c5432f8cdc5ef1a654798c 100644 (file)
@@ -1,3 +1,9 @@
+particleman (20070927-1) unstable; urgency=low
+
+  * Renamed to produce a DFSG-compliant package
+
+ -- Ben Hutchings <ben@decadent.org.uk>  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
index e23c951bd76e6a4c9bf78fc653e1a5154dc3865f..2bd7da0c77699fb4f339565a2c80f2f6ef22f42f 100644 (file)
@@ -1,3 +1,9 @@
+particleman (20070927-1) unstable; urgency=low
+
+  * Renamed to produce a DFSG-compliant package
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Sun, 04 Nov 2007 14:49:46 +0000
+
 ion3 (20070927-1) unstable; urgency=low
 
   * New upstream release
index 1f2fba990c47db5e3e6ce6e1dab56f344abd9a7a..2bd33f7bbaf2ff9a01f793cacaff72c2f7bf50e8 100644 (file)
@@ -1,19 +1,21 @@
-Source: ion3
-Section: non-free/x11
+Source: particleman
+Section: x11
 Priority: extra
 Maintainer: Ben Hutchings <ben@decadent.org.uk>
 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.
index 7e986a0fe4f6b3ed4fac2d2f53c0eb4a7d0d182a..d10dff3d54ccff8d22b718c49e33fcde308b5cec 100644 (file)
@@ -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 <pelle@dsv.su.se>, based
 on the ion package created by Tommi Virtanen <tv@debian.org>.  It uses
@@ -10,87 +11,18 @@ The author of Ion3 is Tuomo Valkonen <tuomov@iki.fi>.
 
 ---
 
-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.
 
 ---
 
index 35cca88cb7baa551231fe0fec11879710eb2f8c4..c990c05ede47f1c19d3a361436e6c713bc274564 100755 (executable)
@@ -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.dirs b/debian/ion3-dev.dirs
deleted file mode 100644 (file)
index 1da8fba..0000000
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/lintian/overrides
diff --git a/debian/ion3-dev.install b/debian/ion3-dev.install
deleted file mode 100644 (file)
index fef7544..0000000
+++ /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 (file)
index fb8fea1..0000000
+++ /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 (file)
index 3ad6474..0000000
+++ /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 (file)
index fb1e77f..0000000
+++ /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-doc.docs b/debian/ion3-doc.docs
deleted file mode 100644 (file)
index 3e65e4f..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-doc/ionconf
-doc/ionnotes
diff --git a/debian/ion3.README.Debian b/debian/ion3.README.Debian
deleted file mode 100644 (file)
index 4db759c..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-Ion3
-====
-
-This is a release candidate for 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
-<http://modeemi.fi/~tuomov/ion/faq.html>.
-
-Some scripts extending Ion3 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.
-
-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.
-
-For a corner dock, add:
-
-    dopath("mod_dock")
-
-to cfg_ion.lua or cfg_modules.lua and edit cfg_dock.lua to your
-preferences.  The dock window's visibility can be toggled using
-MOD1+D.
-
-For a system tray, edit cfg_statusbar.lua to include:
-
-    mod_statusbar.create {
-       ...
-       systray=true,
-       template="... %systray"
-    }
-
-You can also configure specific windows to appear in the status bar:
-
-    -- In cfg_ion.lua:
-    defwinprop {
-       class = "foo-window-class",
-       statusbar = "foo"
-    }
-
-    -- In cfg_status_bar.lua:
-    mod_statusbar.create {
-       ...
-       template="... %systray_foo"
-    }
-
-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 cfg_ion.lua:
-    defwinprop {
-       class = "Docker",
-       statusbar = "dock"
-    }
-
-    -- In cfg_statusbar.lua:
-    mod_statusbar.create {
-       ...
-       template="... %systray_dock"
-    }
-
-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
-/etc/X11/ion3/cfg_foo.lua.  Run "install-ion3-cfg --remove cfg_foo" in
-the prerm script to remove it.
-
- -- Ben Hutchings <ben@decadent.org.uk>, Thu, 27 Sep 2007 22:27:11 +0100
diff --git a/debian/ion3.desktop b/debian/ion3.desktop
deleted file mode 100644 (file)
index f669301..0000000
+++ /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.dirs b/debian/ion3.dirs
deleted file mode 100644 (file)
index f19247e..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-var/lib/ion3
-usr/share/xsessions
-usr/share/lintian/overrides
diff --git a/debian/ion3.install b/debian/ion3.install
deleted file mode 100644 (file)
index 4d58e30..0000000
+++ /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 (file)
index 0a55d40..0000000
+++ /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 (file)
index 83a5432..0000000
+++ /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.menu-method b/debian/ion3.menu-method
deleted file mode 100644 (file)
index b8035f3..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/install-menu
-# by Iwan Heskamp <iwan@hetwasietsmet.nl>
-# http://tdm120.el.utwente.nl/~hkp/pwm/
-# Modified for Ion by Per Olofsson <pelle@dsv.su.se>
-
-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
deleted file mode 100644 (file)
index 529e7a5..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/install-menu
-# by Iwan Heskamp <iwan@hetwasietsmet.nl>
-# http://tdm120.el.utwente.nl/~hkp/pwm/
-# Modified for Ion by Per Olofsson <pelle@dsv.su.se>
-
-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
deleted file mode 100644 (file)
index 9ec3567..0000000
+++ /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.postrm b/debian/ion3.postrm
deleted file mode 100644 (file)
index b0c1812..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/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
deleted file mode 100644 (file)
index a950ac5..0000000
+++ /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/ion3.templates b/debian/ion3.templates
deleted file mode 100644 (file)
index 348fe16..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-# These templates have been reviewed by the debian-l10n-english
-# team
-#
-# If modifications/additions/rewording are needed, please ask
-# for an advice to debian-l10n-english@lists.debian.org
-#
-# Even minor modifications require translation updates and such
-# changes should be coordinated with translators and reviewers.
-
-Template: ion3/acknowledge-outdated
-Type: boolean
-Default: false
-_Description: Do you understand that this version is not supported by the author?
- The version of Ion3 you are installing (version ${version}) is not
- the latest version released by the author.
- .
- DO NOT send bug reports or questions to the author unless they apply
- to the latest version, available at:
-  http://modeemi.fi/~tuomov/ion/download.html
- .
- Otherwise, you should send any bug reports about this package to the
- Debian bug tracking system and any other questions to the Debian
- maintainer.
-
-Template: ion3/acknowledge-maybe-outdated
-Type: boolean
-Default: false
-_Description: Do you understand that this version may not be supported by the author?
- The version of Ion3 you are installing (version ${version}) may not
- be the latest version released by the author.
- .
- DO NOT send bug reports or questions to the author unless they apply
- to the latest version, available at:
-  http://modeemi.fi/~tuomov/ion/download.html
- .
- Otherwise, you should send any bug reports about this package to the
- Debian bug tracking system and any other questions to the Debian
- maintainer.
-
-Template: ion3/did-not-acknowledge-outdated
-Type: error
-Description: Non-acknowledged installation of an old version
- You must acknowledge that the author does not support old versions
- and should not be contacted about them.
diff --git a/debian/overrides/ion3-dev b/debian/overrides/ion3-dev
deleted file mode 100644 (file)
index 321fb6b..0000000
+++ /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 (file)
index 0000000..e45bf42
--- /dev/null
@@ -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/particleman-dev.dirs b/debian/particleman-dev.dirs
new file mode 100644 (file)
index 0000000..1da8fba
--- /dev/null
@@ -0,0 +1 @@
+usr/share/lintian/overrides
diff --git a/debian/particleman-dev.install b/debian/particleman-dev.install
new file mode 100644 (file)
index 0000000..aee3d39
--- /dev/null
@@ -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 (file)
index 0000000..4529fa3
--- /dev/null
@@ -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 (file)
index 0000000..5701008
--- /dev/null
@@ -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 (file)
index 0000000..30b8ad3
--- /dev/null
@@ -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/particleman-doc.docs b/debian/particleman-doc.docs
new file mode 100644 (file)
index 0000000..3e65e4f
--- /dev/null
@@ -0,0 +1,2 @@
+doc/ionconf
+doc/ionnotes
diff --git a/debian/particleman.README.Debian b/debian/particleman.README.Debian
new file mode 100644 (file)
index 0000000..83a27d7
--- /dev/null
@@ -0,0 +1,84 @@
+ParticleMan
+===========
+
+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 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 <http://modeemi.fi/~tuomov/ion/faq.html>.
+
+Some scripts extending ParticleMan are available in the ion3-scripts
+package, though this is not currently maintained.
+
+There is a module adding Xinerama support in the mod-xinerama-for-ion
+package.
+
+Docks and system trays
+----------------------
+
+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:
+
+    dopath("mod_dock")
+
+to cfg_ion.lua or cfg_modules.lua and edit cfg_dock.lua to your
+preferences.  The dock window's visibility can be toggled using
+MOD1+D.
+
+For a system tray, edit cfg_statusbar.lua to include:
+
+    mod_statusbar.create {
+       ...
+       systray=true,
+       template="... %systray"
+    }
+
+You can also configure specific windows to appear in the status bar:
+
+    -- In cfg_ion.lua:
+    defwinprop {
+       class = "foo-window-class",
+       statusbar = "foo"
+    }
+
+    -- In cfg_status_bar.lua:
+    mod_statusbar.create {
+       ...
+       template="... %systray_foo"
+    }
+
+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 ParticleMan configuration:
+
+    -- In cfg_ion.lua:
+    defwinprop {
+       class = "Docker",
+       statusbar = "dock"
+    }
+
+    -- In cfg_statusbar.lua:
+    mod_statusbar.create {
+       ...
+       template="... %systray_dock"
+    }
+
+Adding configuration files to the defaults
+------------------------------------------
+
+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 <ben@decadent.org.uk>, Sun,  4 Nov 2007 15:32:47 +0000
diff --git a/debian/particleman.desktop b/debian/particleman.desktop
new file mode 100644 (file)
index 0000000..480c639
--- /dev/null
@@ -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/particleman.dirs b/debian/particleman.dirs
new file mode 100644 (file)
index 0000000..3a65d69
--- /dev/null
@@ -0,0 +1,3 @@
+var/lib/particleman
+usr/share/xsessions
+usr/share/lintian/overrides
diff --git a/debian/particleman.install b/debian/particleman.install
new file mode 100644 (file)
index 0000000..6c6cd81
--- /dev/null
@@ -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 (file)
index 0000000..a46f952
--- /dev/null
@@ -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 (file)
index 0000000..feb7527
--- /dev/null
@@ -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/particleman.menu-method b/debian/particleman.menu-method
new file mode 100644 (file)
index 0000000..0e43fc7
--- /dev/null
@@ -0,0 +1,38 @@
+#!/usr/bin/install-menu
+# by Iwan Heskamp <iwan@hetwasietsmet.nl>
+# http://tdm120.el.utwente.nl/~hkp/pwm/
+# Modified for Ion by Per Olofsson <pelle@dsv.su.se>
+
+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/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.menu-method.i18n b/debian/particleman.menu-method.i18n
new file mode 100644 (file)
index 0000000..cc038b4
--- /dev/null
@@ -0,0 +1,38 @@
+#!/usr/bin/install-menu
+# by Iwan Heskamp <iwan@hetwasietsmet.nl>
+# http://tdm120.el.utwente.nl/~hkp/pwm/
+# Modified for Ion by Per Olofsson <pelle@dsv.su.se>
+
+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/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 (file)
index 0000000..483a267
--- /dev/null
@@ -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/particleman.postrm b/debian/particleman.postrm
new file mode 100644 (file)
index 0000000..f1de62b
--- /dev/null
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+# i18n menu method
+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 (file)
index 0000000..1f51abf
--- /dev/null
@@ -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/particleman.templates b/debian/particleman.templates
new file mode 100644 (file)
index 0000000..348fe16
--- /dev/null
@@ -0,0 +1,44 @@
+# These templates have been reviewed by the debian-l10n-english
+# team
+#
+# If modifications/additions/rewording are needed, please ask
+# for an advice to debian-l10n-english@lists.debian.org
+#
+# Even minor modifications require translation updates and such
+# changes should be coordinated with translators and reviewers.
+
+Template: ion3/acknowledge-outdated
+Type: boolean
+Default: false
+_Description: Do you understand that this version is not supported by the author?
+ The version of Ion3 you are installing (version ${version}) is not
+ the latest version released by the author.
+ .
+ DO NOT send bug reports or questions to the author unless they apply
+ to the latest version, available at:
+  http://modeemi.fi/~tuomov/ion/download.html
+ .
+ Otherwise, you should send any bug reports about this package to the
+ Debian bug tracking system and any other questions to the Debian
+ maintainer.
+
+Template: ion3/acknowledge-maybe-outdated
+Type: boolean
+Default: false
+_Description: Do you understand that this version may not be supported by the author?
+ The version of Ion3 you are installing (version ${version}) may not
+ be the latest version released by the author.
+ .
+ DO NOT send bug reports or questions to the author unless they apply
+ to the latest version, available at:
+  http://modeemi.fi/~tuomov/ion/download.html
+ .
+ Otherwise, you should send any bug reports about this package to the
+ Debian bug tracking system and any other questions to the Debian
+ maintainer.
+
+Template: ion3/did-not-acknowledge-outdated
+Type: error
+Description: Non-acknowledged installation of an old version
+ You must acknowledge that the author does not support old versions
+ and should not be contacted about them.
index f14715aa1d7fb05273fc3e18a1754e8fb18e6f9b..f7ed172d6397b4e60f458c6d3e5022832afff725 100755 (executable)
@@ -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