[neon/qt/qtwebengine/Neon/testing] debian: make -dev dep on qpdf

[Jonathan Riddell]

Git commit e445ac96ec33e9af4b8eda94b9410e56cec867be by Jonathan Riddell.
Committed on 23/10/2020 at 09:15.
Pushed by jriddell into branch 'Neon/testing'.

make -dev dep on qpdf

M  +4    -5    debian/control
M  +1    -1    debian/libqt5pdf5.install
M  +20   -20   debian/qtwebengine5-dev.install
M  +1    -1    debian/qtwebengine5-doc-html.install
M  +1    -1    debian/qtwebengine5-doc.install
M  +2    -2    debian/qtwebengine5-examples.install
M  +1    -1    debian/qtwebengine5-private-dev.install

https://invent.kde.org/neon/qt/qtwebengine/commit/e445ac96ec33e9af4b8eda94b9410e56cec867be

diff --git a/debian/control b/debian/control
index 19e92f1..1824a70 100644
--- a/debian/control
+++ b/debian/control
@@ -92,7 +92,8 @@ Package: qtwebengine5-dev
 Architecture: amd64 arm64 armhf i386 mipsel
 Multi-Arch: same
 Section: libdevel
-Depends: libqt5webchannel5-dev,
+Depends: libqt5pdfwidgets5,
+         libqt5webchannel5-dev,
          libqt5webengine5 (= ${binary:Version}),
          libqt5webenginecore5 (= ${binary:Version}),
          libqt5webenginewidgets5 (= ${binary:Version}),
@@ -166,8 +167,7 @@ Description: Web content engine library for Qt - Widget
 Package: libqt5pdf5
 Architecture: amd64 arm64 armhf i386 mipsel
 Multi-Arch: same
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Pre-Depends: ${misc:Pre-Depends}
 Recommends: qt5-image-formats-plugins-pdf (= ${source:Version})
 Description: Web content engine library for Qt - Pdf
@@ -178,8 +178,7 @@ Description: Web content engine library for Qt - Pdf
 Package: libqt5pdfwidgets5
 Architecture: amd64 arm64 armhf i386 mipsel
 Multi-Arch: same
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Pre-Depends: ${misc:Pre-Depends}
 Description: Web content engine library for Qt - Pdf Widgets
  The Qt PDF module contains classes and functions for rendering PDF documents.
diff --git a/debian/libqt5pdf5.install b/debian/libqt5pdf5.install
index 98380d4..f80b05c 100644
--- a/debian/libqt5pdf5.install
+++ b/debian/libqt5pdf5.install
@@ -1,2 +1,2 @@
-usr/lib/*/libQt5Pdf.so.5.*
 usr/lib/*/libQt5Pdf.so.5
+usr/lib/*/libQt5Pdf.so.5.*
diff --git a/debian/qtwebengine5-dev.install b/debian/qtwebengine5-dev.install
index 3d9d701..71b6708 100644
--- a/debian/qtwebengine5-dev.install
+++ b/debian/qtwebengine5-dev.install
@@ -1,44 +1,44 @@
-usr/include/*/qt5/QtPdfWidgets/[Qq]*
 usr/include/*/qt5/QtPdf/[Qq]*
+usr/include/*/qt5/QtPdfWidgets/[Qq]*
 usr/include/*/qt5/QtWebEngine/[Qq]*
 usr/include/*/qt5/QtWebEngineCore/[Qq]*
 usr/include/*/qt5/QtWebEngineWidgets/[Qq]*
 usr/lib/*/cmake/Qt5Designer/Qt5Designer_QWebEngineViewPlugin.cmake
+usr/lib/*/cmake/Qt5Gui/Qt5Gui_QPdfPlugin.cmake
+usr/lib/*/cmake/Qt5Pdf/Qt5PdfConfig.cmake
+usr/lib/*/cmake/Qt5Pdf/Qt5PdfConfigVersion.cmake
+usr/lib/*/cmake/Qt5PdfWidgets/Qt5PdfWidgetsConfig.cmake
+usr/lib/*/cmake/Qt5PdfWidgets/Qt5PdfWidgetsConfigVersion.cmake
 usr/lib/*/cmake/Qt5WebEngine/Qt5WebEngineConfig.cmake
 usr/lib/*/cmake/Qt5WebEngine/Qt5WebEngineConfigVersion.cmake
 usr/lib/*/cmake/Qt5WebEngineCore/Qt5WebEngineCoreConfig.cmake
 usr/lib/*/cmake/Qt5WebEngineCore/Qt5WebEngineCoreConfigVersion.cmake
 usr/lib/*/cmake/Qt5WebEngineWidgets/Qt5WebEngineWidgetsConfig.cmake
 usr/lib/*/cmake/Qt5WebEngineWidgets/Qt5WebEngineWidgetsConfigVersion.cmake
-usr/lib/*/pkgconfig/Qt5Pdf.pc
-usr/lib/*/pkgconfig/Qt5PdfWidgets.pc
-usr/lib/*/cmake/Qt5Gui/Qt5Gui_QPdfPlugin.cmake
-usr/lib/*/cmake/Qt5Pdf/Qt5PdfConfigVersion.cmake
-usr/lib/*/cmake/Qt5Pdf/Qt5PdfConfig.cmake
-usr/lib/*/cmake/Qt5PdfWidgets/Qt5PdfWidgetsConfig.cmake
-usr/lib/*/cmake/Qt5PdfWidgets/Qt5PdfWidgetsConfigVersion.cmake
+usr/lib/*/libQt5Pdf.prl
+usr/lib/*/libQt5Pdf.so
+usr/lib/*/libQt5PdfWidgets.prl
+usr/lib/*/libQt5PdfWidgets.so
 usr/lib/*/libQt5WebEngine.prl
 usr/lib/*/libQt5WebEngine.so
 usr/lib/*/libQt5WebEngineCore.prl
 usr/lib/*/libQt5WebEngineCore.so
 usr/lib/*/libQt5WebEngineWidgets.prl
 usr/lib/*/libQt5WebEngineWidgets.so
+usr/lib/*/pkgconfig/Qt5Pdf.pc
+usr/lib/*/pkgconfig/Qt5PdfWidgets.pc
 usr/lib/*/pkgconfig/Qt5WebEngine.pc
 usr/lib/*/pkgconfig/Qt5WebEngineCore.pc
 usr/lib/*/pkgconfig/Qt5WebEngineWidgets.pc
-usr/lib/*/qt5/mkspecs/modules/qt_lib_webengine.pri
-usr/lib/*/qt5/mkspecs/modules/qt_lib_webenginecore.pri
-usr/lib/*/qt5/mkspecs/modules/qt_lib_webenginewidgets.pri
-usr/lib/*/qt5/plugins/designer/libqwebengineview.so
-usr/lib/*/qt5/mkspecs/modules/qt_lib_pdf_private.pri
-usr/lib/*/qt5/mkspecs/modules/qt_lib_pdfwidgets.pri
 usr/lib/*/qt5/mkspecs/modules/qt_lib_pdf.pri
-usr/lib/*/qt5/mkspecs/modules/qt_lib_pdfwidgets_private.pri
+usr/lib/*/qt5/mkspecs/modules/qt_lib_pdf.pri
+usr/lib/*/qt5/mkspecs/modules/qt_lib_pdf_private.pri
 usr/lib/*/qt5/mkspecs/modules/qt_lib_pdf_private.pri
 usr/lib/*/qt5/mkspecs/modules/qt_lib_pdfwidgets.pri
-usr/lib/*/qt5/mkspecs/modules/qt_lib_pdf.pri
+usr/lib/*/qt5/mkspecs/modules/qt_lib_pdfwidgets.pri
 usr/lib/*/qt5/mkspecs/modules/qt_lib_pdfwidgets_private.pri
-usr/lib/*/libQt5Pdf.prl
-usr/lib/*/libQt5PdfWidgets.prl
-usr/lib/*/libQt5PdfWidgets.so
-usr/lib/*/libQt5Pdf.so
+usr/lib/*/qt5/mkspecs/modules/qt_lib_pdfwidgets_private.pri
+usr/lib/*/qt5/mkspecs/modules/qt_lib_webengine.pri
+usr/lib/*/qt5/mkspecs/modules/qt_lib_webenginecore.pri
+usr/lib/*/qt5/mkspecs/modules/qt_lib_webenginewidgets.pri
+usr/lib/*/qt5/plugins/designer/libqwebengineview.so
diff --git a/debian/qtwebengine5-doc-html.install b/debian/qtwebengine5-doc-html.install
index af4f3a3..328eede 100644
--- a/debian/qtwebengine5-doc-html.install
+++ b/debian/qtwebengine5-doc-html.install
@@ -1,2 +1,2 @@
-usr/share/qt5/doc/qtwebengine/
 usr/share/qt5/doc/qtpdf/
+usr/share/qt5/doc/qtwebengine/
diff --git a/debian/qtwebengine5-doc.install b/debian/qtwebengine5-doc.install
index cd0eedd..fe04f4e 100644
--- a/debian/qtwebengine5-doc.install
+++ b/debian/qtwebengine5-doc.install
@@ -1,2 +1,2 @@
-usr/share/qt5/doc/qtwebengine.qch
 usr/share/qt5/doc/qtpdf.qch
+usr/share/qt5/doc/qtwebengine.qch
diff --git a/debian/qtwebengine5-examples.install b/debian/qtwebengine5-examples.install
index 0a0c9f1..445ee9d 100644
--- a/debian/qtwebengine5-examples.install
+++ b/debian/qtwebengine5-examples.install
@@ -1,4 +1,4 @@
+usr/lib/*/qt5/examples/pdf/*
+usr/lib/*/qt5/examples/pdfwidgets/*
 usr/lib/*/qt5/examples/webengine/*
 usr/lib/*/qt5/examples/webenginewidgets/*
-usr/lib/*/qt5/examples/pdfwidgets/*
-usr/lib/*/qt5/examples/pdf/*
diff --git a/debian/qtwebengine5-private-dev.install b/debian/qtwebengine5-private-dev.install
index 2e5b456..d9612b5 100644
--- a/debian/qtwebengine5-private-dev.install
+++ b/debian/qtwebengine5-private-dev.install
@@ -1,6 +1,6 @@
 usr/include/*/qt5/QtPdf/*/QtPdf/
-usr/include/*/qt5/QtWebEngine/*/QtWebEngine/
 usr/include/*/qt5/QtPdfWidgets/*/QtPdfWidgets/
+usr/include/*/qt5/QtWebEngine/*/QtWebEngine/
 usr/include/*/qt5/QtWebEngineCore/*/QtWebEngineCore/
 usr/include/*/qt5/QtWebEngineWidgets/*/QtWebEngineWidgets/
 usr/lib/*/qt5/mkspecs/modules/qt_lib_webengine_private.pri