Made ion3 and particleman replace and conflict with each other; similarly for ion3...

[ion3.git] / debian / control

diff --git a/debian/control b/debian/control
index 5d0b33f0f71b7ffb07b6b3d07f2c6c9a3b53223e..e76fde6b8eaf83311bb33ee42d7ae8d6170e743e 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,52 +1,42 @@
 Source: ion3
-Section: x11
+Section: non-free/x11
 Priority: extra
-Maintainer: Norbert Tretkowski <nobse@debian.org>
-Uploaders: Per Olofsson <pelle@debian.org>
+Maintainer: Ben Hutchings <ben@decadent.org.uk>
 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
+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: x11
+Section: non-free/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
+Depends: ${shlibs:Depends}, xterm | x-terminal-emulator, debconf, xbase-clients
+Recommends: devscripts, libwww-perl, xfonts-75dpi | xfonts-75dpi-transcoded | xfonts-100dpi | xfonts-100dpi-transcoded
+Suggests: menu (>= 2.1.9), docker, ion3-scripts
+Conflicts: particleman
 Provides: x-window-manager, ion3-api-${Ion:ApiVersion}
-Description: keyboard-friendly window manager with tiled windows (devel)
+Replaces: particleman
+Description: keyboard-friendly window manager with tiled windows
  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
+ 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/
+  Homepage: http://iki.fi/tuomov/ion/
 
 Package: ion3-dev
-Section: devel
+Section: non-free/devel
 Priority: extra
 Architecture: all
-Depends: ion3-api-${Ion:ApiVersion}, libxinerama-dev, libsm-dev, lua5.1, gcc (>> 3)
+Depends: libx11-dev, libsm-dev, lua5.1, gcc (>> 3)
+Conflicts: particleman-dev
+Replaces: particleman-dev
 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.
+ modules to the Ion window manager.