From 125e219692417cd15c417403a17ccbd7d44bd6b5 Mon Sep 17 00:00:00 2001
From: "Adrian C. (anrxc)" <anrxc@sysphere.org>
Date: Mon, 26 Nov 2012 22:54:21 +0100
Subject: aic: setup conflicts for the initscripts-aic package

---
 README        |  2 +-
 arch/PKGBUILD | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/README b/README
index 707046f..5994170 100644
--- a/README
+++ b/README
@@ -3,7 +3,7 @@ init scripts
 The initscripts-aic package is a repository of Arch Linux sysvinit
 boot scripts and functions.
 
-  - http://git.sysphere.org/initscripts-aic/
+  - http://git.sysphere.org/initscripts/
 
 
 License
diff --git a/arch/PKGBUILD b/arch/PKGBUILD
index 3c336b3..f71840f 100644
--- a/arch/PKGBUILD
+++ b/arch/PKGBUILD
@@ -3,16 +3,17 @@
 # Contributor: Thomas Bächler <thomas@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
-pkgname=initscripts
+pkgname=initscripts-aic
+_gitname=initscripts
 pkgver=2012.10.1
 pkgrel=1
 pkgdesc="System initialization/bootup scripts"
 arch=('any')
 url="http://www.archlinux.org"
 license=('GPL2')
-provides=('initscripts-systemd')
-conflicts=('initscripts-systemd')
-replaces=('initscripts-systemd')
+provides=('initscripts'  'initscripts-systemd')
+conflicts=('initscripts' 'initscripts-systemd')
+replaces=('initscripts'  'initscripts-systemd')
 backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown)
 depends=('glibc' 'bash' 'coreutils' 'systemd-tools' 'iproute2' 'ncurses' 'findutils' 'sysvinit-tools')
 optdepends=('dhcpcd: DHCP network configuration'
@@ -22,11 +23,14 @@ optdepends=('dhcpcd: DHCP network configuration'
             'sysvinit: Legacy init support')
 makedepends=(asciidoc)
 install=initscripts.install
-source=("ftp://ftp.archlinux.org/other/initscripts/${pkgname}-${pkgver}.tar.xz")
+# Upstream still fully compatible with sysvinit/sysvinit-tools
+# - Nov 26, 22:44:40 CET 2012
+source=("ftp://ftp.archlinux.org/other/initscripts/${_gitname}-${pkgver}.tar.xz")
+#source=("http://git.sysphere.org/${_gitname}/${_gitname}-${pkgver}.tar.xz")
+md5sums=('a4a747e73819b81f2218cf5b9bd53703')
 
 package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
+  cd ${srcdir}/${_gitname}-${pkgver}
 
   make DESTDIR=${pkgdir} install
 }
-md5sums=('a4a747e73819b81f2218cf5b9bd53703')
-- 
cgit v1.2.3