Remove edbus and ephysics from conflicts array, they don't exist as packages

3 files changed, 6 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f75e8c3222de..06a66917c5ac 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -66,11 +66,10 @@ pkgbase = efl-git
 	provides = ephysics-svn
 	provides = ethumb-svn
 	provides = evas-svn
-	provides = efl-svn
 	provides = efl
 	provides = efl_x11
+	provides = efl-svn
 	conflicts = ecore
-	conflicts = edbus
 	conflicts = edje
 	conflicts = eet
 	conflicts = eeze
@@ -79,12 +78,11 @@ pkgbase = efl-git
 	conflicts = eio
 	conflicts = embryo
 	conflicts = emotion
-	conflicts = ephysics
 	conflicts = ethumb
 	conflicts = evas
-	conflicts = efl-svn
 	conflicts = efl
 	conflicts = efl_x11
+	conflicts = efl-svn
 	options = !libtool
 	options = debug
 	source = git://git.enlightenment.org/core/efl.git
diff --git a/.gitignore b/.gitignore
index cfd5f1c65302..71a9d16c2b38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 *~
-src/
-pkg/
+*/
 *.tar.*
 *.log
diff --git a/PKGBUILD b/PKGBUILD
index 0d3cee53c234..581f8c740612 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -28,10 +28,9 @@ provides=('ecore=$pkgver' 'edbus=$pkgver' 'edje=$pkgver' 'eet=$pkgver' 'eeze=$pk
           'ephysics=$pkgver' 'ethumb=$pkgver' 'evas=$pkgver'
           'ecore-svn' 'edbus-svn' 'edje-svn' 'eet-svn' 'eeze-svn' 'efreet-svn' 'eina-svn'
           'eio-svn' 'embryo-svn' 'emotion-svn' 'ephysics-svn' 'ethumb-svn' 'evas-svn'
-          'efl-svn' 'efl' 'efl_x11')
-conflicts=('ecore' 'edbus' 'edje' 'eet' 'eeze' 'efreet' 'eina'
-           'eio' 'embryo' 'emotion' 'ephysics' 'ethumb' 'evas'
-           'efl-svn' 'efl' 'efl_x11')
+          'efl' 'efl_x11' 'efl-svn')
+conflicts=('ecore' 'edje' 'eet' 'eeze' 'efreet' 'eina' 'eio' 'embryo' 'emotion' 'ethumb' 'evas'
+           'efl' 'efl_x11' 'efl-svn')
 options=('!libtool' 'debug')
 install=efl.install
 source=("git://git.enlightenment.org/core/$_pkgname.git")