Commit ec664b3a authored by Ryan Shipp's avatar Ryan Shipp

removed conflicts=gtk-integration

parent f02a4d7a
......@@ -6,7 +6,7 @@
pkgname=oxygen-gtk-icons
pkgver=2.5.0
pkgrel=2
pkgrel=3
pkgdesc="The Oxygen icon set for GTK+."
arch=('i686' 'x86_64')
......@@ -18,7 +18,7 @@ license=('LGPL3' 'GPL')
depends=('kdelibs' 'qt' 'oxygen-icons' 'cairo')
makedepends=('findutils' 'imagemagick' 'liblqr')
provides=('oxygenrefit2-icon-theme')
conflicts=('oxygenrefit2-icon-theme' 'gtk-integration')
conflicts=('oxygenrefit2-icon-theme') # 'gtk-integration')
replaces=('gtk-integration')
categories=('system')
#groups=('gtk-integration')
......
......@@ -6,7 +6,7 @@
pkgname=oxygen-gtk2
pkgver=1.1.4
pkgrel=2
pkgrel=3
pkgdesc="The Oxygen engine for GTK2, for better Qt/GKT+ integration."
arch=('i686' 'x86_64')
......@@ -19,7 +19,7 @@ depends=('kdelibs' 'qt' 'oxygen-icons' 'cairo')
makedepends=('gcc' 'cmake' 'findutils' 'imagemagick' 'liblqr' 'gtk2' 'automoc4')
provides=('oxygen-gtk')
replaces=('gtk-integration')
conflicts=('oxygen-gtk' 'gtk-integration' 'oxygen-gtk3')
conflicts=('oxygen-gtk' 'oxygen-gtk3')
categories=('system')
#groups=('gtk-integration')
......
......@@ -6,7 +6,7 @@
pkgname=oxygen-gtk3
pkgver=1.1.4
pkgrel=2
pkgrel=3
pkgdesc="The Oxygen engine for GTK3, for better Qt/GKT+ integration."
arch=('i686' 'x86_64')
......@@ -18,7 +18,7 @@ license=('LGPL3' 'GPL')
depends=('kdelibs' 'qt' 'oxygen-icons' 'cairo')
makedepends=('gcc' 'cmake' 'findutils' 'imagemagick' 'liblqr' 'gtk2' 'automoc4')
provides=('oxygen-gtk')
conflicts=('oxygen-gtk' 'gtk-integration' 'oxygen-gtk2')
conflicts=('oxygen-gtk' 'oxygen-gtk2')
categories=('system')
#groups=('gtk-integration')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment