diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-01 10:33:01 +0100 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-02-01 10:33:01 +0100 |
| commit | 59b32159d6180c35a742ced756dc139659dc1dd5 (patch) | |
| tree | 4f03740ae853d27d51d69666d511ffb527d27a9e /extra/proftpd | |
| parent | 5330206481631dda2c1e585b758c58f90ab807ee (diff) | |
| parent | c34f78dd37c2a2015d43de5d89748a2f8147ba1b (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/openscenegraph/PKGBUILD
community-testing/speed-dreams/PKGBUILD
community-testing/speed-dreams/speed-dreams.desktop
community-testing/xemacs/PKGBUILD
community/ibus/PKGBUILD
extra/kdebase-konsole/PKGBUILD
extra/virtuoso/PKGBUILD
multilib-testing/lib32-gdk-pixbuf2/PKGBUILD
multilib-testing/lib32-pango/PKGBUILD
multilib-testing/wine/PKGBUILD
multilib/lib32-e2fsprogs/PKGBUILD
multilib/lib32-gmp/PKGBUILD
multilib/lib32-libidn/PKGBUILD
multilib/lib32-pixman/PKGBUILD
testing/fontforge/PKGBUILD
testing/java7-openjdk/PKGBUILD
testing/kdebase-workspace/PKGBUILD
testing/kdegraphics-okular/PKGBUILD
testing/kdegraphics-strigi-analyzer/PKGBUILD
testing/libreoffice/PKGBUILD
testing/libreoffice/PKGBUILD.next_stable
testing/opencv/PKGBUILD
testing/php/PKGBUILD
testing/php/php-fpm.conf.in.patch
testing/php/php.ini.patch
testing/xine-ui/PKGBUILD
Diffstat (limited to 'extra/proftpd')
| -rw-r--r-- | extra/proftpd/PKGBUILD | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extra/proftpd/PKGBUILD b/extra/proftpd/PKGBUILD index c510b4659..544b9493d 100644 --- a/extra/proftpd/PKGBUILD +++ b/extra/proftpd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 146388 2012-01-10 00:35:24Z eric $ +# $Id: PKGBUILD 148035 2012-01-30 08:08:56Z eric $ # Maintainer: # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=proftpd pkgver=1.3.4a -pkgrel=2 +pkgrel=3 epoch=1 pkgdesc="A high-performance, scalable FTP server" arch=('i686' 'x86_64' 'mips64el') |