diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-21 01:12:38 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-06-21 01:12:38 -0300 |
commit | 62130de96451044ea587d1cef2302c4cf3f910c4 (patch) | |
tree | 7ab5036739c0b7c3aa0ac787287b38652f1bcffb /libre | |
parent | 46d785933a49b1f2d742ca828f7b12c6a9a9d401 (diff) | |
parent | 6d22541bcebb7236bedfb98a96d5a1292072e86c (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/vhba-module/60-vhba.rules
community-testing/vhba-module/PKGBUILD
community-testing/vhba-module/vhba-module.install
core/gcc/PKGBUILD
core/gzip/PKGBUILD
core/logrotate/PKGBUILD
extra/bluez/PKGBUILD
extra/kdeplasma-addons/PKGBUILD
kde-unstable/kdebase-runtime/PKGBUILD
kde-unstable/kdebindings-smokekde/PKGBUILD
kde-unstable/kdeplasma-addons/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/libtool-multilib/PKGBUILD
Diffstat (limited to 'libre')
-rw-r--r-- | libre/filesystem/PKGBUILD | 6 | ||||
-rw-r--r-- | libre/filesystem/gshadow | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD index bc59eabdc..215001c4e 100644 --- a/libre/filesystem/PKGBUILD +++ b/libre/filesystem/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 162078 2012-06-19 14:17:35Z tomegun $ +# $Id: PKGBUILD 162111 2012-06-20 09:33:31Z tomegun $ # Maintainer: Tom Gundersen <teg@jklm.no> # Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar> # Maintainer (Parabola): André Silva <emulatorman@lavabit.com> pkgname=filesystem pkgver=2012.6 -pkgrel=3 +pkgrel=4 pkgdesc='Base filesystem for Parabola' arch=('any') license=('GPL') @@ -93,6 +93,6 @@ md5sums=('45940618da782cc391c59f88ab3333c3' '0e145e18fea8fd190b30d45764f5707c' '6f48288b6fcaf0065fcb7b0e525413e0' '22518e922891f9359f971f4f5b4e793c' - 'd2dc4e39dbdea75b107f91789e3274ab' + 'f95416882cef800edef08382a1176b7d' 'f3b6ae7db8adffaaa4bffc6099dcbd50' 'a8a962370cd0128465d514e6a1f74130') diff --git a/libre/filesystem/gshadow b/libre/filesystem/gshadow index ed176823e..c5c76354e 100644 --- a/libre/filesystem/gshadow +++ b/libre/filesystem/gshadow @@ -19,6 +19,7 @@ rfkill:x:: smmsp::: http::: games::: +lock::: network:x:: video:x:: audio::: |