From patchwork Fri May 21 23:18:30 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leann Ogasawara X-Patchwork-Id: 53226 X-Patchwork-Delegate: leann.ogasawara@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 4A406B7D20 for ; Sat, 22 May 2010 09:19:04 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OFbUa-0005D3-AM; Sat, 22 May 2010 00:19:00 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OFbUY-0005Cd-DJ for kernel-team@lists.ubuntu.com; Sat, 22 May 2010 00:18:58 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1OFbUY-0000pA-CC for ; Sat, 22 May 2010 00:18:58 +0100 Received: from c-76-105-148-120.hsd1.or.comcast.net ([76.105.148.120] helo=[192.168.1.4]) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1OFbUX-0006ij-V7 for kernel-team@lists.ubuntu.com; Sat, 22 May 2010 00:18:58 +0100 Subject: [PATCH 11/13] Revert "UBUNTU: add Breaks: against hardy lvm2" From: Leann Ogasawara To: kernel-team In-Reply-To: <1274483333.19284.3264.camel@emiko> References: <1274483333.19284.3264.camel@emiko> Date: Fri, 21 May 2010 16:18:30 -0700 Message-ID: <1274483910.19284.3336.camel@emiko> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com >From d6d5810d58e15e25aa9e9b88d4b6f65bbac147cf Mon Sep 17 00:00:00 2001 From: Leann Ogasawara Date: Fri, 21 May 2010 15:13:06 -0700 Subject: [PATCH 11/13] Revert "UBUNTU: add Breaks: against hardy lvm2" This reverts commit e0f61cb24e54035ed18c086430508dff72a4f58c. This was a transitional patch only needed for LTS to LTS upgrades (ie. Hardy -> Lucid). Drop this from Maverick. Signed-off-by: Leann Ogasawara --- debian.master/control.d/flavour-control.stub | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/debian.master/control.d/flavour-control.stub b/debian.master/control.d/flavour-control.stub index a2d2a4d..ccde915 100644 --- a/debian.master/control.d/flavour-control.stub +++ b/debian.master/control.d/flavour-control.stub @@ -29,7 +29,6 @@ Pre-Depends: dpkg (>= 1.10.24) Provides: linux-image, linux-image-2.6, fuse-module, =PROVIDES= Depends: ${misc:Depends}, ${shlibs:Depends}, initramfs-tools (>= 0.36ubuntu6), coreutils | fileutils (>= 4.0), module-init-tools (>= 3.3-pre11-4ubuntu3), wireless-crda Conflicts: hotplug (<< 0.0.20040105-1) -Breaks: lvm2 (<< 2.02.54-1ubuntu3) Recommends: BOOTLOADER Suggests: fdutils, SRCPKGNAME-doc-PKGVER | SRCPKGNAME-source-PKGVER, SRCPKGNAME-tools Description: Linux kernel image for version PKGVER on DESC