[neon/backports-focal/assimp/Neon/unstable] debian: Revert "dh-python"

Jonathan Riddell null at kde.org
Thu Dec 16 13:23:59 GMT 2021


Git commit 1fc914bb2fd9115889bf7ee1ae38c71149e799cb by Jonathan Riddell.
Committed on 16/12/2021 at 13:23.
Pushed by jriddell into branch 'Neon/unstable'.

Revert "dh-python"

This reverts commit 5fb4ede857754b93239cbb6a3d81ea5f5b30fc6c.

M  +41   -29   debian/control
M  +13   -8    debian/tests/control

https://invent.kde.org/neon/backports-focal/assimp/commit/1fc914bb2fd9115889bf7ee1ae38c71149e799cb

diff --git a/debian/control b/debian/control
index d80e2e1..96d83e6 100644
--- a/debian/control
+++ b/debian/control
@@ -4,19 +4,21 @@ Priority: optional
 Maintainer: IOhannes m zmölnig (Debian/GNU) <umlaeute at debian.org>
 Homepage: https://assimp.org
 Standards-Version: 4.6.0
-Build-Depends: cmake,
-               debhelper-compat (= 13),
-               dh-buildinfo,
-               dh-python,
-               doxygen,
-               libboost-dev,
-               libdraco-dev,
-               libminizip-dev,
-               libstb-dev,
-               libutfcpp-dev,
-               pkg-config,
-               zlib1g-dev | libz-dev
-Build-Depends-Indep: dh-sequence-python3, python3-all
+Build-Depends:
+ cmake,
+ debhelper-compat (= 13),
+ dh-buildinfo,
+ doxygen,
+ libboost-dev,
+ libdraco-dev,
+ libminizip-dev,
+ libstb-dev,
+ libutfcpp-dev,
+ pkg-config,
+ zlib1g-dev | libz-dev,
+Build-Depends-Indep:
+ dh-sequence-python3,
+ python3-all,
 Rules-Requires-Root: no
 Vcs-Git: https://salsa.debian.org/debian/assimp.git
 Vcs-Browser: https://salsa.debian.org/debian/assimp
@@ -25,8 +27,11 @@ Package: libassimp5
 Architecture: any
 Multi-Arch: same
 Section: libs
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: 3D model import library
  Assimp is a library to import various well-known 3D model formats ("assets") in
  a uniform manner.
@@ -48,11 +53,12 @@ Package: libassimp-dev
 Architecture: any
 Multi-Arch: same
 Section: libdevel
-Depends: libassimp5 (<< ${source:Upstream-Version}+1~),
-         libassimp5 (>= ${source:Version}),
-         libdraco-dev,
-         libminizip-dev,
-         ${misc:Depends}
+Depends:
+ libassimp5 (<< ${source:Upstream-Version}+1~),
+ libassimp5 (>= ${source:Version}),
+ libdraco-dev,
+ libminizip-dev,
+ ${misc:Depends},
 Description: 3D model import library (development)
  Assimp is a library to import various well-known 3D model formats ("assets") in
  a uniform manner.
@@ -67,8 +73,10 @@ Package: libassimp-doc
 Architecture: all
 Multi-Arch: foreign
 Section: doc
-Depends: ${misc:Depends}
-Suggests: libassimp-dev
+Depends:
+ ${misc:Depends},
+Suggests:
+ libassimp-dev,
 Description: 3D model import library (documentation)
  Assimp is a library to import various well-known 3D model formats ("assets") in
  a uniform manner.
@@ -81,7 +89,9 @@ Description: 3D model import library (documentation)
 Package: assimp-utils
 Architecture: any
 Section: utils
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
 Description: 3D model import library (utilities)
  Assimp is a library to import various well-known 3D model formats ("assets") in
  a uniform manner.
@@ -95,11 +105,12 @@ Description: 3D model import library (utilities)
 Package: python3-pyassimp
 Architecture: all
 Section: python
-Depends: libassimp5 (>= ${source:Version}),
-         libassimp5(<< ${source:Upstream-Version}+1~),
-         python3-distutils,
-         ${misc:Depends},
-         ${python3:Depends}
+Depends:
+ libassimp5 (>= ${source:Version}),
+ libassimp5(<< ${source:Upstream-Version}+1~),
+ python3-distutils,
+ ${misc:Depends},
+ ${python3:Depends},
 Description: 3D model import library (Python3 bindings)
  Assimp is a library to import various well-known 3D model formats ("assets") in
  a uniform manner.
@@ -112,7 +123,8 @@ Description: 3D model import library (Python3 bindings)
 Package: assimp-testmodels
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}
+Depends:
+ ${misc:Depends},
 Description: assimp 3D model import library (testdata)
  Assimp is a library to import various well-known 3D model formats ("assets") in
  a uniform manner.
diff --git a/debian/tests/control b/debian/tests/control
index 4844cf6..6b0a0d1 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,14 +1,19 @@
 Test-Command: find /usr/share/assimp/models/ -type f -exec ./debian/tests/assimp-info -M debian/tests/memorylimits.txt {} +
-Depends: assimp-testmodels, assimp-utils
+Depends:
+ assimp-testmodels,
+ assimp-utils,
 
 Test-Command: ./debian/tests/quicktest.py -M debian/tests/memorylimits.txt -m $(./debian/tests/getAvailableMemory) /usr/share/assimp/models/
 Restrictions: allow-stderr,
-Depends: assimp-testmodels, python3-pyassimp
+Depends:
+ assimp-testmodels,
+ python3-pyassimp,
 
 Test-Command: ./debian/tests/build-cmake
-Depends: build-essential,
-         cmake,
-         freeglut3-dev,
-         libassimp-dev,
-         libgl1-mesa-dev | libgl-dev,
-         zlib1g-dev | libz-dev
+Depends:
+ build-essential,
+ cmake,
+ freeglut3-dev,
+ libassimp-dev,
+ libgl1-mesa-dev | libgl-dev,
+ zlib1g-dev | libz-dev,



More information about the Neon-commits mailing list