makedeb


vim-gtk3-git 8.2.4586-1


Vim the editor. CLI version and GTK2 GUI providing majority of features.

Click here to go back to the commit logs for vim-gtk3-git.

Commit:


Hash: b05c5ec51b0c3c5d055ba8b4149f1e43bfc42275

Message: Fix python dependency

Diff


diff --git a/.SRCINFO b/.SRCINFO
index c721120..37ba74e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -13,12 +13,15 @@ pkgbase = vim-gtk3-git
 	makedepends = liblua5.4-dev
 	makedepends = libperl-dev
 	makedepends = ruby-dev
-	makedepends = python-dev-is-python3
+	makedepends = libpython3-dev
+	makedepends = libpython2-dev
 	depends = git
 	depends = lua5.4
 	depends = make
 	depends = clang
 	depends = ruby
+	depends = python2
+	depends = python3
 	depends = libtool-bin
 	depends = vim-runtime-git
 	optdepends = exuberant-ctags
@@ -31,7 +34,6 @@ pkgbase = vim-gtk3-git
 	conflicts = vim-minimal-git
 	conflicts = vim
 	conflicts = vim-git
-	conflicts = vim-python3
 	conflicts = vim-gtk3
 	conflicts = vim-gtk3-python3
 	conflicts = vim-gui-common
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..87b6465
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+*
+
+!PKGBUILD
+!.SRCINFO
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index a3e0964..42f835d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,11 +12,11 @@ pkgdesc='Vim the editor. CLI version and GTK2 GUI providing majority of features
 arch=('i686' 'x86_64')
 url='http://www.vim.org'
 license=('custom:vim')
-depends=('git' 'lua5.4' 'make' 'clang' 'ruby' 'libtool-bin' 'vim-runtime-git')
+depends=('git' 'lua5.4' 'make' 'clang' 'ruby' 'python2' 'python3' 'libtool-bin' 'vim-runtime-git')
 optdepends=('exuberant-ctags' 'universal-ctags')
-makedepends=('libxt-dev' 'libgtk-3-dev' 'liblua5.4-dev' 'libperl-dev' 'ruby-dev' 'python-dev-is-python3')
+makedepends=('libxt-dev' 'libgtk-3-dev' 'liblua5.4-dev' 'libperl-dev' 'ruby-dev' 'libpython3-dev' 'libpython2-dev')
 provides=('vim' 'vim-gtk' 'vim-gtk3' 'xxd')
-conflicts=("vim-minimal"{,-git} "vim"{,-git} 'vim-python3' 'vim-gtk3'{,-python3} 'vim-gui-common' 'vim-common' 'xxd')
+conflicts=("vim-minimal"{,-git} "vim"{,-git} 'vim-gtk3'{,-python3} 'vim-gui-common' 'vim-common' 'xxd')
 source=("git+https://github.com/$_pkgname/$_pkgname.git")
 sha256sums=("SKIP")