[neon/qt/qtwebengine/Neon/testing] debian: Use separate packages for Qt PDF development files, examples and documentation.

Dmitry Shachnev null at kde.org
Wed May 19 11:53:42 BST 2021


Git commit 3e68421e9a29ce75ab464178cf55d8347bb24e0d by Dmitry Shachnev.
Committed on 20/09/2020 at 18:37.
Pushed by sitter into branch 'Neon/testing'.

Use separate packages for Qt PDF development files, examples and documentation.

Thanks to Alexander Volkov for the suggestion:
https://salsa.debian.org/qt-kde-team/qt/qtwebengine/-/commit/0e72c07d9c882edc#note_193895

Do not install private headers for Qt PDF, unmark private symbols.

M  +2    -2    debian/changelog
M  +47   -0    debian/control
M  +45   -46   debian/libqt5pdf5.symbols
M  +2    -3    debian/libqt5pdfwidgets5.symbols
M  +6    -0    debian/not-installed
A  +16   -0    debian/qtpdf5-dev.install
A  +9    -0    debian/qtpdf5-doc-html.doc-base
A  +1    -0    debian/qtpdf5-doc-html.install
A  +1    -0    debian/qtpdf5-doc-html.links
A  +1    -0    debian/qtpdf5-doc.install
A  +1    -0    debian/qtpdf5-examples.install
M  +0    -16   debian/qtwebengine5-dev.install
M  +0    -1    debian/qtwebengine5-doc-html.install
M  +0    -1    debian/qtwebengine5-doc.install
M  +0    -1    debian/qtwebengine5-examples.install
M  +0    -6    debian/qtwebengine5-private-dev.install

https://invent.kde.org/neon/qt/qtwebengine/commit/3e68421e9a29ce75ab464178cf55d8347bb24e0d

diff --git a/debian/changelog b/debian/changelog
index 2482fc6..9e7d5a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,8 +19,8 @@ qtwebengine-opensource-src (5.15.1+dfsg-1) UNRELEASED; urgency=medium
     - Use ${DEB_HOST_MULTIARCH} substitution in the install files.
   * Update Files-Excluded and touch_files for the new release.
   * Bump ABI version to qtwebengine-abi-5-15-1.
-  * Add new packages for the Qt PDF libraries and QML module.
-  * Also install Qt PDF examples and documentation.
+  * Add new packages for the Qt PDF libraries, QML module, examples,
+    documentation and development files.
   * Update symbols files from the current build log.
   * Temporarily build without system opus/ffmpeg until opus is updated to
     version 1.3.1 (see #934809).
diff --git a/debian/control b/debian/control
index e4b4fd8..5f91a90 100644
--- a/debian/control
+++ b/debian/control
@@ -120,6 +120,21 @@ Description: Web content engine library for Qt - private development files
  This package contains the private development files needed to build
  Qt 5 applications using QtWebEngine library.
 
+Package: qtpdf5-dev
+Architecture: amd64 arm64 armhf i386 mipsel
+Multi-Arch: same
+Section: libdevel
+Depends: libqt5pdf5 (= ${binary:Version},
+         libqt5pdfwidgets5 (= ${binary:Version}),
+         qtbase5-dev,
+         ${misc:Depends},
+         ${shlibs:Depends}
+Description: Qt 5 PDF library - development files
+ The Qt PDF module contains classes and functions for rendering PDF documents.
+ .
+ This package contains the development files needed to build Qt 5 applications
+ using Qt PDF library.
+
 Package: libqt5webengine5
 Architecture: amd64 arm64 armhf i386 mipsel
 Multi-Arch: same
@@ -262,6 +277,15 @@ Description: Qt WebEngine - Examples
  .
  This package contains the WebEngine examples.
 
+Package: qtpdf5-examples
+Architecture: amd64 arm64 armhf i386 mipsel
+Multi-Arch: same
+Depends: qml-module-qtquick-pdf (= ${binary:Version}), ${misc:Depends}
+Description: Qt PDF - examples
+ The Qt PDF module contains classes and functions for rendering PDF documents.
+ .
+ This package contains the PDF examples.
+
 Package: qtwebengine5-doc
 Build-Profiles: <!nodoc>
 Architecture: all
@@ -286,3 +310,26 @@ Description: Qt 5 webengine HTML documentation
  .
  This package contains the HTML documentation for the Qt 5 webengine
  libraries.
+
+Package: qtpdf5-doc
+Build-Profiles: <!nodoc>
+Architecture: all
+Multi-Arch: foreign
+Section: doc
+Depends: ${misc:Depends}
+Description: Qt 5 PDF documentation
+ The Qt PDF module contains classes and functions for rendering PDF documents.
+ .
+ This package contains the documentation in QCH format, which can be
+ viewed using Qt Assistant from qttools5-dev-tools package.
+
+Package: qtpdf5-doc-html
+Build-Profiles: <!nodoc>
+Architecture: all
+Multi-Arch: foreign
+Section: doc
+Depends: ${misc:Depends}
+Description: Qt 5 PDF HTML documentation
+ The Qt PDF module contains classes and functions for rendering PDF documents.
+ .
+ This package contains the HTML documentation.
diff --git a/debian/libqt5pdf5.symbols b/debian/libqt5pdf5.symbols
index fa810af..cf7dcfe 100644
--- a/debian/libqt5pdf5.symbols
+++ b/debian/libqt5pdf5.symbols
@@ -1,7 +1,6 @@
 # SymbolsHelper-Confirmed: 5.15.1 amd64
 libQt5Pdf.so.5 libqt5pdf5 #MINVER#
-| libqt5pdf5 #MINVER#, qtwebengine-abi-5-15-1
-* Build-Depends-Package: qtwebengine5-dev
+* Build-Depends-Package: qtpdf5-dev
  Qt_5.0 at Qt_5.0 5.15.1
  Qt_5.10 at Qt_5.10 5.15.1
  Qt_5.11 at Qt_5.11 5.15.1
@@ -19,7 +18,7 @@ libQt5Pdf.so.5 libqt5pdf5 #MINVER#
  Qt_5.8 at Qt_5.8 5.15.1
  Qt_5.9 at Qt_5.9 5.15.1
  Qt_5 at Qt_5 5.15.1
- Qt_5_PRIVATE_API at Qt_5_PRIVATE_API 5.15.1 1
+ Qt_5_PRIVATE_API at Qt_5_PRIVATE_API 5.15.1
  _ZN12QPdfDocument10getAllTextEi at Qt_5 5.15.1
  _ZN12QPdfDocument11qt_metacallEN11QMetaObject4CallEiPPv at Qt_5 5.15.1
  _ZN12QPdfDocument11qt_metacastEPKc at Qt_5 5.15.1
@@ -40,19 +39,19 @@ libQt5Pdf.so.5 libqt5pdf5 #MINVER#
  _ZN12QPdfDocumentD0Ev at Qt_5 5.15.1
  _ZN12QPdfDocumentD1Ev at Qt_5 5.15.1
  _ZN12QPdfDocumentD2Ev at Qt_5 5.15.1
- _ZN13QPdfLinkModel11pageChangedEi at Qt_5_PRIVATE_API 5.15.1 1
- _ZN13QPdfLinkModel11qt_metacallEN11QMetaObject4CallEiPPv at Qt_5_PRIVATE_API 5.15.1 1
- _ZN13QPdfLinkModel11qt_metacastEPKc at Qt_5_PRIVATE_API 5.15.1 1
- _ZN13QPdfLinkModel11setDocumentEP12QPdfDocument at Qt_5_PRIVATE_API 5.15.1 1
- _ZN13QPdfLinkModel15documentChangedEv at Qt_5_PRIVATE_API 5.15.1 1
- _ZN13QPdfLinkModel15onStatusChangedEN12QPdfDocument6StatusE at Qt_5_PRIVATE_API 5.15.1 1
- _ZN13QPdfLinkModel16staticMetaObjectE at Qt_5_PRIVATE_API 5.15.1 1
- _ZN13QPdfLinkModel7setPageEi at Qt_5_PRIVATE_API 5.15.1 1
- _ZN13QPdfLinkModelC1EP7QObject at Qt_5_PRIVATE_API 5.15.1 1
- _ZN13QPdfLinkModelC2EP7QObject at Qt_5_PRIVATE_API 5.15.1 1
- _ZN13QPdfLinkModelD0Ev at Qt_5_PRIVATE_API 5.15.1 1
- _ZN13QPdfLinkModelD1Ev at Qt_5_PRIVATE_API 5.15.1 1
- _ZN13QPdfLinkModelD2Ev at Qt_5_PRIVATE_API 5.15.1 1
+ _ZN13QPdfLinkModel11pageChangedEi at Qt_5_PRIVATE_API 5.15.1
+ _ZN13QPdfLinkModel11qt_metacallEN11QMetaObject4CallEiPPv at Qt_5_PRIVATE_API 5.15.1
+ _ZN13QPdfLinkModel11qt_metacastEPKc at Qt_5_PRIVATE_API 5.15.1
+ _ZN13QPdfLinkModel11setDocumentEP12QPdfDocument at Qt_5_PRIVATE_API 5.15.1
+ _ZN13QPdfLinkModel15documentChangedEv at Qt_5_PRIVATE_API 5.15.1
+ _ZN13QPdfLinkModel15onStatusChangedEN12QPdfDocument6StatusE at Qt_5_PRIVATE_API 5.15.1
+ _ZN13QPdfLinkModel16staticMetaObjectE at Qt_5_PRIVATE_API 5.15.1
+ _ZN13QPdfLinkModel7setPageEi at Qt_5_PRIVATE_API 5.15.1
+ _ZN13QPdfLinkModelC1EP7QObject at Qt_5_PRIVATE_API 5.15.1
+ _ZN13QPdfLinkModelC2EP7QObject at Qt_5_PRIVATE_API 5.15.1
+ _ZN13QPdfLinkModelD0Ev at Qt_5_PRIVATE_API 5.15.1
+ _ZN13QPdfLinkModelD1Ev at Qt_5_PRIVATE_API 5.15.1
+ _ZN13QPdfLinkModelD2Ev at Qt_5_PRIVATE_API 5.15.1
  _ZN13QPdfSelection16staticMetaObjectE at Qt_5 5.15.1
  _ZN13QPdfSelectionC1EOS_ at Qt_5 5.15.1
  _ZN13QPdfSelectionC1EP20QPdfSelectionPrivate at Qt_5 5.15.1
@@ -142,27 +141,27 @@ libQt5Pdf.so.5 libqt5pdf5 #MINVER#
  _ZN18QPdfPageNavigationD0Ev at Qt_5 5.15.1
  _ZN18QPdfPageNavigationD1Ev at Qt_5 5.15.1
  _ZN18QPdfPageNavigationD2Ev at Qt_5 5.15.1
- _ZN19QPdfDocumentPrivate10getCharBoxEP17fpdf_textpage_t__di at Qt_5_PRIVATE_API 5.15.1 1
- _ZN19QPdfDocumentPrivate13checkCompleteEv at Qt_5_PRIVATE_API 5.15.1 1
- _ZN19QPdfDocumentPrivate13fpdf_GetBlockEPvmPhm at Qt_5_PRIVATE_API 5.15.1 1
- _ZN19QPdfDocumentPrivate15fpdf_AddSegmentEP17_FX_DOWNLOADHINTSmm at Qt_5_PRIVATE_API 5.15.1 1
- _ZN19QPdfDocumentPrivate15getCharPositionEP17fpdf_textpage_t__di at Qt_5_PRIVATE_API 5.15.1 1
- _ZN19QPdfDocumentPrivate15tryLoadDocumentEv at Qt_5_PRIVATE_API 5.15.1 1
- _ZN19QPdfDocumentPrivate15updateLastErrorEv at Qt_5_PRIVATE_API 5.15.1 1
- _ZN19QPdfDocumentPrivate16fpdf_IsDataAvailEP13_FX_FILEAVAILmm at Qt_5_PRIVATE_API 5.15.1 1
- _ZN19QPdfDocumentPrivate17checkPageCompleteEi at Qt_5_PRIVATE_API 5.15.1 1
- _ZN19QPdfDocumentPrivate33_q_copyFromSequentialSourceDeviceEv at Qt_5_PRIVATE_API 5.15.1 1
- _ZN19QPdfDocumentPrivate35initiateAsyncLoadWithTotalSizeKnownEy at Qt_5_PRIVATE_API 5.15.1 1
- _ZN19QPdfDocumentPrivate38_q_tryLoadingWithSizeFromContentHeaderEv at Qt_5_PRIVATE_API 5.15.1 1
- _ZN19QPdfDocumentPrivate4loadEP9QIODeviceb at Qt_5_PRIVATE_API 5.15.1 1
- _ZN19QPdfDocumentPrivate5clearEv at Qt_5_PRIVATE_API 5.15.1 1
- _ZN19QPdfDocumentPrivate7getTextEP17fpdf_textpage_t__ii at Qt_5_PRIVATE_API 5.15.1 1
- _ZN19QPdfDocumentPrivate7hitTestEi7QPointF at Qt_5_PRIVATE_API 5.15.1 1
- _ZN19QPdfDocumentPrivate9setStatusEN12QPdfDocument6StatusE at Qt_5_PRIVATE_API 5.15.1 1
- _ZN19QPdfDocumentPrivateC1Ev at Qt_5_PRIVATE_API 5.15.1 1
- _ZN19QPdfDocumentPrivateC2Ev at Qt_5_PRIVATE_API 5.15.1 1
- _ZN19QPdfDocumentPrivateD1Ev at Qt_5_PRIVATE_API 5.15.1 1
- _ZN19QPdfDocumentPrivateD2Ev at Qt_5_PRIVATE_API 5.15.1 1
+ _ZN19QPdfDocumentPrivate10getCharBoxEP17fpdf_textpage_t__di at Qt_5_PRIVATE_API 5.15.1
+ _ZN19QPdfDocumentPrivate13checkCompleteEv at Qt_5_PRIVATE_API 5.15.1
+ _ZN19QPdfDocumentPrivate13fpdf_GetBlockEPvmPhm at Qt_5_PRIVATE_API 5.15.1
+ _ZN19QPdfDocumentPrivate15fpdf_AddSegmentEP17_FX_DOWNLOADHINTSmm at Qt_5_PRIVATE_API 5.15.1
+ _ZN19QPdfDocumentPrivate15getCharPositionEP17fpdf_textpage_t__di at Qt_5_PRIVATE_API 5.15.1
+ _ZN19QPdfDocumentPrivate15tryLoadDocumentEv at Qt_5_PRIVATE_API 5.15.1
+ _ZN19QPdfDocumentPrivate15updateLastErrorEv at Qt_5_PRIVATE_API 5.15.1
+ _ZN19QPdfDocumentPrivate16fpdf_IsDataAvailEP13_FX_FILEAVAILmm at Qt_5_PRIVATE_API 5.15.1
+ _ZN19QPdfDocumentPrivate17checkPageCompleteEi at Qt_5_PRIVATE_API 5.15.1
+ _ZN19QPdfDocumentPrivate33_q_copyFromSequentialSourceDeviceEv at Qt_5_PRIVATE_API 5.15.1
+ _ZN19QPdfDocumentPrivate35initiateAsyncLoadWithTotalSizeKnownEy at Qt_5_PRIVATE_API 5.15.1
+ _ZN19QPdfDocumentPrivate38_q_tryLoadingWithSizeFromContentHeaderEv at Qt_5_PRIVATE_API 5.15.1
+ _ZN19QPdfDocumentPrivate4loadEP9QIODeviceb at Qt_5_PRIVATE_API 5.15.1
+ _ZN19QPdfDocumentPrivate5clearEv at Qt_5_PRIVATE_API 5.15.1
+ _ZN19QPdfDocumentPrivate7getTextEP17fpdf_textpage_t__ii at Qt_5_PRIVATE_API 5.15.1
+ _ZN19QPdfDocumentPrivate7hitTestEi7QPointF at Qt_5_PRIVATE_API 5.15.1
+ _ZN19QPdfDocumentPrivate9setStatusEN12QPdfDocument6StatusE at Qt_5_PRIVATE_API 5.15.1
+ _ZN19QPdfDocumentPrivateC1Ev at Qt_5_PRIVATE_API 5.15.1
+ _ZN19QPdfDocumentPrivateC2Ev at Qt_5_PRIVATE_API 5.15.1
+ _ZN19QPdfDocumentPrivateD1Ev at Qt_5_PRIVATE_API 5.15.1
+ _ZN19QPdfDocumentPrivateD2Ev at Qt_5_PRIVATE_API 5.15.1
  _ZNK12QPdfDocument10metaObjectEv at Qt_5 5.15.1
  _ZNK12QPdfDocument5errorEv at Qt_5 5.15.1
  _ZNK12QPdfDocument6statusEv at Qt_5 5.15.1
@@ -170,12 +169,12 @@ libQt5Pdf.so.5 libqt5pdf5 #MINVER#
  _ZNK12QPdfDocument8pageSizeEi at Qt_5 5.15.1
  _ZNK12QPdfDocument8passwordEv at Qt_5 5.15.1
  _ZNK12QPdfDocument9pageCountEv at Qt_5 5.15.1
- _ZNK13QPdfLinkModel10metaObjectEv at Qt_5_PRIVATE_API 5.15.1 1
- _ZNK13QPdfLinkModel4dataERK11QModelIndexi at Qt_5_PRIVATE_API 5.15.1 1
- _ZNK13QPdfLinkModel4pageEv at Qt_5_PRIVATE_API 5.15.1 1
- _ZNK13QPdfLinkModel8documentEv at Qt_5_PRIVATE_API 5.15.1 1
- _ZNK13QPdfLinkModel8rowCountERK11QModelIndex at Qt_5_PRIVATE_API 5.15.1 1
- _ZNK13QPdfLinkModel9roleNamesEv at Qt_5_PRIVATE_API 5.15.1 1
+ _ZNK13QPdfLinkModel10metaObjectEv at Qt_5_PRIVATE_API 5.15.1
+ _ZNK13QPdfLinkModel4dataERK11QModelIndexi at Qt_5_PRIVATE_API 5.15.1
+ _ZNK13QPdfLinkModel4pageEv at Qt_5_PRIVATE_API 5.15.1
+ _ZNK13QPdfLinkModel8documentEv at Qt_5_PRIVATE_API 5.15.1
+ _ZNK13QPdfLinkModel8rowCountERK11QModelIndex at Qt_5_PRIVATE_API 5.15.1
+ _ZNK13QPdfLinkModel9roleNamesEv at Qt_5_PRIVATE_API 5.15.1
  _ZNK13QPdfSelection10startIndexEv at Qt_5 5.15.1
  _ZNK13QPdfSelection15copyToClipboardEN10QClipboard4ModeE at Qt_5 5.15.1
  _ZNK13QPdfSelection17boundingRectangleEv at Qt_5 5.15.1
@@ -266,19 +265,19 @@ libQt5Pdf.so.5 libqt5pdf5 #MINVER#
  (optional=templinst)_ZNSt8_Rb_treeIllSt9_IdentityIlESt4lessIlESaIlEE24_M_get_insert_unique_posERKl at Qt_5 5.15.1
  (optional=templinst)_ZNSt8_Rb_treeIllSt9_IdentityIlESt4lessIlESaIlEE29_M_get_insert_hint_unique_posESt23_Rb_tree_const_iteratorIlERKl at Qt_5 5.15.1
  _ZTI12QPdfDocument at Qt_5 5.15.1
- _ZTI13QPdfLinkModel at Qt_5_PRIVATE_API 5.15.1 1
+ _ZTI13QPdfLinkModel at Qt_5_PRIVATE_API 5.15.1
  _ZTI15QPdfSearchModel at Qt_5 5.15.1
  _ZTI16QPdfPageRenderer at Qt_5 5.15.1
  _ZTI17QPdfBookmarkModel at Qt_5 5.15.1
  _ZTI18QPdfPageNavigation at Qt_5 5.15.1
  _ZTS12QPdfDocument at Qt_5 5.15.1
- _ZTS13QPdfLinkModel at Qt_5_PRIVATE_API 5.15.1 1
+ _ZTS13QPdfLinkModel at Qt_5_PRIVATE_API 5.15.1
  _ZTS15QPdfSearchModel at Qt_5 5.15.1
  _ZTS16QPdfPageRenderer at Qt_5 5.15.1
  _ZTS17QPdfBookmarkModel at Qt_5 5.15.1
  _ZTS18QPdfPageNavigation at Qt_5 5.15.1
  _ZTV12QPdfDocument at Qt_5 5.15.1
- _ZTV13QPdfLinkModel at Qt_5_PRIVATE_API 5.15.1 1
+ _ZTV13QPdfLinkModel at Qt_5_PRIVATE_API 5.15.1
  _ZTV15QPdfSearchModel at Qt_5 5.15.1
  _ZTV16QPdfPageRenderer at Qt_5 5.15.1
  _ZTV17QPdfBookmarkModel at Qt_5 5.15.1
diff --git a/debian/libqt5pdfwidgets5.symbols b/debian/libqt5pdfwidgets5.symbols
index 12028b7..0e7caad 100644
--- a/debian/libqt5pdfwidgets5.symbols
+++ b/debian/libqt5pdfwidgets5.symbols
@@ -1,7 +1,6 @@
 # SymbolsHelper-Confirmed: 5.15.1 amd64
 libQt5PdfWidgets.so.5 libqt5pdfwidgets5 #MINVER#
-| libqt5pdfwidgets5 #MINVER#, qtwebengine-abi-5-15-1
-* Build-Depends-Package: qtwebengine5-dev
+* Build-Depends-Package: qtpdf5-dev
  Qt_5.0 at Qt_5.0 5.15.1
  Qt_5.10 at Qt_5.10 5.15.1
  Qt_5.11 at Qt_5.11 5.15.1
@@ -19,7 +18,7 @@ libQt5PdfWidgets.so.5 libqt5pdfwidgets5 #MINVER#
  Qt_5.8 at Qt_5.8 5.15.1
  Qt_5.9 at Qt_5.9 5.15.1
  Qt_5 at Qt_5 5.15.1
- Qt_5_PRIVATE_API at Qt_5_PRIVATE_API 5.15.1 1
+ Qt_5_PRIVATE_API at Qt_5_PRIVATE_API 5.15.1
  _ZN8QPdfView10paintEventEP11QPaintEvent at Qt_5 5.15.1
  _ZN8QPdfView11qt_metacallEN11QMetaObject4CallEiPPv at Qt_5 5.15.1
  _ZN8QPdfView11qt_metacastEPKc at Qt_5 5.15.1
diff --git a/debian/not-installed b/debian/not-installed
index 2624e6f..aced9f2 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1 +1,7 @@
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtPdf/*/QtPdf/
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtPdfWidgets/*/QtPdfWidgets/
 usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt5Gui/Qt5Gui_QPdfPlugin.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/modules/qt_lib_pdf_private.pri
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/modules/qt_lib_pdf_private.pri
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/modules/qt_lib_pdfwidgets_private.pri
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/modules/qt_lib_pdfwidgets_private.pri
diff --git a/debian/qtpdf5-dev.install b/debian/qtpdf5-dev.install
new file mode 100644
index 0000000..324b0e7
--- /dev/null
+++ b/debian/qtpdf5-dev.install
@@ -0,0 +1,16 @@
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtPdf/[Qq]*
+usr/include/${DEB_HOST_MULTIARCH}/qt5/QtPdfWidgets/[Qq]*
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt5Pdf/Qt5PdfConfig.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt5Pdf/Qt5PdfConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt5PdfWidgets/Qt5PdfWidgetsConfig.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt5PdfWidgets/Qt5PdfWidgetsConfigVersion.cmake
+usr/lib/${DEB_HOST_MULTIARCH}/libQt5Pdf.prl
+usr/lib/${DEB_HOST_MULTIARCH}/libQt5Pdf.so
+usr/lib/${DEB_HOST_MULTIARCH}/libQt5PdfWidgets.prl
+usr/lib/${DEB_HOST_MULTIARCH}/libQt5PdfWidgets.so
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt5Pdf.pc
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt5PdfWidgets.pc
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/modules/qt_lib_pdf.pri
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/modules/qt_lib_pdf.pri
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/modules/qt_lib_pdfwidgets.pri
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/modules/qt_lib_pdfwidgets.pri
diff --git a/debian/qtpdf5-doc-html.doc-base b/debian/qtpdf5-doc-html.doc-base
new file mode 100644
index 0000000..39b5fdd
--- /dev/null
+++ b/debian/qtpdf5-doc-html.doc-base
@@ -0,0 +1,9 @@
+Document: qt5-pdf
+Title: Qt 5 PDF module
+Author: The Qt Company Ltd
+Abstract: This is the HTML documentation for Qt 5 PDF
+Section: Programming/C++
+
+Format: HTML
+Index: /usr/share/doc/qtpdf5-doc-html/html/qtpdf/qtpdf-index.html
+Files: /usr/share/doc/qtpdf5-doc-html/html/qtpdf/*.html
diff --git a/debian/qtpdf5-doc-html.install b/debian/qtpdf5-doc-html.install
new file mode 100644
index 0000000..1b0fe8a
--- /dev/null
+++ b/debian/qtpdf5-doc-html.install
@@ -0,0 +1 @@
+usr/share/qt5/doc/qtpdf/
diff --git a/debian/qtpdf5-doc-html.links b/debian/qtpdf5-doc-html.links
new file mode 100644
index 0000000..8ab58e2
--- /dev/null
+++ b/debian/qtpdf5-doc-html.links
@@ -0,0 +1 @@
+usr/share/qt5/doc usr/share/doc/qtpdf5-doc-html/html
diff --git a/debian/qtpdf5-doc.install b/debian/qtpdf5-doc.install
new file mode 100644
index 0000000..bba9133
--- /dev/null
+++ b/debian/qtpdf5-doc.install
@@ -0,0 +1 @@
+usr/share/qt5/doc/qtpdf.qch
diff --git a/debian/qtpdf5-examples.install b/debian/qtpdf5-examples.install
new file mode 100644
index 0000000..99ff52c
--- /dev/null
+++ b/debian/qtpdf5-examples.install
@@ -0,0 +1 @@
+usr/lib/${DEB_HOST_MULTIARCH}/qt5/examples/pdfwidgets/*
diff --git a/debian/qtwebengine5-dev.install b/debian/qtwebengine5-dev.install
index 2ec560c..a1f5930 100644
--- a/debian/qtwebengine5-dev.install
+++ b/debian/qtwebengine5-dev.install
@@ -1,38 +1,22 @@
-usr/include/${DEB_HOST_MULTIARCH}/qt5/QtPdf/[Qq]*
-usr/include/${DEB_HOST_MULTIARCH}/qt5/QtPdfWidgets/[Qq]*
 usr/include/${DEB_HOST_MULTIARCH}/qt5/QtWebEngine/[Qq]*
 usr/include/${DEB_HOST_MULTIARCH}/qt5/QtWebEngineCore/[Qq]*
 usr/include/${DEB_HOST_MULTIARCH}/qt5/QtWebEngineWidgets/[Qq]*
 usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt5Designer/Qt5Designer_QWebEngineViewPlugin.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt5Pdf/Qt5PdfConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt5Pdf/Qt5PdfConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt5PdfWidgets/Qt5PdfWidgetsConfig.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt5PdfWidgets/Qt5PdfWidgetsConfigVersion.cmake
 usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt5WebEngine/Qt5WebEngineConfig.cmake
 usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt5WebEngine/Qt5WebEngineConfigVersion.cmake
 usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt5WebEngineCore/Qt5WebEngineCoreConfig.cmake
 usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt5WebEngineCore/Qt5WebEngineCoreConfigVersion.cmake
 usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt5WebEngineWidgets/Qt5WebEngineWidgetsConfig.cmake
 usr/lib/${DEB_HOST_MULTIARCH}/cmake/Qt5WebEngineWidgets/Qt5WebEngineWidgetsConfigVersion.cmake
-usr/lib/${DEB_HOST_MULTIARCH}/libQt5Pdf.prl
-usr/lib/${DEB_HOST_MULTIARCH}/libQt5Pdf.so
-usr/lib/${DEB_HOST_MULTIARCH}/libQt5PdfWidgets.prl
-usr/lib/${DEB_HOST_MULTIARCH}/libQt5PdfWidgets.so
 usr/lib/${DEB_HOST_MULTIARCH}/libQt5WebEngine.prl
 usr/lib/${DEB_HOST_MULTIARCH}/libQt5WebEngine.so
 usr/lib/${DEB_HOST_MULTIARCH}/libQt5WebEngineCore.prl
 usr/lib/${DEB_HOST_MULTIARCH}/libQt5WebEngineCore.so
 usr/lib/${DEB_HOST_MULTIARCH}/libQt5WebEngineWidgets.prl
 usr/lib/${DEB_HOST_MULTIARCH}/libQt5WebEngineWidgets.so
-usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt5Pdf.pc
-usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt5PdfWidgets.pc
 usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt5WebEngine.pc
 usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt5WebEngineCore.pc
 usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig/Qt5WebEngineWidgets.pc
-usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/modules/qt_lib_pdf.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/modules/qt_lib_pdf.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/modules/qt_lib_pdfwidgets.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/modules/qt_lib_pdfwidgets.pri
 usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/modules/qt_lib_webengine.pri
 usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/modules/qt_lib_webenginecore.pri
 usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/modules/qt_lib_webenginewidgets.pri
diff --git a/debian/qtwebengine5-doc-html.install b/debian/qtwebengine5-doc-html.install
index 328eede..b4b9975 100644
--- a/debian/qtwebengine5-doc-html.install
+++ b/debian/qtwebengine5-doc-html.install
@@ -1,2 +1 @@
-usr/share/qt5/doc/qtpdf/
 usr/share/qt5/doc/qtwebengine/
diff --git a/debian/qtwebengine5-doc.install b/debian/qtwebengine5-doc.install
index fe04f4e..37c66a1 100644
--- a/debian/qtwebengine5-doc.install
+++ b/debian/qtwebengine5-doc.install
@@ -1,2 +1 @@
-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 61c3170..e8fe31d 100644
--- a/debian/qtwebengine5-examples.install
+++ b/debian/qtwebengine5-examples.install
@@ -1,3 +1,2 @@
-usr/lib/${DEB_HOST_MULTIARCH}/qt5/examples/pdfwidgets/*
 usr/lib/${DEB_HOST_MULTIARCH}/qt5/examples/webengine/*
 usr/lib/${DEB_HOST_MULTIARCH}/qt5/examples/webenginewidgets/*
diff --git a/debian/qtwebengine5-private-dev.install b/debian/qtwebengine5-private-dev.install
index bbeb452..d11e92d 100644
--- a/debian/qtwebengine5-private-dev.install
+++ b/debian/qtwebengine5-private-dev.install
@@ -1,12 +1,6 @@
-usr/include/${DEB_HOST_MULTIARCH}/qt5/QtPdf/*/QtPdf/
-usr/include/${DEB_HOST_MULTIARCH}/qt5/QtPdfWidgets/*/QtPdfWidgets/
 usr/include/${DEB_HOST_MULTIARCH}/qt5/QtWebEngine/*/QtWebEngine/
 usr/include/${DEB_HOST_MULTIARCH}/qt5/QtWebEngineCore/*/QtWebEngineCore/
 usr/include/${DEB_HOST_MULTIARCH}/qt5/QtWebEngineWidgets/*/QtWebEngineWidgets/
-usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/modules/qt_lib_pdf_private.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/modules/qt_lib_pdf_private.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/modules/qt_lib_pdfwidgets_private.pri
-usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/modules/qt_lib_pdfwidgets_private.pri
 usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/modules/qt_lib_webengine_private.pri
 usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/modules/qt_lib_webenginecore_private.pri
 usr/lib/${DEB_HOST_MULTIARCH}/qt5/mkspecs/modules/qt_lib_webenginecoreheaders_private.pri



More information about the Neon-commits mailing list