summaryrefslogtreecommitdiff
path: root/core/sysvinit-tools
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@endefensadelsl.org>2013-06-20 16:36:47 -0300
committerNicolás Reynolds <fauno@endefensadelsl.org>2013-06-20 16:36:47 -0300
commit572f3b3bd973bfa7e64c4c42fe87c8e3a79b7c20 (patch)
tree89f43dd22eaacadfa97977de1f3b73285da15735 /core/sysvinit-tools
parentcebf33d7109e0157a80f34d6136e212f0a28d274 (diff)
parent5898d76e47144f2366f9acda9ab52827b696c2d5 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/bitcoin/PKGBUILD community/ecryptfs-utils/PKGBUILD community/erlang/PKGBUILD community/esmtp/PKGBUILD community/gmic/PKGBUILD community/ibus-sunpinyin/PKGBUILD community/libev/PKGBUILD community/libmirage/PKGBUILD community/libraw/PKGBUILD community/lilypond/PKGBUILD community/luajit/PKGBUILD community/matchbox-window-manager/PKGBUILD community/miniupnpc/PKGBUILD community/mplayer2/PKGBUILD community/mumble/PKGBUILD community/oss/PKGBUILD community/pidgin-lwqq/PKGBUILD community/postgis/PKGBUILD community/python2-pytables/PKGBUILD community/qmc2/PKGBUILD community/qtfm/PKGBUILD community/ruby-gtk3/PKGBUILD community/tea/PKGBUILD community/yacpi/PKGBUILD core/bridge-utils/PKGBUILD core/gcc/PKGBUILD core/libsasl/PKGBUILD core/lvm2/PKGBUILD core/net-tools/PKGBUILD core/ppp/PKGBUILD core/pptpclient/PKGBUILD core/sdparm/PKGBUILD core/systemd/PKGBUILD core/sysvinit-tools/PKGBUILD extra/aisleriot/PKGBUILD extra/arora/PKGBUILD extra/bluez-hcidump/PKGBUILD extra/bluez/PKGBUILD extra/cups/PKGBUILD extra/cyrus-sasl/PKGBUILD extra/dhcp/PKGBUILD extra/gnome-bluetooth/PKGBUILD extra/gnome-desktop/PKGBUILD extra/gnutls/PKGBUILD extra/gts/PKGBUILD extra/guile/PKGBUILD extra/harfbuzz/PKGBUILD extra/iptraf-ng/PKGBUILD extra/json-c/PKGBUILD extra/kdenetwork/PKGBUILD extra/kdepim/PKGBUILD extra/kdesdk-kate/PKGBUILD extra/libatasmart/PKGBUILD extra/libbsd/PKGBUILD extra/libdmtx/PKGBUILD extra/libhangul/PKGBUILD extra/libindi/PKGBUILD extra/libpeas/PKGBUILD extra/libsmbios/PKGBUILD extra/libspiro/PKGBUILD extra/libsrtp/PKGBUILD extra/libxml2/PKGBUILD extra/libxrender/PKGBUILD extra/libxvmc/PKGBUILD extra/llvm/PKGBUILD extra/maxima/PKGBUILD extra/msmtp/PKGBUILD extra/ortp/PKGBUILD extra/perl-dbd-sqlite/PKGBUILD extra/perl-yaml-syck/PKGBUILD extra/php/PKGBUILD extra/pm-utils/PKGBUILD extra/pulseaudio/PKGBUILD extra/pyqt4/PKGBUILD extra/scim-anthy/PKGBUILD extra/scim-chewing/PKGBUILD extra/scim-m17n/PKGBUILD extra/scim/PKGBUILD extra/ssmtp/PKGBUILD extra/texmacs/PKGBUILD extra/v86d/PKGBUILD extra/vlc/PKGBUILD extra/webkitgtk/PKGBUILD extra/webkitgtk2/PKGBUILD extra/wireshark/PKGBUILD extra/zsh/PKGBUILD libre/bogofilter-libre/PKGBUILD libre/ecasound-libre/PKGBUILD libre/libretools/libretools.install libre/mc-libre/PKGBUILD
Diffstat (limited to 'core/sysvinit-tools')
-rw-r--r--core/sysvinit-tools/PKGBUILD11
1 files changed, 8 insertions, 3 deletions
diff --git a/core/sysvinit-tools/PKGBUILD b/core/sysvinit-tools/PKGBUILD
index e51f5baab..a576e6a05 100644
--- a/core/sysvinit-tools/PKGBUILD
+++ b/core/sysvinit-tools/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 185338 2013-05-13 13:18:59Z tomegun $
+# $Id: PKGBUILD 187044 2013-06-03 11:15:38Z allan $
# Maintainer: Tom Gundersen <teg@jklm.no>
# Maintainer: Eric Belanger <eric@archlinux.org>
pkgname=sysvinit-tools
pkgver=2.88
-pkgrel=10
+pkgrel=11
arch=('i686' 'x86_64' 'mips64el')
url="http://savannah.nongnu.org/projects/sysvinit"
license=('GPL')
@@ -32,8 +32,8 @@ package() {
cd "${srcdir}/sysvinit-${pkgver}dsf"
make ROOT="${pkgdir}" install
- ### drop the stuff provided by systemd-sysvcompat and util-linux
cd "${pkgdir}"
+ ### drop the stuff provided by systemd-sysvcompat and util-linux
rm -r usr/share/man/man5
rm -r usr/include
rm bin/mountpoint
@@ -41,4 +41,9 @@ package() {
rm usr/bin/{mesg,utmpdump,wall}
rm usr/share/man/man1/{mountpoint,mesg,utmpdump,wall}.1
rm usr/share/man/man8/{halt,init,poweroff,reboot,runlevel,shutdown,telinit,sulogin}.8
+ ### usrmerge
+ mv sbin/* usr/bin/
+ rm -r sbin
+ mv bin/* usr/bin/
+ rm -r bin
}