[elbe-devel] [PATCH v2 2/2] debian control: Make elbe-debianize a py2 & py3 pkg

bage at linutronix.de bage at linutronix.de
Fri Feb 7 12:50:26 CET 2020


From: Bastian Germann <bage at linutronix.de>

elbe-debianize might have the problem that its dependencies are satisfied
with a different python version than the rest of the elbe install.

The correct solution would be splitting up the package.  However, we want
to drop py2 support in the near future, so make this optional package
depend on both versions.

Signed-off-by: Bastian Germann <bage at linutronix.de>
---
 debian/control                | 12 ++++--
 debian/elbe-debianize.install | 74 +++++++++++++++++------------------
 2 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/debian/control b/debian/control
index 03eefd4ce..804946dc6 100644
--- a/debian/control
+++ b/debian/control
@@ -99,13 +99,17 @@ Package: elbe-debianize
 Architecture: all
 Conflicts: elbe-debianize
 Depends: ${misc:Depends},
-  python (>= 2.7~) | python3,
+  python (>= 2.7~),
+  python3,
   devscripts,
   libdistro-info-perl,
   libparse-debcontrol-perl,
-  python-elbe-common (= ${binary:Version}) | python3-elbe-common (= ${binary:Version}),
-  python-urwid | python3-urwid,
-  python-pkg-resources | python3-pkg-resources
+  python-elbe-common (= ${binary:Version}),
+  python3-elbe-common (= ${binary:Version}),
+  python-urwid,
+  python3-urwid,
+  python-pkg-resources,
+  python3-pkg-resources
 Description: Wizard for debian folder generation
  Assists users in generating a debianization for a given source code project.
 
diff --git a/debian/elbe-debianize.install b/debian/elbe-debianize.install
index db1fd9a68..6d80ec1b6 100644
--- a/debian/elbe-debianize.install
+++ b/debian/elbe-debianize.install
@@ -1,37 +1,37 @@
-./usr/lib/python2.*/*-packages/elbepack/commands/debianize.py
-./usr/lib/python2.*/*-packages/elbepack/debianize/__init__.py
-./usr/lib/python2.*/*-packages/elbepack/debianize/base/__init__.py
-./usr/lib/python2.*/*-packages/elbepack/debianize/base/tui.py
-./usr/lib/python2.*/*-packages/elbepack/debianize/panels/barebox.py
-./usr/lib/python2.*/*-packages/elbepack/debianize/panels/base.py
-./usr/lib/python2.*/*-packages/elbepack/debianize/panels/factory.py
-./usr/lib/python2.*/*-packages/elbepack/debianize/panels/__init__.py
-./usr/lib/python2.*/*-packages/elbepack/debianize/panels/kernel.py
-./usr/lib/python2.*/*-packages/elbepack/debianize/panels/uboot.py
-./usr/lib/python2.*/*-packages/elbepack/debianize/widgets/button.py
-./usr/lib/python2.*/*-packages/elbepack/debianize/widgets/edit.py
-./usr/lib/python2.*/*-packages/elbepack/debianize/widgets/form.py
-./usr/lib/python2.*/*-packages/elbepack/debianize/widgets/grid.py
-./usr/lib/python2.*/*-packages/elbepack/debianize/widgets/__init__.py
-./usr/lib/python2.*/*-packages/elbepack/debianize/widgets/radio.py
-./usr/lib/python2.*/*-packages/elbepack/makofiles/debianize/kernel/rules.mako
-./usr/lib/python2.*/*-packages/elbepack/makofiles/debianize/kernel/linux-image.install
-./usr/lib/python2.*/*-packages/elbepack/makofiles/debianize/kernel/control.mako
-./usr/lib/python2.*/*-packages/elbepack/makofiles/debianize/kernel/format.mako
-./usr/lib/python2.*/*-packages/elbepack/makofiles/debianize/kernel/linux-headers.install
-./usr/lib/python2.*/*-packages/elbepack/makofiles/debianize/kernel/preinst.mako
-./usr/lib/python2.*/*-packages/elbepack/makofiles/debianize/kernel/postinst.mako
-./usr/lib/python2.*/*-packages/elbepack/makofiles/debianize/kernel/prerm.mako
-./usr/lib/python2.*/*-packages/elbepack/makofiles/debianize/kernel/postrm.mako
-./usr/lib/python2.*/*-packages/elbepack/makofiles/debianize/kernel/linux-libc-dev.install
-./usr/lib/python2.*/*-packages/elbepack/makofiles/debianize/barebox/barebox-image.install
-./usr/lib/python2.*/*-packages/elbepack/makofiles/debianize/barebox/barebox-tools.install
-./usr/lib/python2.*/*-packages/elbepack/makofiles/debianize/barebox/control.mako
-./usr/lib/python2.*/*-packages/elbepack/makofiles/debianize/barebox/format.mako
-./usr/lib/python2.*/*-packages/elbepack/makofiles/debianize/barebox/rules.mako
-./usr/lib/python2.*/*-packages/elbepack/makofiles/debianize/u-boot/control.mako
-./usr/lib/python2.*/*-packages/elbepack/makofiles/debianize/u-boot/format.mako
-./usr/lib/python2.*/*-packages/elbepack/makofiles/debianize/u-boot/rules.mako
-./usr/lib/python2.*/*-packages/elbepack/makofiles/debianize/u-boot/u-boot-image.install
-./usr/lib/python2.*/*-packages/elbepack/makofiles/debianize/u-boot/u-boot-tools.install
-./usr/lib/python2.*/*-packages/elbepack/makofiles/debianize/u-boot/u-boot-tools.links
+./usr/lib/python*/*-packages/elbepack/commands/debianize.py
+./usr/lib/python*/*-packages/elbepack/debianize/__init__.py
+./usr/lib/python*/*-packages/elbepack/debianize/base/__init__.py
+./usr/lib/python*/*-packages/elbepack/debianize/base/tui.py
+./usr/lib/python*/*-packages/elbepack/debianize/panels/barebox.py
+./usr/lib/python*/*-packages/elbepack/debianize/panels/base.py
+./usr/lib/python*/*-packages/elbepack/debianize/panels/factory.py
+./usr/lib/python*/*-packages/elbepack/debianize/panels/__init__.py
+./usr/lib/python*/*-packages/elbepack/debianize/panels/kernel.py
+./usr/lib/python*/*-packages/elbepack/debianize/panels/uboot.py
+./usr/lib/python*/*-packages/elbepack/debianize/widgets/button.py
+./usr/lib/python*/*-packages/elbepack/debianize/widgets/edit.py
+./usr/lib/python*/*-packages/elbepack/debianize/widgets/form.py
+./usr/lib/python*/*-packages/elbepack/debianize/widgets/grid.py
+./usr/lib/python*/*-packages/elbepack/debianize/widgets/__init__.py
+./usr/lib/python*/*-packages/elbepack/debianize/widgets/radio.py
+./usr/lib/python*/*-packages/elbepack/makofiles/debianize/kernel/rules.mako
+./usr/lib/python*/*-packages/elbepack/makofiles/debianize/kernel/linux-image.install
+./usr/lib/python*/*-packages/elbepack/makofiles/debianize/kernel/control.mako
+./usr/lib/python*/*-packages/elbepack/makofiles/debianize/kernel/format.mako
+./usr/lib/python*/*-packages/elbepack/makofiles/debianize/kernel/linux-headers.install
+./usr/lib/python*/*-packages/elbepack/makofiles/debianize/kernel/preinst.mako
+./usr/lib/python*/*-packages/elbepack/makofiles/debianize/kernel/postinst.mako
+./usr/lib/python*/*-packages/elbepack/makofiles/debianize/kernel/prerm.mako
+./usr/lib/python*/*-packages/elbepack/makofiles/debianize/kernel/postrm.mako
+./usr/lib/python*/*-packages/elbepack/makofiles/debianize/kernel/linux-libc-dev.install
+./usr/lib/python*/*-packages/elbepack/makofiles/debianize/barebox/barebox-image.install
+./usr/lib/python*/*-packages/elbepack/makofiles/debianize/barebox/barebox-tools.install
+./usr/lib/python*/*-packages/elbepack/makofiles/debianize/barebox/control.mako
+./usr/lib/python*/*-packages/elbepack/makofiles/debianize/barebox/format.mako
+./usr/lib/python*/*-packages/elbepack/makofiles/debianize/barebox/rules.mako
+./usr/lib/python*/*-packages/elbepack/makofiles/debianize/u-boot/control.mako
+./usr/lib/python*/*-packages/elbepack/makofiles/debianize/u-boot/format.mako
+./usr/lib/python*/*-packages/elbepack/makofiles/debianize/u-boot/rules.mako
+./usr/lib/python*/*-packages/elbepack/makofiles/debianize/u-boot/u-boot-image.install
+./usr/lib/python*/*-packages/elbepack/makofiles/debianize/u-boot/u-boot-tools.install
+./usr/lib/python*/*-packages/elbepack/makofiles/debianize/u-boot/u-boot-tools.links
-- 
2.20.1




More information about the elbe-devel mailing list