[arch-commits] Commit in (7 files)

[Andrea Scarpino]

    Date: Tuesday, May 24, 2011 @ 11:22:45
  Author: andrea
Revision: 124815

KDE 4.7beta1 - do not replaces bindings, conflict with them for now

Modified:
  kdebindings-kimono/kde-unstable/PKGBUILD
  kdebindings-korundum/kde-unstable/PKGBUILD
  kdebindings-qtruby/kde-unstable/PKGBUILD
  kdebindings-qyoto/kde-unstable/PKGBUILD
  kdebindings-smokegen/kde-unstable/PKGBUILD
  kdebindings-smokekde/kde-unstable/PKGBUILD
  kdebindings-smokeqt/kde-unstable/PKGBUILD

--------------------------------------------+
 kdebindings-kimono/kde-unstable/PKGBUILD   |    2 +-
 kdebindings-korundum/kde-unstable/PKGBUILD |    2 +-
 kdebindings-qtruby/kde-unstable/PKGBUILD   |    1 +
 kdebindings-qyoto/kde-unstable/PKGBUILD    |    1 +
 kdebindings-smokegen/kde-unstable/PKGBUILD |    3 ++-
 kdebindings-smokekde/kde-unstable/PKGBUILD |    2 +-
 kdebindings-smokeqt/kde-unstable/PKGBUILD  |    3 ++-
 7 files changed, 9 insertions(+), 5 deletions(-)

Modified: kdebindings-kimono/kde-unstable/PKGBUILD
===================================================================
--- kdebindings-kimono/kde-unstable/PKGBUILD	2011-05-24 15:14:28 UTC (rev 124814)
+++ kdebindings-kimono/kde-unstable/PKGBUILD	2011-05-24 15:22:45 UTC (rev 124815)
@@ -11,7 +11,7 @@
 groups=('kde' 'kdebindings')
 depends=('kdebindings-qyoto' 'kdebindings-smokekde')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
-replaces=('kdebindings-csharp')
+conflicts=('kdebindings-csharp')
 source=("http://download.kde.org/unstable/${pkgver}/src/kimono-${pkgver}.tar.bz2")
 sha1sums=('911dfbee3141ca0f72c13e15bafc549ccd9ab33a')
 

Modified: kdebindings-korundum/kde-unstable/PKGBUILD
===================================================================
--- kdebindings-korundum/kde-unstable/PKGBUILD	2011-05-24 15:14:28 UTC (rev 124814)
+++ kdebindings-korundum/kde-unstable/PKGBUILD	2011-05-24 15:22:45 UTC (rev 124815)
@@ -11,7 +11,7 @@
 groups=('kde' 'kdebindings')
 depends=('kdebindings-qtruby' 'kdebindings-smokekde')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
-replaces=('kdebindings-ruby')
+conflicts=('kdebindings-ruby')
 source=("http://download.kde.org/unstable/${pkgver}/src/korundum-${pkgver}.tar.bz2")
 sha1sums=('30209e7e3d3dc54c7eb787d7e7bcc90735c5bc1a')
 

Modified: kdebindings-qtruby/kde-unstable/PKGBUILD
===================================================================
--- kdebindings-qtruby/kde-unstable/PKGBUILD	2011-05-24 15:14:28 UTC (rev 124814)
+++ kdebindings-qtruby/kde-unstable/PKGBUILD	2011-05-24 15:22:45 UTC (rev 124815)
@@ -11,6 +11,7 @@
 groups=('kde' 'kdebindings')
 depends=('kdebindings-smokeqt' 'ruby')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
+conflicts=('kdebindings-ruby')
 source=("http://download.kde.org/unstable/${pkgver}/src/qtruby-${pkgver}.tar.bz2")
 sha1sums=('9b153784efb3187ca4f38a14355b8a5ce283316c')
 

Modified: kdebindings-qyoto/kde-unstable/PKGBUILD
===================================================================
--- kdebindings-qyoto/kde-unstable/PKGBUILD	2011-05-24 15:14:28 UTC (rev 124814)
+++ kdebindings-qyoto/kde-unstable/PKGBUILD	2011-05-24 15:22:45 UTC (rev 124815)
@@ -11,6 +11,7 @@
 groups=('kde' 'kdebindings')
 depends=('kdebindings-smokeqt' 'mono')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
+conflicts=('kdebindings-csharp')
 source=("http://download.kde.org/unstable/${pkgver}/src/qyoto-${pkgver}.tar.bz2")
 sha1sums=('7f63ae1c1e30edf226ca8418d5fa78edaf42cb36')
 

Modified: kdebindings-smokegen/kde-unstable/PKGBUILD
===================================================================
--- kdebindings-smokegen/kde-unstable/PKGBUILD	2011-05-24 15:14:28 UTC (rev 124814)
+++ kdebindings-smokegen/kde-unstable/PKGBUILD	2011-05-24 15:22:45 UTC (rev 124815)
@@ -10,6 +10,7 @@
 license=('GPL' 'LGPL' 'FDL')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
+conflicts=('kdebindings-smoke')
 source=("http://download.kde.org/unstable/${pkgver}/src/smokegen-${pkgver}.tar.bz2")
 sha1sums=('ce860f4308df4cc91b1e49d0f1f5bca3805c4cf1')
 
@@ -26,4 +27,4 @@
 package() {
   cd "${srcdir}"/build
   make DESTDIR="${pkgdir}" install
-}
\ No newline at end of file
+}

Modified: kdebindings-smokekde/kde-unstable/PKGBUILD
===================================================================
--- kdebindings-smokekde/kde-unstable/PKGBUILD	2011-05-24 15:14:28 UTC (rev 124814)
+++ kdebindings-smokekde/kde-unstable/PKGBUILD	2011-05-24 15:22:45 UTC (rev 124815)
@@ -11,7 +11,7 @@
 groups=('kde' 'kdebindings')
 depends=('kdebindings-smokeqt' 'kdepimlibs' 'kdegraphics-okular')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
-replaces=('kdebindings-smoke')
+conflicts=('kdebindings-smoke')
 source=("http://download.kde.org/unstable/${pkgver}/src/smokekde-${pkgver}.tar.bz2")
 sha1sums=('9fd8cbac3f0affce6fa078b07ca418a5e0c79521')
 

Modified: kdebindings-smokeqt/kde-unstable/PKGBUILD
===================================================================
--- kdebindings-smokeqt/kde-unstable/PKGBUILD	2011-05-24 15:14:28 UTC (rev 124814)
+++ kdebindings-smokeqt/kde-unstable/PKGBUILD	2011-05-24 15:22:45 UTC (rev 124815)
@@ -11,6 +11,7 @@
 groups=('kde' 'kdebindings')
 depends=('kdebase-runtime' 'qimageblitz' 'qscintilla' 'qwt')
 makedepends=('cmake' 'automoc4' 'kdebindings-smokegen')
+conflicts=('kdebindings-smoke')
 source=("http://download.kde.org/unstable/${pkgver}/src/smokeqt-${pkgver}.tar.bz2")
 sha1sums=('872b77e7e445b7492a647e63e267677604d76a96')
 
@@ -27,4 +28,4 @@
 package() {
   cd "${srcdir}"/build
   make DESTDIR="${pkgdir}" install
-}
\ No newline at end of file
+}