diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2014-01-23 07:40:11 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2014-01-23 07:40:11 +0000 |
| commit | a34a5dcf81b53f781e83f857e429d79e945f8af2 (patch) | |
| tree | 9a6f8b8e6109c6a2c971e6d4ecb184dc5d786867 /main/git | |
| parent | 9ff035dcc6aad68ecf4a6370a7127e492cb23c27 (diff) | |
| download | aports-a34a5dcf81b53f781e83f857e429d79e945f8af2.tar.bz2 aports-a34a5dcf81b53f781e83f857e429d79e945f8af2.tar.xz | |
main/git: use system's perl-error
this fixes file conflict:
ERROR: perl-error-0.17021-r0: trying to overwrite usr/share/perl5/vendor_perl/Error.pm owned by perl-git-1.8.5.3-r0.
Diffstat (limited to 'main/git')
| -rw-r--r-- | main/git/APKBUILD | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/git/APKBUILD b/main/git/APKBUILD index 2d505bbb78..06ecdbd320 100644 --- a/main/git/APKBUILD +++ b/main/git/APKBUILD @@ -1,7 +1,7 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=git pkgver=1.8.5.3 -pkgrel=0 +pkgrel=1 pkgdesc="A distributed version control system" url="http://git.or.cz/" arch="all" @@ -24,7 +24,7 @@ subpackages="$pkgname-doc " makedepends="zlib-dev openssl-dev curl-dev expat-dev perl-dev python-dev - pcre-dev asciidoc xmlto" + pcre-dev asciidoc xmlto perl-error" source="http://git-core.googlecode.com/files/git-$pkgver.tar.gz 0001-config-add-_cb-suffix-to-callback-functions.patch bb-tar.patch @@ -81,7 +81,7 @@ _perl_git_svn() { _perl_git() { pkgdesc="Perl interface to Git" - depends="git=$pkgver-r$pkgrel" + depends="git=$pkgver-r$pkgrel perl-error" replaces="git-perl" eval local `perl -V:vendorlib` eval local `perl -V:vendorarch` |