[neon/qt6/qt6-declarative/Neon/release] debian: wrap-and-sort

[Jonathan Riddell]

Git commit e677fccc38273f4450d98e721ece11f5a1624df2 by Jonathan Riddell.
Committed on 03/04/2024 at 10:19.
Pushed by jriddell into branch 'Neon/release'.

wrap-and-sort

M  +6    -12   debian/control
M  +4    -4    debian/qt6-declarative-dev.install
M  +1    -1    debian/qt6-declarative.install

https://invent.kde.org/neon/qt6/qt6-declarative/-/commit/e677fccc38273f4450d98e721ece11f5a1624df2

diff --git a/debian/control b/debian/control
index f09df96..52ff72e 100644
--- a/debian/control
+++ b/debian/control
@@ -19,12 +19,11 @@ Build-Depends: cmake,
                qt6-base-dev (>= 6.6.1~),
                qt6-declarative-dev:native <cross>,
                qt6-languageserver-private-dev (>= 6.6.1~),
-               qt6-shadertools-dev (>= 6.6.1~),
-#               qt6-svg-dev (>= 6.6.1~),
+               qt6-shadertools-dev (>= 6.6.1~)
 Build-Depends-Indep: qt6-base-dev (>= 6.6~) <!nodoc>,
-                     qt6-documentation-tools (>= 6.6~) <!nodoc>,
                      qt6-base-doc (>= 6.6~) <!nodoc>,
-                     qt6-svg-dev (>= 6.6~) <!nodoc>,
+                     qt6-documentation-tools (>= 6.6~) <!nodoc>,
+                     qt6-svg-dev (>= 6.6~) <!nodoc>
 Standards-Version: 4.6.2
 Homepage: https://www.qt.io/developers/
 Vcs-Git: https://salsa.debian.org/qt-kde-team/qt6/qt6-declarative.git
@@ -54,7 +53,7 @@ Breaks: libqt6labsanimation6,
         libqt6quickdialogs2utils6,
         libqt6quicklayouts6,
         libqt6quickparticles6,
-        libqt6quickshapes6,
+        libqt6quickshapes6
 Replaces: libqt6labsanimation6,
           libqt6labsfolderlistmodel6,
           libqt6labsqmlmodels6,
@@ -71,7 +70,7 @@ Replaces: libqt6labsanimation6,
           libqt6quickdialogs2utils6,
           libqt6quicklayouts6,
           libqt6quickparticles6,
-          libqt6quickshapes6,
+          libqt6quickshapes6
 Recommends: libgl1, libglx-mesa0
 Suggests: qt6-qmltooling-plugins
 Description: Qt 6 QML module
@@ -105,10 +104,7 @@ Architecture: all
 Build-Profile: <!nodoc>
 Section: kde
 X-Neon-MergedPackage: true
-Depends: qt6-base-doc,
-         qt6-declarative-dev,
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends: qt6-base-doc, qt6-declarative-dev, ${misc:Depends}, ${shlibs:Depends}
 Description: Qt 6 declarative documentation files
  Qt is a cross-platform C++ application framework. Qt's primary feature
  is its rich set of widgets that provide standard GUI functionality.
@@ -116,8 +112,6 @@ Description: Qt 6 declarative documentation files
  This package contains the documentation files for helping to build some
  Qt 6 applications using Qt 6 declarative technology.
 
-#### transitionals below
-
 Package: libqt6qml6
 Architecture: all
 Depends: qt6-declarative, ${misc:Depends}
diff --git a/debian/qt6-declarative-dev.install b/debian/qt6-declarative-dev.install
index c377cca..1fbc772 100644
--- a/debian/qt6-declarative-dev.install
+++ b/debian/qt6-declarative-dev.install
@@ -1,13 +1,13 @@
 usr/include/
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/
+usr/lib/${DEB_HOST_MULTIARCH}/*.a
 usr/lib/${DEB_HOST_MULTIARCH}/*.prl
 usr/lib/${DEB_HOST_MULTIARCH}/*.so
-usr/lib/${DEB_HOST_MULTIARCH}/*.a
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/examples/
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/
 usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/examples/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/metatypes/
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/modules/*.json
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/mkspecs/
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/modules/*.json
 usr/lib/qt6/bin/qmldom
 usr/lib/qt6/bin/qmleasing
 usr/lib/qt6/bin/qmlformat
diff --git a/debian/qt6-declarative.install b/debian/qt6-declarative.install
index 6cc96d7..d3186bc 100644
--- a/debian/qt6-declarative.install
+++ b/debian/qt6-declarative.install
@@ -2,6 +2,7 @@ usr/lib/${DEB_HOST_MULTIARCH}/libQt6*.so.*
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/plugins/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QmlTime/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt/labs/
+usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt/test/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtCore/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtNetwork/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtQml/
@@ -9,7 +10,6 @@ usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtQuick/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/QtTest/
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/builtins.qmltypes
 usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/jsroot.qmltypes
-usr/lib/${DEB_HOST_MULTIARCH}/qt6/qml/Qt/test/
 usr/lib/qt6/bin/qml
 usr/lib/qt6/bin/qmlscene
 usr/lib/qt6/libexec/qmljsrootgen