summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolás Reynolds <apoyosis@correo.inta.gob.ar>2011-10-18 13:45:16 -0300
committerNicolás Reynolds <apoyosis@correo.inta.gob.ar>2011-10-18 13:45:16 -0300
commit2a454ca92af2c061365c7647031fb0a3a1a618b0 (patch)
treeb76b664449646d7ae178330ffbfe5a0f9f9620aa
parent1b50774a989848d3992927b0d0b2b539edb6b198 (diff)
parent0173b2f825901ca3be267b59bf4e521614488f3b (diff)
Merge branch 'master' of ssh://gparabola/abslibre
-rw-r--r--libre/filesystem/PKGBUILD42
-rw-r--r--libre/filesystem/fstab4
-rw-r--r--libre/unarchiver/PKGBUILD8
3 files changed, 26 insertions, 28 deletions
diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD
index 958d21e01..ea1e0e4f9 100644
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 135046 2011-08-09 23:41:13Z tomegun $
+# $Id: PKGBUILD 140217 2011-10-09 23:32:13Z dreisner $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Maintainer (Parabola): fauno <fauno@kiwwwi.com.ar>
pkgname=filesystem
-pkgver=2011.08
-pkgrel=1.1
+pkgver=2011.10
+pkgrel=1
pkgdesc='Base filesystem for Parabola'
arch=('any')
license=('GPL')
@@ -18,6 +18,23 @@ backup=('etc/fstab' 'etc/crypttab' 'etc/group' 'etc/hosts' 'etc/ld.so.conf' 'etc
source=('group' 'issue' 'nsswitch.conf' 'securetty' 'host.conf' 'ld.so.conf'
'passwd' 'shadow' 'fstab' 'crypttab' 'hosts' 'motd' 'resolv.conf' 'shells'
'gshadow' 'profile' 'modprobe.d.usb-load-ehci-first')
+md5sums=('772fe869b921698cc3e6fde73c4ac85a'
+ '140787c0dc6f3f1272cfd381b92b0155'
+ '13753e4e0964f3652b0cc60a28528bdf'
+ '4c4540eeb748bf1f71d631b8c1dcf0b3'
+ 'f28150d4c0b22a017be51b9f7f9977ed'
+ '6e488ffecc8ba142c0cf7e2d7aeb832e'
+ '8a9042a2cedf6b6b47eb8973f14289cb'
+ 'b8355d9d2782f424f4cedcf682651be0'
+ 'ca716f853860199c1286e7939b2f2666'
+ 'e5d8323a4dbee7a6d0d2a19cbf4b819f'
+ '7bc65f234dfb6abf24e7c3b03e86f4ff'
+ 'd41d8cd98f00b204e9800998ecf8427e'
+ '6f48288b6fcaf0065fcb7b0e525413e0'
+ '22518e922891f9359f971f4f5b4e793c'
+ 'd2dc4e39dbdea75b107f91789e3274ab'
+ 'f3b6ae7db8adffaaa4bffc6099dcbd50'
+ '8098ffd9fbf890468d3198277596b85a')
package() {
cd ${srcdir}
@@ -43,7 +60,7 @@ package() {
install -m600 ${srcdir}/${f} ${pkgdir}/etc/
done
touch ${pkgdir}/etc/arch-release
- install -D -m644 ${srcdir}/modprobe.d.usb-load-ehci-first ${pkgdir}/etc/modprobe.d/usb-load-ehci-first.conf
+ install -D -m644 ${srcdir}/modprobe.d.usb-load-ehci-first ${pkgdir}/lib/modprobe.d/usb-load-ehci-first.conf
# setup /var
for d in cache/man local opt run log/old lib/misc empty; do
@@ -76,20 +93,3 @@ package() {
done
ln -s ../man ${pkgdir}/usr/local/share/man
}
-md5sums=('772fe869b921698cc3e6fde73c4ac85a'
- '140787c0dc6f3f1272cfd381b92b0155'
- '13753e4e0964f3652b0cc60a28528bdf'
- '4c4540eeb748bf1f71d631b8c1dcf0b3'
- 'f28150d4c0b22a017be51b9f7f9977ed'
- '6e488ffecc8ba142c0cf7e2d7aeb832e'
- '8a9042a2cedf6b6b47eb8973f14289cb'
- 'b8355d9d2782f424f4cedcf682651be0'
- '6e81e088e67741210622e60292a39c9c'
- 'e5d8323a4dbee7a6d0d2a19cbf4b819f'
- '7bc65f234dfb6abf24e7c3b03e86f4ff'
- 'd41d8cd98f00b204e9800998ecf8427e'
- '6f48288b6fcaf0065fcb7b0e525413e0'
- '22518e922891f9359f971f4f5b4e793c'
- 'd2dc4e39dbdea75b107f91789e3274ab'
- 'f3b6ae7db8adffaaa4bffc6099dcbd50'
- '8098ffd9fbf890468d3198277596b85a')
diff --git a/libre/filesystem/fstab b/libre/filesystem/fstab
index c1a07fcc7..f7f9298d4 100644
--- a/libre/filesystem/fstab
+++ b/libre/filesystem/fstab
@@ -1,5 +1,5 @@
#
# /etc/fstab: static file system information
#
-# <file system> <dir> <type> <options> <dump> <pass>
-tmpfs /tmp tmpfs nodev,noexec,nosuid 0 0
+# <file system> <dir> <type> <options> <dump> <pass>
+tmpfs /tmp tmpfs nodev,nosuid 0 0
diff --git a/libre/unarchiver/PKGBUILD b/libre/unarchiver/PKGBUILD
index b319676c4..0d597d96f 100644
--- a/libre/unarchiver/PKGBUILD
+++ b/libre/unarchiver/PKGBUILD
@@ -1,17 +1,15 @@
# Maintainer: Cedric Girard <girard.cedric@gmail.com>
pkgname=unarchiver
pkgver=2.7.1
-pkgrel=2
+pkgrel=3
pkgdesc="An Objective-C application for uncompressing archive files"
arch=('x86_64' 'i686')
url="http://wakaba.c3.cx/s/apps/unarchiver.html"
license=('LGPL2.1')
-depends=('gnustep-base' 'openssl' 'bzip2' 'icu' 'gcc-libs' 'zlib')
+depends=('gnustep-base>=1.23.0-1.1' 'openssl' 'bzip2' 'icu' 'gcc-libs' 'zlib')
+conflicts=('gnustep-base>=1.24')
makedepends=('gcc-objc')
source=(http://theunarchiver.googlecode.com/files/TheUnarchiver"$pkgver"_src.zip)
-replaces=('unrar')
-conflicts=('unrar')
-provides=('unrar')
build() {
cd "$srcdir/The Unarchiver/XADMaster"