[elbe-devel] [PATCH v2 1/1] Remove -bin dependency from -common

[Torben Hohn]

On Thu, Mar 19, 2020 at 04:04:17PM +0100, bage at linutronix.de wrote:
> From: Bastian Germann <bage at linutronix.de>
> 
> With Elbe 12.3, I introduced a packaging bug.
> elbe-debianize is not installable right now.  It was changed to install for
> py2 and py3 and depends on both python-elbe-common and python3-elbe-common.
> Those depend on the python{,3}-elbe-bin packages, which conflict each other.
> 
> c1addeeb7a ("py3: debian - produce python3 in python2 packages")
> introduced the *-common -> *-bin dependency.
> 
> Remove the dependency to make elbe-debianize installable again.
> Let the transitively dependent packages depend on it directly.
> 
> Signed-off-by: Bastian Germann <bage at linutronix.de>

Reviewed-by: Torben Hohn <torben.hohn at linutronix.de>

> ---
>  debian/control | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
> 
> diff --git a/debian/control b/debian/control
> index fafffb064..0bd428ad0 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -67,7 +67,6 @@ Architecture: all
>  Conflicts: elbe-common
>  Depends: ${misc:Depends},
>    elbe-schema (= ${binary:Version}),
> -  python-elbe-bin (= ${binary:Version}),
>    python (>= 2.7~),
>    python-lxml,
>    python-apt,
> @@ -83,7 +82,6 @@ Package: python3-elbe-common
>  Architecture: all
>  Depends: ${misc:Depends},
>    elbe-schema (= ${binary:Version}),
> -  python3-elbe-bin (= ${binary:Version}),
>    python3,
>    python3-lxml,
>    python3-apt,
> @@ -133,6 +131,7 @@ Package: elbe-daemon
>  Architecture: all
>  Depends: ${misc:Depends},
>    python (>= 2.7~),
> +  python-elbe-bin (= ${binary:Version}),
>    python-elbe-common (= ${binary:Version}),
>    python-elbe-buildenv (= ${binary:Version}),
>    python-cherrypy3, python-beaker, openssh-server, lsb-base (>= 3.0-6)
> @@ -148,6 +147,7 @@ Depends: ${misc:Depends},
>    debootstrap,
>    dosfstools,
>    dpkg-dev,
> +  python3-elbe-bin (= ${binary:Version}),
>    python3-elbe-common (= ${binary:Version}),
>    genisoimage,
>    mtd-utils,
> @@ -187,6 +187,7 @@ Depends: ${misc:Depends},
>    debootstrap,
>    dosfstools,
>    dpkg-dev,
> +  python-elbe-bin (= ${binary:Version}),
>    python-elbe-common (= ${binary:Version}),
>    genisoimage,
>    mtd-utils,
> @@ -221,6 +222,7 @@ Package: elbe-bootup-check
>  Architecture: all
>  Depends: ${misc:Depends},
>    python (>= 2.7~),
> +  python-elbe-bin (= ${binary:Version}),
>    python-elbe-common (= ${binary:Version}),
>    python-apt, lsb-base (>= 3.0-6)
>  Description: bootup checker
> @@ -267,6 +269,7 @@ Package: elbe-updated
>  Architecture: all
>  Depends: ${misc:Depends},
>    python (>= 2.7~),
> +  python-elbe-bin (= ${binary:Version}),
>    python-elbe-common (= ${binary:Version}),
>    python-lxml (>= 2.3.2-1),
>    python-pyinotify,
> -- 
> 2.20.1
> 
> 
> _______________________________________________
> elbe-devel mailing list
> elbe-devel at linutronix.de
> https://lists.linutronix.de/mailman/listinfo/elbe-devel

-- 
Torben Hohn
Linutronix GmbH | Bahnhofstrasse 3 | D-88690 Uhldingen-Mühlhofen
Phone: +49 7556 25 999 18; Fax.: +49 7556 25 999 99

Hinweise zum Datenschutz finden Sie hier (Informations on data privacy 
can be found here): https://linutronix.de/kontakt/Datenschutz.php

Linutronix GmbH | Firmensitz (Registered Office): Uhldingen-Mühlhofen | 
Registergericht (Registration Court): Amtsgericht Freiburg i.Br., HRB700 
806 | Geschäftsführer (Managing Directors): Heinz Egger, Thomas Gleixner