[xenial/master-next,1/1] UBUNTU: [Config] make linux-tools-common and linux-cloud-tools-common protection consistent
diff mbox

Message ID 20170608065640.4316-1-apw@canonical.com
State New
Headers show

Commit Message

Andy Whitcroft June 8, 2017, 6:56 a.m. UTC
During the development of the linux-*-tools-common
Privides/Conflicts/Replaces configuration we switched from versioned to
unversioned Conflicts/Replaces and droped Breaks as redundant.  This
somehow failed to be appplied to the linux-*-cloud-tools-common update.
Though currently equivalent these should be made consistent.

BugLink: http://bugs.launchpad.net/bugs/1688579
Signed-off-by: Andy Whitcroft <apw@canonical.com>
---
 debian.master/control.stub.in | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

Comments

Stefan Bader June 8, 2017, 7:46 a.m. UTC | #1
On 08.06.2017 08:56, Andy Whitcroft wrote:
> During the development of the linux-*-tools-common
> Privides/Conflicts/Replaces configuration we switched from versioned to
> unversioned Conflicts/Replaces and droped Breaks as redundant.  This
> somehow failed to be appplied to the linux-*-cloud-tools-common update.
> Though currently equivalent these should be made consistent.
> 
> BugLink: http://bugs.launchpad.net/bugs/1688579

Hm, not sure (and probably it has been done before), just wondering how much
confusion the re-use of a bug which is marked fixed will cause...

-Stefan

> Signed-off-by: Andy Whitcroft <apw@canonical.com>
> ---
>  debian.master/control.stub.in | 15 ++++++---------
>  1 file changed, 6 insertions(+), 9 deletions(-)
> 
> diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in
> index 677852cc718b..abc3b8e947af 100644
> --- a/debian.master/control.stub.in
> +++ b/debian.master/control.stub.in
> @@ -150,18 +150,15 @@ Architecture: all
>  Multi-Arch: foreign
>  Section: kernel
>  Priority: optional
> -Breaks:
> - linux-aws-cloud-tools-common (<= 4.4.0-1017.26),
> - linux-gke-cloud-tools-common (<= 4.4.0-1013.13),
> -Replaces:
> - linux-aws-cloud-tools-common (<= 4.4.0-1017.26),
> - linux-gke-cloud-tools-common (<= 4.4.0-1013.13),
> -Conflicts:
> - linux-aws-cloud-tools-common (<= 4.4.0-1017.26),
> - linux-gke-cloud-tools-common (<= 4.4.0-1013.13),
>  Provides:
>   linux-aws-cloud-tools-common,
>   linux-gke-cloud-tools-common,
> +Conflicts:
> + linux-aws-cloud-tools-common,
> + linux-gke-cloud-tools-common,
> +Replaces:
> + linux-aws-cloud-tools-common,
> + linux-gke-cloud-tools-common,
>  Depends: ${misc:Depends}
>  Description: Linux kernel version specific cloud tools for version PKGVER
>   This package provides the architecture independent parts for kernel
>
Kleber Souza June 8, 2017, 11:30 a.m. UTC | #2
Applied to xenial/master-next.

Patch
diff mbox

diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in
index 677852cc718b..abc3b8e947af 100644
--- a/debian.master/control.stub.in
+++ b/debian.master/control.stub.in
@@ -150,18 +150,15 @@  Architecture: all
 Multi-Arch: foreign
 Section: kernel
 Priority: optional
-Breaks:
- linux-aws-cloud-tools-common (<= 4.4.0-1017.26),
- linux-gke-cloud-tools-common (<= 4.4.0-1013.13),
-Replaces:
- linux-aws-cloud-tools-common (<= 4.4.0-1017.26),
- linux-gke-cloud-tools-common (<= 4.4.0-1013.13),
-Conflicts:
- linux-aws-cloud-tools-common (<= 4.4.0-1017.26),
- linux-gke-cloud-tools-common (<= 4.4.0-1013.13),
 Provides:
  linux-aws-cloud-tools-common,
  linux-gke-cloud-tools-common,
+Conflicts:
+ linux-aws-cloud-tools-common,
+ linux-gke-cloud-tools-common,
+Replaces:
+ linux-aws-cloud-tools-common,
+ linux-gke-cloud-tools-common,
 Depends: ${misc:Depends}
 Description: Linux kernel version specific cloud tools for version PKGVER
  This package provides the architecture independent parts for kernel