diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-01 16:12:04 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-01 16:12:04 -0300 |
commit | ca8ab20a665411e312578954c85f1bd3913fc726 (patch) | |
tree | 98db13a83d797b74078d5b957f057a59cc91992b /core/systemd | |
parent | aee193a88b17ec5a5fa2b028f42dbe4161e3390d (diff) | |
parent | 55f2d1ab0ab1bd2f7c8c7c5cefeb45f7c457a5d9 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
core/systemd/PKGBUILD
core/sysvinit/PKGBUILD
extra/hyphen/PKGBUILD
extra/imagemagick/PKGBUILD
extra/lynx/PKGBUILD
extra/pyqt/PKGBUILD
extra/sip/PKGBUILD
libre/kdelibs-libre/PKGBUILD
testing/libdrm/PKGBUILD
testing/xf86-video-ati/PKGBUILD
Diffstat (limited to 'core/systemd')
-rw-r--r-- | core/systemd/PKGBUILD | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD index 98789a832..8294cc2fb 100644 --- a/core/systemd/PKGBUILD +++ b/core/systemd/PKGBUILD @@ -4,7 +4,7 @@ pkgbase=systemd pkgname=('systemd' 'libsystemd' 'systemd-tools' 'systemd-sysvcompat') pkgver=185 -pkgrel=3 +pkgrel=4 arch=('i686' 'x86_64' 'mips64el') url="http://www.freedesktop.org/wiki/Software/systemd" license=('GPL2' 'LGPL2.1' 'MIT') @@ -64,7 +64,7 @@ package_systemd() { "systemd-tools=$pkgver" 'util-linux' 'xz') optdepends=('python2-dbus: systemd-analyze' 'initscripts: legacy support for hostname and vconsole setup' - 'initscripts-systemd: native boot and initialization scripts' + 'initscripts-systemd: legacy generator for initialization scripts' 'python2-cairo: systemd-analyze' 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts' 'systemd-sysvcompat: symlink package to provide sysvinit binaries') @@ -181,7 +181,7 @@ package_libsystemd() { package_systemd-tools() { pkgdesc='standalone tools from systemd' url='http://www.freedesktop.org/wiki/Software/systemd' - depends=('acl' 'bash' 'glibc' 'glib2' 'kmod' 'hwids' 'util-linux' 'kbd') + depends=('acl' 'bash' 'glibc' 'glib2' 'libsystemd' 'kmod' 'hwids' 'util-linux' 'kbd') optdepends=('cryptsetup: required for encrypted block devices') provides=("udev=$pkgver") conflicts=('udev') |