diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-01 14:47:52 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-05-01 14:47:52 +0200 |
| commit | c8bd9200906149d53827aaa64e85a7008d51339f (patch) | |
| tree | 9e366130f0f7afde9d7a478b5c898d873aed0483 /extra/jack | |
| parent | d9a9508e07a00015e2a2f278719a9665ff565961 (diff) | |
| parent | 752015395fc8b95cc4a86b68189cb747fe9a8499 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/jack2/PKGBUILD
extra/pulseaudio/PKGBUILD
extra/vim/PKGBUILD
multilib/lib32-gnutls/PKGBUILD
testing/dmraid/PKGBUILD
testing/dmraid/dmraid_hook
testing/dmraid/dmraid_install
testing/e2fsprogs/PKGBUILD
testing/openssh/PKGBUILD
testing/openssh/sshd.pam
testing/php/PKGBUILD
testing/php/php-fpm.conf.in.patch
testing/php/php.ini.patch
testing/xfce4-session/PKGBUILD
Diffstat (limited to 'extra/jack')
| -rw-r--r-- | extra/jack/PKGBUILD | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/extra/jack/PKGBUILD b/extra/jack/PKGBUILD index 477a12170..50560b8aa 100644 --- a/extra/jack/PKGBUILD +++ b/extra/jack/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 145264 2011-12-20 18:09:32Z schiv $ +# $Id: PKGBUILD 157734 2012-04-29 05:10:29Z allan $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: tobias <tobias@archlinux.net> # Contributor: Robert Emil Berge <robert@rebi.no> @@ -6,7 +6,7 @@ pkgname=jack _longname=jack-audio-connection-kit pkgver=0.121.3 -pkgrel=5 +pkgrel=6 pkgdesc="A low-latency audio server" arch=('i686' 'x86_64' 'mips64el') license=('GPL' 'LGPL') @@ -51,7 +51,7 @@ package() { "$pkgdir/etc/security/limits.d/99-audio.conf" install -Dm644 "$srcdir/40-hpet-permissions.rules" \ - "$pkgdir/lib/udev/rules.d/40-hpet-permissions.rules" + "$pkgdir/usr/lib/udev/rules.d/40-hpet-permissions.rules" # install a missing header forgotten by upstream # see https://bugs.archlinux.org/task/26865 |