X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mail.infogroup.kiev.ua (tera.infogroup.kiev.ua [195.144.25.26]) by lists.alpinelinux.org (Postfix) with ESMTP id 8106E5C443A for ; Fri, 3 Jun 2016 14:26:40 +0000 (GMT) Received: from aveo.com.ua ([195.144.25.27] helo=alpine) by mail.infogroup.kiev.ua with esmtpsa (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.80.1) (envelope-from ) id 1b8q3b-0004Tv-MI; Fri, 03 Jun 2016 17:26:39 +0300 From: Valery Kartel To: alpine-aports@lists.alpinelinux.org Cc: Valery Kartel Subject: [alpine-aports] [PATCH] main/nginx: fix collision with deprecated package "nginx-initscripts" Date: Fri, 3 Jun 2016 17:31:51 +0300 Message-Id: <20160603143151.17610-1-valery.kartel@gmail.com> X-Mailer: git-send-email 2.8.3 Sender: droid@infogroup.kiev.ua X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- main/nginx/APKBUILD | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/main/nginx/APKBUILD b/main/nginx/APKBUILD index 6cc3e7d..5741405 100644 --- a/main/nginx/APKBUILD +++ b/main/nginx/APKBUILD @@ -4,7 +4,7 @@ pkgname=nginx pkgver=1.10.0 -pkgrel=0 +pkgrel=1 pkgdesc="HTTP and reverse proxy server" url="http://www.nginx.org/en" arch="all" @@ -134,6 +134,7 @@ package() { common() { pkgdesc="$pkgdesc (common files)" depends= + replaces="nginx-initscripts" arch="noarch" mkdir -p "$subpkgdir" mv "$pkgdir"/etc "$pkgdir"/var "$subpkgdir"/ -- 2.8.3 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---