]> git.decadent.org.uk Git - ion3.git/commitdiff
Made ion3 and particleman replace and conflict with each other; similarly for ion3...
authorBen Hutchings <ben@decadent.org.uk>
Sat, 10 Nov 2007 04:12:02 +0000 (04:12 +0000)
committerBen Hutchings <ben@decadent.org.uk>
Sun, 2 Nov 2008 13:05:30 +0000 (13:05 +0000)
Removed obsolete conflicts.

debian/control

index fa762d65fd7b196993d0ef1cbc342d4dcb55119a..c45c55e0ad2dc0f6ed1b1d673267197e3e7aee6d 100644 (file)
@@ -11,8 +11,9 @@ Architecture: any
 Depends: ${shlibs:Depends}, xterm | x-terminal-emulator, debconf, xbase-clients
 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, ion3-old
+Conflicts: ion3
 Provides: x-window-manager, ion3, ion3-api-${Ion:ApiVersion}
+Replaces: ion3
 Description: keyboard-friendly window manager with tiled windows
  ParticleMan is a free version of the Ion3 window manager.
  .
@@ -36,6 +37,7 @@ Architecture: all
 Depends: libx11-dev, libsm-dev, lua5.1, gcc (>> 3)
 Conflicts: ion3-dev
 Provides: ion3-dev
+Replaces: ion3-dev
 Description:  development files
  This package contains the files necessary for building extension
  modules to the ParticleMan or Ion3 window managers.