From e088246e81c88f1f7cbef74d7df7f5359cc9b72c Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Mon, 1 Aug 2011 03:52:39 -0500
Subject: initscripts: move conf.d/wireless to wireless.example. Quick and easy
 way to get around a file conflict

---
 abs/core/initscripts/PKGBUILD    | 4 ++--
 abs/core/initscripts/__changelog | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/abs/core/initscripts/PKGBUILD b/abs/core/initscripts/PKGBUILD
index 1b93983..0e07da3 100644
--- a/abs/core/initscripts/PKGBUILD
+++ b/abs/core/initscripts/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=initscripts
 pkgver=2011.06.4
-pkgrel=2
+pkgrel=3
 pkgdesc="System initialization/bootup scripts"
 arch=('i686' 'x86_64')
 url="http://www.archlinux.org"
@@ -32,7 +32,7 @@ package() {
   patch -p0 < ${srcdir}/rc.shutdown.patch || exit 1
   patch -p0 < ${srcdir}/rc.multi.patch || exit 1
   make DESTDIR=${pkgdir} install
-  install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless
+  install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless.example
 }
 md5sums=('34cbe55f3f42069c59237db935d0511b'
          '027576534885b8d5dded9be546057b12'
diff --git a/abs/core/initscripts/__changelog b/abs/core/initscripts/__changelog
index 8d03d24..58bfd36 100644
--- a/abs/core/initscripts/__changelog
+++ b/abs/core/initscripts/__changelog
@@ -1 +1,7 @@
 Patch init scripts
+  patch -p0 < ${srcdir}/rc.sysinit.patch || exit 1
+  patch -p0 < ${srcdir}/rc.shutdown.patch || exit 1
+  patch -p0 < ${srcdir}/rc.multi.patch || exit 1
+
+
+rename wireless.conf -> wireless.conf.example
-- 
cgit v0.12

