diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-20 20:41:20 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-20 20:41:20 -0300 |
| commit | 33fcf0e7b95e530b849e59e90fdea4001e01283d (patch) | |
| tree | 5eab4f238207cce42c8351067ade9999df065a1f /extra/lirc | |
| parent | 3b0910bf6527c3b761d9579b2ed37a9a42595fa3 (diff) | |
| parent | a1922d0ec660fdc1892f2783515f781c090df0a9 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/gnash/PKGBUILD
community/libopenraw/PKGBUILD
community/smalltalk/PKGBUILD
core/coreutils/PKGBUILD
core/libarchive/PKGBUILD
extra/dhcp/PKGBUILD
extra/gmime/PKGBUILD
extra/gvfs/PKGBUILD
extra/kdeutils/PKGBUILD
extra/libreoffice/PKGBUILD
extra/lirc/PKGBUILD
extra/php-suhosin/PKGBUILD
extra/qtwebkit/PKGBUILD
extra/sdl_image/PKGBUILD
extra/sdl_net/PKGBUILD
extra/sdl_ttf/PKGBUILD
extra/spamassassin/PKGBUILD
extra/tftp-hpa/PKGBUILD
extra/totem-plparser/PKGBUILD
extra/tumbler/PKGBUILD
extra/vim/PKGBUILD
extra/wipe/PKGBUILD
extra/xfce4-netload-plugin/PKGBUILD
kde-unstable/kdebase-workspace/PKGBUILD
kde-unstable/kdebase-workspace/kde-np.pam
kde-unstable/kdebase-workspace/kde.pam
multilib/binutils-multilib/PKGBUILD
multilib/chuck/PKGBUILD
multilib/dev86/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/jack2-multilib/PKGBUILD
multilib/lib32-gdk-pixbuf2/PKGBUILD
multilib/lib32-glib2/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-glibc/lib32-glibc.conf
multilib/lib32-gtk2/PKGBUILD
multilib/lib32-libpulse/PKGBUILD
multilib/lib32-pango/PKGBUILD
multilib/lib32-sdl_image/PKGBUILD
multilib/lib32-sdl_ttf/PKGBUILD
multilib/libtool-multilib/PKGBUILD
multilib/nspluginwrapper/PKGBUILD
multilib/q4wine/PKGBUILD
multilib/wine/PKGBUILD
staging/php/PKGBUILD
staging/php/php-fpm.conf.in.patch
staging/php/php.ini.patch
Diffstat (limited to 'extra/lirc')
| -rw-r--r-- | extra/lirc/PKGBUILD | 10 | ||||
| -rw-r--r-- | extra/lirc/lirc.install | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/extra/lirc/PKGBUILD b/extra/lirc/PKGBUILD index 502905d48..a5988a0d5 100644 --- a/extra/lirc/PKGBUILD +++ b/extra/lirc/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 142392 2011-11-08 22:38:56Z thomas $ +# $Id: PKGBUILD 146925 2012-01-19 10:00:36Z thomas $ # Maintainer: Paul Mattal <paul@archlinux.org> pkgbase=lirc pkgname=('lirc' 'lirc-utils') pkgver=0.9.0 -pkgrel=8 +pkgrel=10 epoch=1 -_extramodules=extramodules-3.1-LIBRE +_extramodules=extramodules-3.2-LIBRE _kernver="$(cat /lib/modules/${_extramodules}/version)" arch=('i686' 'x86_64' 'mips64el') url="http://www.lirc.org/" license=('GPL') -makedepends=('help2man' 'linux-libre-headers>=3.1' 'linux-libre-headers<3.2' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2') +makedepends=('help2man' 'linux-headers>=3.2' 'linux-headers<3.3' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2') options=('!makeflags' '!strip') source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2 lirc_wpc8769l.patch @@ -61,7 +61,7 @@ build() { package_lirc() { pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel" - depends=('lirc-utils' 'linux-libre>=3.1' 'linux-libre<3.2') + depends=('lirc-utils' 'linux>=3.2' 'linux<3.3') replaces=('lirc+pctv') install=lirc.install diff --git a/extra/lirc/lirc.install b/extra/lirc/lirc.install index 1e7c4f4a1..9bf905742 100644 --- a/extra/lirc/lirc.install +++ b/extra/lirc/lirc.install @@ -1,4 +1,4 @@ -EXTRAMODULES=extramodules-3.1-ARCH +EXTRAMODULES=extramodules-3.2-ARCH post_install() { # updating module dependencies |