diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-03 19:35:59 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-03-03 19:35:59 +0100 |
commit | 8288f4022c5673fa36117598c7e7a3f6c2dfb1e2 (patch) | |
tree | 35b688c3ea6cc6a70169239cbc4cce363280f27b /community/duplicity | |
parent | 3d7ac901b631943e595c15f8405b6d66770573e9 (diff) | |
parent | d8fb549de0ef3299436c448f7b45fd8ebee8e733 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/virtualbox-modules/PKGBUILD
community/duplicity/PKGBUILD
extra/bind/PKGBUILD
libre/linux-libre/PKGBUILD
multilib-testing/lib32-glibc/PKGBUILD
multilib-testing/lib32-glibc/glibc-2.12.2-ignore-origin-of-privileged-program.patch
multilib-testing/lib32-glibc/glibc-2.15-ifunc.patch
multilib-testing/lib32-glibc/glibc-2.15-revert-netlink-cache.patch
multilib-testing/lib32-glibc/glibc-2.15-scanf.patch
multilib/lib32-gnutls/PKGBUILD
multilib/lib32-libdrm/PKGBUILD
multilib/lib32-libpng/PKGBUILD
multilib/lib32-sdl/PKGBUILD
testing/lirc/PKGBUILD
Diffstat (limited to 'community/duplicity')
-rw-r--r-- | community/duplicity/PKGBUILD | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/community/duplicity/PKGBUILD b/community/duplicity/PKGBUILD index 5c3163f90..6eda849ae 100644 --- a/community/duplicity/PKGBUILD +++ b/community/duplicity/PKGBUILD @@ -1,21 +1,17 @@ -# $Id: PKGBUILD 62636 2012-01-23 00:53:34Z lfleischer $ +# $Id: PKGBUILD 66933 2012-03-01 18:56:05Z lfleischer $ # Maintainer: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Aaron Schaefer <aaron@elasticdog.com> pkgname=duplicity -pkgver=0.6.17 -pkgrel=4 -pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm' +pkgver=0.6.18 +pkgrel=1 +pkgdesc='A utility for encrypted, bandwidth-efficient backups using the rsync algorithm.' arch=('i686' 'x86_64' 'mips64el') url='http://www.nongnu.org/duplicity/' license=('GPL') depends=('librsync' 'ncftp' 'python2' 'python-boto' 'python-gnupginterface') -source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz" - 'botobackend.patch' - 'duplicity-0.6.17-fix-memleak.patch') -md5sums=('36423ab4e3b9aa90c5c44d9fa93fba0f' - '49bbdc327230fe5985d18eaae37eec0c' - 'b77e98d006842414fdda9662c8081d3b') +source=("http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('66b5e64de43e09d3c3ff9890faf9de07') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -26,12 +22,6 @@ build() { sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file done - # add hotfix issued by upstream (FS#27390) - patch -p0 -i ../botobackend.patch - - # fix a memory leak (upstream bug #908228) - patch -p0 -i ../duplicity-0.6.17-fix-memleak.patch - python2 setup.py install --root="$pkgdir" --optimize=1 # fix broken documentation permissions until upstream does (FS#27301) |