[neon/neon-packaging/mimetreeparser/Neon/stable] debian: Merge branch 'Neon/unstable' into 'Neon/release'

Carlos De Maine null at kde.org
Sun Jul 30 23:03:55 BST 2023


Git commit a6018fe634acd65b610ae74342c52739c0d636ef by Carlos De Maine.
Committed on 31/07/2023 at 00:03.
Pushed by carlosdem into branch 'Neon/stable'.

Merge branch 'Neon/unstable' into 'Neon/release'

merge Neon/unstable into release

See merge request neon/neon-packaging/mimetreeparser!1

(cherry picked from commit 5290a0b67bb6e0b9116d7cdfcc102a595bafeff6)

18d68477 libkf5mbox-dev
ef8194ec Stray /
a9b6d402 Another extraneous/
2f05e2ec libkf5declarative-dev
fa9bb8a3 Bloody formatting when you are on your telephone 
9c677930 formatting
1d88b7c8 clean up
4eeb2c86 i what?
b1ff3132 installs
557b7267 solibbing

M  +4    -4    debian/control
M  +2    -1    debian/kf5-mimetreeparser-dev.install
M  +3    -2    debian/kf5-mimetreeparser.install

https://invent.kde.org/neon/neon-packaging/mimetreeparser/-/commit/a6018fe634acd65b610ae74342c52739c0d636ef

diff --git a/debian/control b/debian/control
index e6fd11f..39411dd 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,9 @@ Build-Depends: cmake,
                extra-cmake-modules,
                libgpgme-dev,
                libkf5calendarcore-dev,
+               libkf5declarative-dev,
                libkf5i18n-dev,
+               libkf5mbox-dev,
                libkf5mime-dev,
                pkg-kde-tools,
                qtbase5-dev,
@@ -31,10 +33,8 @@ Description: library for handling MIME data
 Package: kf5-mimetreeparser-dev
 Section: libdevel
 Architecture: any
-Depends: libboost-dev (>= 1.49~),
-         libkf5codecs-dev,
-         libkf5mime5 (= ${binary:Version}),
-         qtbase5-dev (>= 5.2.0~),
+Depends: kf5-mimetreeparser,
+         qtbase5-dev,
          ${misc:Depends}
 Description: library for handling MIME data - development files
  This library is a parser for a MIME tree and is based on KMime. The
diff --git a/debian/kf5-mimetreeparser-dev.install b/debian/kf5-mimetreeparser-dev.install
index 76dd395..a39a02e 100644
--- a/debian/kf5-mimetreeparser-dev.install
+++ b/debian/kf5-mimetreeparser-dev.install
@@ -1,4 +1,5 @@
 usr/include/KPim5/
 usr/lib/*/cmake/
 usr/lib/*/libKPim5MimeTreeParserCore.so
-/usr/lib/*/qt5/mkspecs/
+usr/lib/*/libKPim5MimeTreeParserWidgets.so
+usr/lib/*/qt5/mkspecs/
diff --git a/debian/kf5-mimetreeparser.install b/debian/kf5-mimetreeparser.install
index 191fc5f..c908cdb 100644
--- a/debian/kf5-mimetreeparser.install
+++ b/debian/kf5-mimetreeparser.install
@@ -1,4 +1,5 @@
-usr/lib/*/libKPim5MimeTreeParserCore.so.5*
-usr/lib/*//qt5/qml/org/kde/pim/mimetreeparser/
+usr/lib/*/libKPim5MimeTreeParserCore.so.*
+usr/lib/*/libKPim5MimeTreeParserWidgets.so.*
+usr/lib/*/qt5/qml/org/kde/pim/mimetreeparser/
 #usr/share/locale/
 usr/share/qlogging-categories5/mimetreeparser2.categories


More information about the Neon-commits mailing list