Github messages for voidlinux
 help / color / mirror / Atom feed
From: voidlinux-github@inbox.vuxu.org
To: ml@inbox.vuxu.org
Subject: [PR PATCH] bootchart2: conflict with bootchart
Date: Fri, 05 Jul 2019 22:37:10 +0200	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-12818@inbox.vuxu.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 455 bytes --]

There is a new pull request by Flex1911 against master on the void-packages repository

https://github.com/Flex1911/void-packages master
https://github.com/void-linux/void-packages/pull/12818

bootchart2: conflict with bootchart
Both packages are sharing multiple files and should never be installed together.

Signed-off-by: Artem Borisov <dedsa2002@gmail.com>

A patch file from https://github.com/void-linux/void-packages/pull/12818.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-master-12818.patch --]
[-- Type: application/text/x-diff, Size: 1111 bytes --]

From e1764b4f20a88f3b59fcf1f6bc625b615bcc5749 Mon Sep 17 00:00:00 2001
From: Artem Borisov <dedsa2002@gmail.com>
Date: Sat, 6 Jul 2019 00:29:33 +0400
Subject: [PATCH] bootchart2: conflict with bootchart

Both packages are sharing multiple files and should never be installed together.

Signed-off-by: Artem Borisov <dedsa2002@gmail.com>
---
 srcpkgs/bootchart2/template | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/bootchart2/template b/srcpkgs/bootchart2/template
index 96a48364a45..e0f8d0e044f 100644
--- a/srcpkgs/bootchart2/template
+++ b/srcpkgs/bootchart2/template
@@ -1,7 +1,7 @@
 # Template file for 'bootchart2'
 pkgname=bootchart2
 version=0.14.8.20170531
-revision=1
+revision=2
 build_style=gnu-makefile
 make_install_args="EARLY_PREFIX=/usr"
 makedepends="python"
@@ -14,3 +14,4 @@ _gitrev=331ada031f1d65f6d934d918f896e1c708c64bf7
 distfiles="https://github.com/xrmx/bootchart/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
 checksum=a8140cc690bd7d08ab9c030325cb075e154b7545083036ffb65bda8d740d85b4
 wrksrc="bootchart-${_gitrev}"
+conflicts="bootchart>=0"

             reply	other threads:[~2019-07-05 20:37 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-05 20:37 voidlinux-github [this message]
2019-07-05 20:55 ` [PR PATCH] [Updated] " voidlinux-github
2019-07-05 20:55 ` voidlinux-github
2019-07-05 21:01 ` voidlinux-github
2019-07-05 21:01 ` voidlinux-github
2019-07-05 21:07 ` voidlinux-github
2019-07-05 21:07 ` voidlinux-github
2019-07-09  7:43 ` voidlinux-github
2019-07-09  7:43 ` voidlinux-github
2019-07-09  7:43 ` voidlinux-github
2019-07-09  7:46 ` [PR PATCH] [Merged]: " voidlinux-github

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-12818@inbox.vuxu.org \
    --to=voidlinux-github@inbox.vuxu.org \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).