* [PR PATCH] bootchart2: conflict with bootchart
@ 2019-07-05 20:37 voidlinux-github
2019-07-05 20:55 ` [PR PATCH] [Updated] " voidlinux-github
` (9 more replies)
0 siblings, 10 replies; 11+ messages in thread
From: voidlinux-github @ 2019-07-05 20:37 UTC (permalink / raw)
To: ml
[-- 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"
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] bootchart2: conflict with bootchart
2019-07-05 20:37 [PR PATCH] bootchart2: conflict with bootchart voidlinux-github
@ 2019-07-05 20:55 ` voidlinux-github
2019-07-05 20:55 ` voidlinux-github
` (8 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: voidlinux-github @ 2019-07-05 20:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 406 bytes --]
There is an updated 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.
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: 2055 bytes --]
From 275eca23c6594d88ea6d539788db1b46ef455f90 Mon Sep 17 00:00:00 2001
From: Artem Borisov <dedsa2002@gmail.com>
Date: Sat, 6 Jul 2019 00:51:00 +0400
Subject: [PATCH 1/2] bootchart2: put checksum after wrksrc
Signed-off-by: Artem Borisov <dedsa2002@gmail.com>
---
srcpkgs/bootchart2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bootchart2/template b/srcpkgs/bootchart2/template
index 96a48364a45..f70d36ee390 100644
--- a/srcpkgs/bootchart2/template
+++ b/srcpkgs/bootchart2/template
@@ -12,5 +12,5 @@ license="GPL-2"
homepage="https://github.com/xrmx/bootchart"
_gitrev=331ada031f1d65f6d934d918f896e1c708c64bf7
distfiles="https://github.com/xrmx/bootchart/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=a8140cc690bd7d08ab9c030325cb075e154b7545083036ffb65bda8d740d85b4
wrksrc="bootchart-${_gitrev}"
+checksum=a8140cc690bd7d08ab9c030325cb075e154b7545083036ffb65bda8d740d85b4
From d30d49c4e67397171c8487c587a2cae86aa4aa8f Mon Sep 17 00:00:00 2001
From: Artem Borisov <dedsa2002@gmail.com>
Date: Sat, 6 Jul 2019 00:29:33 +0400
Subject: [PATCH 2/2] 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 f70d36ee390..54fee443d24 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"
wrksrc="bootchart-${_gitrev}"
checksum=a8140cc690bd7d08ab9c030325cb075e154b7545083036ffb65bda8d740d85b4
+conflicts="bootchart>=0"
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] bootchart2: conflict with bootchart
2019-07-05 20:37 [PR PATCH] bootchart2: conflict with bootchart voidlinux-github
2019-07-05 20:55 ` [PR PATCH] [Updated] " voidlinux-github
@ 2019-07-05 20:55 ` voidlinux-github
2019-07-05 21:01 ` voidlinux-github
` (7 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: voidlinux-github @ 2019-07-05 20:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 406 bytes --]
There is an updated 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.
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: 2055 bytes --]
From 275eca23c6594d88ea6d539788db1b46ef455f90 Mon Sep 17 00:00:00 2001
From: Artem Borisov <dedsa2002@gmail.com>
Date: Sat, 6 Jul 2019 00:51:00 +0400
Subject: [PATCH 1/2] bootchart2: put checksum after wrksrc
Signed-off-by: Artem Borisov <dedsa2002@gmail.com>
---
srcpkgs/bootchart2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bootchart2/template b/srcpkgs/bootchart2/template
index 96a48364a45..f70d36ee390 100644
--- a/srcpkgs/bootchart2/template
+++ b/srcpkgs/bootchart2/template
@@ -12,5 +12,5 @@ license="GPL-2"
homepage="https://github.com/xrmx/bootchart"
_gitrev=331ada031f1d65f6d934d918f896e1c708c64bf7
distfiles="https://github.com/xrmx/bootchart/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
-checksum=a8140cc690bd7d08ab9c030325cb075e154b7545083036ffb65bda8d740d85b4
wrksrc="bootchart-${_gitrev}"
+checksum=a8140cc690bd7d08ab9c030325cb075e154b7545083036ffb65bda8d740d85b4
From d30d49c4e67397171c8487c587a2cae86aa4aa8f Mon Sep 17 00:00:00 2001
From: Artem Borisov <dedsa2002@gmail.com>
Date: Sat, 6 Jul 2019 00:29:33 +0400
Subject: [PATCH 2/2] 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 f70d36ee390..54fee443d24 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"
wrksrc="bootchart-${_gitrev}"
checksum=a8140cc690bd7d08ab9c030325cb075e154b7545083036ffb65bda8d740d85b4
+conflicts="bootchart>=0"
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] bootchart2: conflict with bootchart
2019-07-05 20:37 [PR PATCH] bootchart2: conflict with bootchart voidlinux-github
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
` (6 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: voidlinux-github @ 2019-07-05 21:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 406 bytes --]
There is an updated 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.
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: 2063 bytes --]
From ee915edc84c6b36404e4a7cf8049266d8e2283f2 Mon Sep 17 00:00:00 2001
From: Artem Borisov <dedsa2002@gmail.com>
Date: Sat, 6 Jul 2019 00:51:00 +0400
Subject: [PATCH 1/2] bootchart2: fix wrksrc placement
Signed-off-by: Artem Borisov <dedsa2002@gmail.com>
---
srcpkgs/bootchart2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bootchart2/template b/srcpkgs/bootchart2/template
index 96a48364a45..aace7781ce3 100644
--- a/srcpkgs/bootchart2/template
+++ b/srcpkgs/bootchart2/template
@@ -11,6 +11,6 @@ maintainer="Benjamin Hoffmeyer <hoffmeyer25@gmail.com>"
license="GPL-2"
homepage="https://github.com/xrmx/bootchart"
_gitrev=331ada031f1d65f6d934d918f896e1c708c64bf7
+wrksrc="bootchart-${_gitrev}"
distfiles="https://github.com/xrmx/bootchart/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
checksum=a8140cc690bd7d08ab9c030325cb075e154b7545083036ffb65bda8d740d85b4
-wrksrc="bootchart-${_gitrev}"
From 771c101e33d32fab898908821df11baac53d3972 Mon Sep 17 00:00:00 2001
From: Artem Borisov <dedsa2002@gmail.com>
Date: Sat, 6 Jul 2019 00:29:33 +0400
Subject: [PATCH 2/2] 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 aace7781ce3..e3384a2f070 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
wrksrc="bootchart-${_gitrev}"
distfiles="https://github.com/xrmx/bootchart/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
checksum=a8140cc690bd7d08ab9c030325cb075e154b7545083036ffb65bda8d740d85b4
+conflicts="bootchart>=0"
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] bootchart2: conflict with bootchart
2019-07-05 20:37 [PR PATCH] bootchart2: conflict with bootchart voidlinux-github
` (2 preceding siblings ...)
2019-07-05 21:01 ` voidlinux-github
@ 2019-07-05 21:01 ` voidlinux-github
2019-07-05 21:07 ` voidlinux-github
` (5 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: voidlinux-github @ 2019-07-05 21:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 406 bytes --]
There is an updated 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.
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: 2063 bytes --]
From ee915edc84c6b36404e4a7cf8049266d8e2283f2 Mon Sep 17 00:00:00 2001
From: Artem Borisov <dedsa2002@gmail.com>
Date: Sat, 6 Jul 2019 00:51:00 +0400
Subject: [PATCH 1/2] bootchart2: fix wrksrc placement
Signed-off-by: Artem Borisov <dedsa2002@gmail.com>
---
srcpkgs/bootchart2/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bootchart2/template b/srcpkgs/bootchart2/template
index 96a48364a45..aace7781ce3 100644
--- a/srcpkgs/bootchart2/template
+++ b/srcpkgs/bootchart2/template
@@ -11,6 +11,6 @@ maintainer="Benjamin Hoffmeyer <hoffmeyer25@gmail.com>"
license="GPL-2"
homepage="https://github.com/xrmx/bootchart"
_gitrev=331ada031f1d65f6d934d918f896e1c708c64bf7
+wrksrc="bootchart-${_gitrev}"
distfiles="https://github.com/xrmx/bootchart/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
checksum=a8140cc690bd7d08ab9c030325cb075e154b7545083036ffb65bda8d740d85b4
-wrksrc="bootchart-${_gitrev}"
From 771c101e33d32fab898908821df11baac53d3972 Mon Sep 17 00:00:00 2001
From: Artem Borisov <dedsa2002@gmail.com>
Date: Sat, 6 Jul 2019 00:29:33 +0400
Subject: [PATCH 2/2] 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 aace7781ce3..e3384a2f070 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
wrksrc="bootchart-${_gitrev}"
distfiles="https://github.com/xrmx/bootchart/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
checksum=a8140cc690bd7d08ab9c030325cb075e154b7545083036ffb65bda8d740d85b4
+conflicts="bootchart>=0"
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] bootchart2: conflict with bootchart
2019-07-05 20:37 [PR PATCH] bootchart2: conflict with bootchart voidlinux-github
` (4 preceding siblings ...)
2019-07-05 21:07 ` voidlinux-github
@ 2019-07-05 21:07 ` voidlinux-github
2019-07-09 7:43 ` voidlinux-github
` (3 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: voidlinux-github @ 2019-07-05 21:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 406 bytes --]
There is an updated 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.
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: 2315 bytes --]
From e47ef16129bab37c4d6fa1bfd0f55b07e8aa561e Mon Sep 17 00:00:00 2001
From: Artem Borisov <dedsa2002@gmail.com>
Date: Sat, 6 Jul 2019 00:51:00 +0400
Subject: [PATCH 1/2] bootchart2: fix wrksrc placement
Signed-off-by: Artem Borisov <dedsa2002@gmail.com>
---
srcpkgs/bootchart2/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bootchart2/template b/srcpkgs/bootchart2/template
index 96a48364a45..ac03d7fecb4 100644
--- a/srcpkgs/bootchart2/template
+++ b/srcpkgs/bootchart2/template
@@ -2,6 +2,8 @@
pkgname=bootchart2
version=0.14.8.20170531
revision=1
+_gitrev=331ada031f1d65f6d934d918f896e1c708c64bf7
+wrksrc="bootchart-${_gitrev}"
build_style=gnu-makefile
make_install_args="EARLY_PREFIX=/usr"
makedepends="python"
@@ -10,7 +12,5 @@ short_desc="Startup graphing tool"
maintainer="Benjamin Hoffmeyer <hoffmeyer25@gmail.com>"
license="GPL-2"
homepage="https://github.com/xrmx/bootchart"
-_gitrev=331ada031f1d65f6d934d918f896e1c708c64bf7
distfiles="https://github.com/xrmx/bootchart/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
checksum=a8140cc690bd7d08ab9c030325cb075e154b7545083036ffb65bda8d740d85b4
-wrksrc="bootchart-${_gitrev}"
From 52a007e3fb5fb3d0a675f422fe4c4d2a8b696d94 Mon Sep 17 00:00:00 2001
From: Artem Borisov <dedsa2002@gmail.com>
Date: Sat, 6 Jul 2019 00:29:33 +0400
Subject: [PATCH 2/2] 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 ac03d7fecb4..825eb074e86 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
_gitrev=331ada031f1d65f6d934d918f896e1c708c64bf7
wrksrc="bootchart-${_gitrev}"
build_style=gnu-makefile
@@ -14,3 +14,4 @@ license="GPL-2"
homepage="https://github.com/xrmx/bootchart"
distfiles="https://github.com/xrmx/bootchart/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
checksum=a8140cc690bd7d08ab9c030325cb075e154b7545083036ffb65bda8d740d85b4
+conflicts="bootchart>=0"
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] bootchart2: conflict with bootchart
2019-07-05 20:37 [PR PATCH] bootchart2: conflict with bootchart voidlinux-github
` (3 preceding siblings ...)
2019-07-05 21:01 ` voidlinux-github
@ 2019-07-05 21:07 ` voidlinux-github
2019-07-05 21:07 ` voidlinux-github
` (4 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: voidlinux-github @ 2019-07-05 21:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 406 bytes --]
There is an updated 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.
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: 2315 bytes --]
From e47ef16129bab37c4d6fa1bfd0f55b07e8aa561e Mon Sep 17 00:00:00 2001
From: Artem Borisov <dedsa2002@gmail.com>
Date: Sat, 6 Jul 2019 00:51:00 +0400
Subject: [PATCH 1/2] bootchart2: fix wrksrc placement
Signed-off-by: Artem Borisov <dedsa2002@gmail.com>
---
srcpkgs/bootchart2/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/bootchart2/template b/srcpkgs/bootchart2/template
index 96a48364a45..ac03d7fecb4 100644
--- a/srcpkgs/bootchart2/template
+++ b/srcpkgs/bootchart2/template
@@ -2,6 +2,8 @@
pkgname=bootchart2
version=0.14.8.20170531
revision=1
+_gitrev=331ada031f1d65f6d934d918f896e1c708c64bf7
+wrksrc="bootchart-${_gitrev}"
build_style=gnu-makefile
make_install_args="EARLY_PREFIX=/usr"
makedepends="python"
@@ -10,7 +12,5 @@ short_desc="Startup graphing tool"
maintainer="Benjamin Hoffmeyer <hoffmeyer25@gmail.com>"
license="GPL-2"
homepage="https://github.com/xrmx/bootchart"
-_gitrev=331ada031f1d65f6d934d918f896e1c708c64bf7
distfiles="https://github.com/xrmx/bootchart/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
checksum=a8140cc690bd7d08ab9c030325cb075e154b7545083036ffb65bda8d740d85b4
-wrksrc="bootchart-${_gitrev}"
From 52a007e3fb5fb3d0a675f422fe4c4d2a8b696d94 Mon Sep 17 00:00:00 2001
From: Artem Borisov <dedsa2002@gmail.com>
Date: Sat, 6 Jul 2019 00:29:33 +0400
Subject: [PATCH 2/2] 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 ac03d7fecb4..825eb074e86 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
_gitrev=331ada031f1d65f6d934d918f896e1c708c64bf7
wrksrc="bootchart-${_gitrev}"
build_style=gnu-makefile
@@ -14,3 +14,4 @@ license="GPL-2"
homepage="https://github.com/xrmx/bootchart"
distfiles="https://github.com/xrmx/bootchart/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
checksum=a8140cc690bd7d08ab9c030325cb075e154b7545083036ffb65bda8d740d85b4
+conflicts="bootchart>=0"
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] bootchart2: conflict with bootchart
2019-07-05 20:37 [PR PATCH] bootchart2: conflict with bootchart voidlinux-github
` (6 preceding siblings ...)
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
9 siblings, 0 replies; 11+ messages in thread
From: voidlinux-github @ 2019-07-09 7:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 406 bytes --]
There is an updated 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.
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: 1353 bytes --]
From 932871b28198047ce026b873b14a567b730abbab 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 | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/bootchart2/template b/srcpkgs/bootchart2/template
index 96a48364a45..825eb074e86 100644
--- a/srcpkgs/bootchart2/template
+++ b/srcpkgs/bootchart2/template
@@ -1,7 +1,9 @@
# Template file for 'bootchart2'
pkgname=bootchart2
version=0.14.8.20170531
-revision=1
+revision=2
+_gitrev=331ada031f1d65f6d934d918f896e1c708c64bf7
+wrksrc="bootchart-${_gitrev}"
build_style=gnu-makefile
make_install_args="EARLY_PREFIX=/usr"
makedepends="python"
@@ -10,7 +12,6 @@ short_desc="Startup graphing tool"
maintainer="Benjamin Hoffmeyer <hoffmeyer25@gmail.com>"
license="GPL-2"
homepage="https://github.com/xrmx/bootchart"
-_gitrev=331ada031f1d65f6d934d918f896e1c708c64bf7
distfiles="https://github.com/xrmx/bootchart/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
checksum=a8140cc690bd7d08ab9c030325cb075e154b7545083036ffb65bda8d740d85b4
-wrksrc="bootchart-${_gitrev}"
+conflicts="bootchart>=0"
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Updated] bootchart2: conflict with bootchart
2019-07-05 20:37 [PR PATCH] bootchart2: conflict with bootchart voidlinux-github
` (5 preceding siblings ...)
2019-07-05 21:07 ` voidlinux-github
@ 2019-07-09 7:43 ` voidlinux-github
2019-07-09 7:43 ` voidlinux-github
` (2 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: voidlinux-github @ 2019-07-09 7:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 406 bytes --]
There is an updated 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.
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: 1353 bytes --]
From 932871b28198047ce026b873b14a567b730abbab 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 | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/bootchart2/template b/srcpkgs/bootchart2/template
index 96a48364a45..825eb074e86 100644
--- a/srcpkgs/bootchart2/template
+++ b/srcpkgs/bootchart2/template
@@ -1,7 +1,9 @@
# Template file for 'bootchart2'
pkgname=bootchart2
version=0.14.8.20170531
-revision=1
+revision=2
+_gitrev=331ada031f1d65f6d934d918f896e1c708c64bf7
+wrksrc="bootchart-${_gitrev}"
build_style=gnu-makefile
make_install_args="EARLY_PREFIX=/usr"
makedepends="python"
@@ -10,7 +12,6 @@ short_desc="Startup graphing tool"
maintainer="Benjamin Hoffmeyer <hoffmeyer25@gmail.com>"
license="GPL-2"
homepage="https://github.com/xrmx/bootchart"
-_gitrev=331ada031f1d65f6d934d918f896e1c708c64bf7
distfiles="https://github.com/xrmx/bootchart/archive/${_gitrev}.tar.gz>${pkgname}-${version}.tar.gz"
checksum=a8140cc690bd7d08ab9c030325cb075e154b7545083036ffb65bda8d740d85b4
-wrksrc="bootchart-${_gitrev}"
+conflicts="bootchart>=0"
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: bootchart2: conflict with bootchart
2019-07-05 20:37 [PR PATCH] bootchart2: conflict with bootchart voidlinux-github
` (7 preceding siblings ...)
2019-07-09 7:43 ` voidlinux-github
@ 2019-07-09 7:43 ` voidlinux-github
2019-07-09 7:46 ` [PR PATCH] [Merged]: " voidlinux-github
9 siblings, 0 replies; 11+ messages in thread
From: voidlinux-github @ 2019-07-09 7:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 146 bytes --]
New comment by Flex1911 on void-packages repository
https://github.com/void-linux/void-packages/pull/12818#issuecomment-509529775
Comment:
Done.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PR PATCH] [Merged]: bootchart2: conflict with bootchart
2019-07-05 20:37 [PR PATCH] bootchart2: conflict with bootchart voidlinux-github
` (8 preceding siblings ...)
2019-07-09 7:43 ` voidlinux-github
@ 2019-07-09 7:46 ` voidlinux-github
9 siblings, 0 replies; 11+ messages in thread
From: voidlinux-github @ 2019-07-09 7:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 248 bytes --]
There's a merged pull request on the void-packages repository
bootchart2: conflict with bootchart
https://github.com/void-linux/void-packages/pull/12818
Description: Both packages are sharing multiple files and should never be installed together.
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2019-07-09 7:46 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-05 20:37 [PR PATCH] bootchart2: conflict with bootchart voidlinux-github
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
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).