From patchwork Tue May 9 17:52:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 760281 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3wMn560xcKz9s75; Wed, 10 May 2017 03:52:26 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1d89J9-0000na-8Q; Tue, 09 May 2017 17:52:23 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1d89Iy-0000k2-6S for kernel-team@lists.ubuntu.com; Tue, 09 May 2017 17:52:12 +0000 Received: from 1.general.apw.uk.vpn ([10.172.192.78] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1d89Ix-00042N-Sb; Tue, 09 May 2017 17:52:11 +0000 From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [xenial/master-next 1/3] UBUNTU: [Config] make linux-tools-common and linux-cloud-tools-common provide linux-gke versions Date: Tue, 9 May 2017 18:52:07 +0100 Message-Id: <20170509175209.20241-5-apw@canonical.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170509175209.20241-1-apw@canonical.com> References: <20170509175209.20241-1-apw@canonical.com> Cc: Andy Whitcroft X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com We incorrectly have been producing linux-gke-tools-common and linux-gke-cloud-tools-common packages with conflicting contents to our own. This is wrong. Make our packages Provides: their linux-gke equivalents to allow us to replace them without change to the existing linux-tools-gke packages. Conflicts:/Replaces: on the existing packages to ensure they are removed before we are updated. BugLink: http://bugs.launchpad.net/bugs/1688579 Signed-off-by: Andy Whitcroft --- debian.master/control.stub.in | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in index d15e2a661882..753a1d76bc6a 100644 --- a/debian.master/control.stub.in +++ b/debian.master/control.stub.in @@ -116,6 +116,12 @@ Architecture: all Multi-Arch: foreign Section: kernel Priority: optional +Provides: + linux-gke-tools-common, +Conflicts: + linux-gke-tools-common, +Replaces: + linux-gke-tools-common, Depends: ${misc:Depends}, lsb-release Description: Linux kernel version specific tools for version PKGVER This package provides the architecture independent parts for kernel @@ -141,6 +147,14 @@ Architecture: all Multi-Arch: foreign Section: kernel Priority: optional +Breaks: + linux-gke-cloud-tools-common (<= 4.4.0-1013.13), +Replaces: + linux-gke-cloud-tools-common (<= 4.4.0-1013.13), +Conflicts: + linux-gke-cloud-tools-common (<= 4.4.0-1013.13), +Provides: + 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