X-Original-To: alpine-aports@mail.alpinelinux.org Delivered-To: alpine-aports@mail.alpinelinux.org Received: from mail.alpinelinux.org (dallas-a1.alpinelinux.org [127.0.0.1]) by mail.alpinelinux.org (Postfix) with ESMTP id B320FDC043B for ; Mon, 2 Nov 2015 19:20:19 +0000 (UTC) Received: from apollo.thewebhostserver.com (apollomail.thewebhostserver.com [46.23.65.248]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.alpinelinux.org (Postfix) with ESMTPS id 6B11DDC040E for ; Mon, 2 Nov 2015 19:20:18 +0000 (UTC) Received: from 97e7e3f2.skybroadband.com ([151.231.227.242]:39840 helo=localhost.localdomain) by apollo.thewebhostserver.com with esmtpsa (TLSv1.2:AES128-SHA256:128) (Exim 4.86) (envelope-from ) id 1ZtKeM-001M2A-Pd; Mon, 02 Nov 2015 19:20:14 +0000 From: Stuart Cardall To: alpine-aports@lists.alpinelinux.org Cc: Stuart Cardall Subject: [alpine-aports] [PATCH 2/2] testing/inotify-tools-inc: fix conflict inotify-tools Date: Mon, 2 Nov 2015 19:20:17 +0000 Message-Id: <1446492017-20689-2-git-send-email-developer@it-offshore.co.uk> X-Mailer: git-send-email 2.6.1 In-Reply-To: <1446492017-20689-1-git-send-email-developer@it-offshore.co.uk> References: <1446492017-20689-1-git-send-email-developer@it-offshore.co.uk> X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - apollo.thewebhostserver.com X-AntiAbuse: Original Domain - lists.alpinelinux.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - it-offshore.co.uk X-Get-Message-Sender-Via: apollo.thewebhostserver.com: authenticated_id: developer@it-offshore.co.uk X-Source: X-Source-Args: X-Source-Dir: X-Virus-Scanned: ClamAV using ClamSMTP X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: --- testing/inotify-tools-inc/APKBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testing/inotify-tools-inc/APKBUILD b/testing/inotify-tools-inc/APKBUILD index cad4e54..73c2fec 100644 --- a/testing/inotify-tools-inc/APKBUILD +++ b/testing/inotify-tools-inc/APKBUILD @@ -3,12 +3,12 @@ pkgname="inotify-tools-inc" _realname="${pkgname%*-inc}" pkgver=3.14 -pkgrel=0 +pkgrel=1 pkgdesc="inotify-tools patched to add --include regex" url="http://github.com/rvoicilas/inotify-tools" arch="all" license="GPL2" -replaces="inotify-tools" +depends="!inotify-tools" subpackages="$pkgname-dev $pkgname-doc" source="https://github.com/downloads/rvoicilas/$_realname/$_realname-$pkgver.tar.gz add-include-regex.patch -- 2.6.1 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---