diff options
| author | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-03-11 23:15:54 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <apoyosis@correo.inta.gob.ar> | 2012-03-11 23:15:54 -0300 |
| commit | 6cea5537f59c7c8143c50db711dd09aa0dd116e7 (patch) | |
| tree | 3fdc6a2ffbfe8b855bb2b60627ed263f65417cf0 | |
| parent | d9f33b0e0abb722dfa20f89087485e9bba210b18 (diff) | |
| parent | 68bf66cd46e7a4fd720da07cf10d151c9289f69f (diff) | |
| download | abslibre-6cea5537f59c7c8143c50db711dd09aa0dd116e7.tar.gz abslibre-6cea5537f59c7c8143c50db711dd09aa0dd116e7.tar.bz2 abslibre-6cea5537f59c7c8143c50db711dd09aa0dd116e7.zip | |
Merge branch 'master' of ssh://gparabola/abslibre
| -rw-r--r-- | kernels/linux-libre-rt/PKGBUILD | 2 | ||||
| -rw-r--r-- | libre/hplip-libre/PKGBUILD | 17 | ||||
| -rw-r--r-- | libre/hplip-libre/hplip.install | 1 | ||||
| -rw-r--r-- | libre/linux-libre-aufs_friendly/PKGBUILD | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/kernels/linux-libre-rt/PKGBUILD b/kernels/linux-libre-rt/PKGBUILD index e23622954..47f4e371c 100644 --- a/kernels/linux-libre-rt/PKGBUILD +++ b/kernels/linux-libre-rt/PKGBUILD @@ -8,7 +8,7 @@ # Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy> pkgbase=linux-libre-rt -pkgname=('linux-libre-rt' 'linux-libre-rt-headers') # Build stock -LIBRE kernel +pkgname=('linux-libre-rt' 'linux-libre-rt-headers') # Build stock -LIBRE kernel with RT support # pkgname=linux-custom # Build kernel with a different name _kernelname=${pkgname#linux-libre} _basekernel=3.2 diff --git a/libre/hplip-libre/PKGBUILD b/libre/hplip-libre/PKGBUILD index 058573d05..ff876dfe8 100644 --- a/libre/hplip-libre/PKGBUILD +++ b/libre/hplip-libre/PKGBUILD @@ -1,11 +1,12 @@ # $Id: PKGBUILD 144357 2011-12-05 03:44:51Z eric $ # Maintainer : Rémy Oudompheng <remy@archlinux.org> # Contributor: Morgan LEFIEUX <comete@archlinuxfr.org> +# Contributor (Parabola): Jorge López <jorginho@adinet.com.uy> _pkgname=hplip pkgname=hplip-libre -pkgver=3.11.10 -pkgrel=2 +pkgver=3.12.2 +pkgrel=1 pkgdesc="Drivers for HP DeskJet, OfficeJet, Photosmart, Business Inkjet and some LaserJet" arch=('i686' 'x86_64') url="http://hplipopensource.com" @@ -27,8 +28,8 @@ provides=("${_pkgname}=${pkgver}") options=('!libtool') install=hplip.install source=(http://downloads.sourceforge.net/${_pkgname}/$_pkgname-$pkgver.tar.gz{,.asc}) -md5sums=('6143f30f3b6905ef22105176a3b80db0' - '396bbd8c5cc92aa8295e5bcb508692f3') +sha1sums=('bdf3e37a344f5b57b62425f755c4293d6d4ae875' + 'aa00cdf755fea38f39247a0a4a2e8241dc15112c') build() { cd "$srcdir/$_pkgname-$pkgver" @@ -41,10 +42,8 @@ build() { sed -i 's|python %HOME%|python2 %HOME%|' base/utils.py sed -i 's|python ./plugin.py|python2 ./plugin.py|' base/pkit.py - # fix sysfs rules - sed -i -e "s|SYSFS|ATTR|g" \ - -e "s|sysfs|attr|g" \ - data/rules/56-hpmud_support.rules + export AUTOMAKE='automake --foreign' + autoreconf --force --install ./configure --prefix=/usr \ --enable-qt4 \ @@ -67,4 +66,6 @@ package() { make rulesdir=/lib/udev/rules.d DESTDIR="$pkgdir/" install # remove config provided by sane and autostart of hp-daemon rm -rf "$pkgdir"/etc/{sane.d,xdg} + # remove HAL .fdi file because HAL is no longer used + rm -rf "$pkgdir"/usr/share/hal } diff --git a/libre/hplip-libre/hplip.install b/libre/hplip-libre/hplip.install index a05cbdd50..cb0eaf8e8 100644 --- a/libre/hplip-libre/hplip.install +++ b/libre/hplip-libre/hplip.install @@ -8,4 +8,3 @@ NOTE EOF } - diff --git a/libre/linux-libre-aufs_friendly/PKGBUILD b/libre/linux-libre-aufs_friendly/PKGBUILD index 102a59b24..49b0adba1 100644 --- a/libre/linux-libre-aufs_friendly/PKGBUILD +++ b/libre/linux-libre-aufs_friendly/PKGBUILD @@ -15,7 +15,7 @@ # pkgbase=linux-libre # Comment this line -pkgname=linux-libre-aufs_friendly +pkgname=('linux-libre-aufs_friendly' 'linux-libre-aufs_friendly-headers') # Build stock -LIBRE kernel with AUFS-libre support _kernelname=${pkgname#linux-libre} _basekernel=3.2 |