On Thu, Aug 11, 2011 at 04:05:04AM -0500, Jonathan Nieder wrote:
> # only affects upgrades from experimental
> severity 630921 wishlist
> tags 630921 + patch
> quit

As at least two of us have said, this is *not* the case: I have *only*
used packages from testing, and it affects testing as well.

> Thanks, that helps.  How about this patch?

As I've now upgraded, it's difficult to tell, but it does seem like
the correct patch.  I assume that only util-linux version 2.19.1-1
contained the conflicting files, not any earlier version?

Once this patch has been applied, it can presumably be removed after
the release of wheezy (or possibly even earlier).

   Julian


> Signed-off-by: Jonathan Nieder <[email protected]>
> ---
>  debian/changelog |    7 +++++++
>  debian/control   |    6 ++++++
>  2 files changed, 13 insertions(+), 0 deletions(-)
>  mode change 100644 => 100755 debian/rules
> 
> diff --git a/debian/changelog b/debian/changelog
> index e9437385..679e09a8 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,3 +1,10 @@
> +util-linux (2.19.1-5.1) local; urgency=low
> +
> +  * Make libmount, mount packages Break/Replace util-linux 2.19.1-1 to
> +    avoid file conflicts (closes: #630921)
> +
> + -- Jonathan Nieder <[email protected]>  Thu, 11 Aug 2011 03:54:16 -0500
> +
>  util-linux (2.19.1-5) unstable; urgency=low
>  
>    * Conflict/Replace fstrim to provide smooth upgrades (closes: #627579)
> diff --git a/debian/control b/debian/control
> index bdbf765d..bde42cb8 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -44,6 +44,8 @@ Architecture: linux-any
>  Essential: yes
>  Section: admin
>  Pre-Depends: ${shlibs:Depends}
> +Breaks: util-linux (= 2.19.1-1)
> +Replaces: util-linux (= 2.19.1-1)
>  Suggests: nfs-common (>=1:1.1.0-13)
>  Description: Tools for mounting and manipulating filesystems
>   This package provides the mount(8), umount(8), swapon(8),
> @@ -123,6 +125,8 @@ Package: libmount1
>  Section: libs
>  Priority: required
>  Depends: ${shlibs:Depends}, ${misc:Depends}
> +Breaks: util-linux (= 2.19.1-1)
> +Replaces: util-linux (= 2.19.1-1)
>  Architecture: linux-any
>  Description: block device id library
>   The device mounting library, used by mount and mount helpers.
> @@ -142,6 +146,8 @@ Package: libmount-dev
>  Section: libdevel
>  Priority: extra
>  Depends: libc6-dev | libc-dev, libmount1 (= ${binary:Version}), uuid-dev, 
> ${misc:Depends}
> +Breaks: util-linux (= 2.19.1-1)
> +Replaces: util-linux (= 2.19.1-1)
>  Architecture: linux-any
>  Description: block device id library - headers and static libraries
>   The device mounting library, used by mount and mount helpers.
> diff --git a/debian/rules b/debian/rules
> old mode 100644
> new mode 100755
> -- 
> 1.7.6



-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]

Reply via email to