[Pkg-samba-maint] r2517 - trunk/samba4/debian

[Steve Langasek]

On Mon, Jan 26, 2009 at 12:07:19AM +0000, jelmer at alioth.debian.org wrote:

> Log:
> Remove no longer necessary conflicts.

> Modified: trunk/samba4/debian/control
> ===================================================================
> --- trunk/samba4/debian/control	2009-01-25 22:19:50 UTC (rev 2516)
> +++ trunk/samba4/debian/control	2009-01-26 00:07:15 UTC (rev 2517)
> @@ -14,7 +14,7 @@
>  Package: samba4
>  Architecture: any
>  Recommends: samba-ldb-tools
> -Conflicts: samba, samba-tools
> +Conflicts: samba-tools
>  Depends: ${shlibs:Depends}, ${misc:Depends}, samba4-common (=${binary:Version}), python, python-samba
>  XB-Python-Version: ${python:Versions}
>  Description: LanManager-like file server for Unix (version 4)
> @@ -32,7 +32,6 @@
>  
>  Package: samba4-common
>  Architecture: any
> -Conflicts: samba, samba-common
>  Depends: ${shlibs:Depends}, ${misc:Depends}
>  Description: Samba 4 common files used by both the server and the client
>   The Samba software suite is a collection of programs that

Given that the changes to samba/samba-common that eliminate the need for a
conflict will only take effect post-lenny, I would suggest converting these
to versioned conflicts instead of dropping the conflicts entirely.

-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                    http://www.debian.org/
slangasek at ubuntu.com                                     vorlon at debian.org