From 4caeb09b39dc7124d7bf848ce0fd3722454f4aac Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 13 Jul 2012 16:16:06 +0000
Subject: main/awall: allow awall package take over files from awall-nat

---
 main/awall/APKBUILD | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/main/awall/APKBUILD b/main/awall/APKBUILD
index edc1c1ce94..5c9ccf131d 100644
--- a/main/awall/APKBUILD
+++ b/main/awall/APKBUILD
@@ -2,11 +2,12 @@
 # Maintainer: Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi>
 pkgname=awall
 pkgver=0.2.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Alpine Wall"
 url=http://git.alpinelinux.org/cgit/kunkku/awall/
 arch=noarch
 license=GPL-2
+replaces="awall-nat"
 depends="bind-tools ip6tables ipset iptables lua lua-alt-getopt lua-filesystem lua-json4 lua-pc lua-signal lua-sleep lua-stringy"
 subpackages=$pkgname-masquerade
 source="${url}snapshot/awall-${pkgver}.tar.bz2"
-- 
cgit v1.2.3