[neon/kde/kalzium/Neon/unstable] debian: Manually merge/sync to latest kubuntu packaging

Carlos De Maine null at kde.org
Wed Dec 14 06:59:46 GMT 2022


Git commit 5624587fe4a21a295fcb30826fa6130b3c1f2c79 by Carlos De Maine.
Committed on 14/12/2022 at 06:56.
Pushed by carlosdem into branch 'Neon/unstable'.

Manually merge/sync to latest kubuntu packaging

M  +27   -29   debian/control
M  +1    -0    debian/kalzium-data.install
M  +2    -0    debian/kalzium.install
M  +6    -1    debian/kalzium.lintian-overrides
M  +0    -16   debian/not-installed
M  +10   -3    debian/rules

https://invent.kde.org/neon/kde/kalzium/commit/5624587fe4a21a295fcb30826fa6130b3c1f2c79

diff --git a/debian/control b/debian/control
index 2e5b6ac..1b7ecc6 100644
--- a/debian/control
+++ b/debian/control
@@ -1,51 +1,49 @@
 Source: kalzium
 Section: kde
 Priority: optional
-Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Maintainer: Kubuntu Developers <kubuntu-devel at lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Eshat Cakar <info at eshat.de>,
            Sune Vuorela <sune at debian.org>,
-           Maximiliano Curia <maxy at debian.org>
+           Maximiliano Curia <maxy at debian.org>,
 Build-Depends: chemical-mime-data,
-               cmake (>= 2.8.12~),
-               debhelper (>= 9),
-               extra-cmake-modules (>= 5.7.0~),
+               cmake (>= 3.5.0~),
+               debhelper-compat (= 13),
+               extra-cmake-modules (>= 5.57.0~),
                gettext,
                libavogadro-dev,
-               libboost-python-dev,
                libeigen3-dev (>> 2.0.3),
                libfacile-ocaml-dev,
-               libkf5archive-dev,
-               libkf5config-dev,
-               libkf5coreaddons-dev,
-               libkf5doctools-dev,
-               libkf5i18n-dev,
-               libkf5kdelibs4support-dev,
-               libkf5khtml-dev,
-               libkf5newstuff-dev,
-               libkf5parts-dev,
-               libkf5plotting-dev,
-               libkf5solid-dev,
-               libkf5unitconversion-dev,
-               libkf5widgetsaddons-dev,
-               libopenbabel-dev,
-               libqt5opengl5-dev,
-               libqt5svg5-dev,
+               libkf5archive-dev (>= 5.57.0~),
+               libkf5config-dev (>= 5.57.0~),
+               libkf5coreaddons-dev (>= 5.57.0~),
+               libkf5doctools-dev (>= 5.57.0~),
+               libkf5i18n-dev (>= 5.57.0~),
+               libkf5newstuff-dev (>= 5.57.0~),
+               libkf5parts-dev (>= 5.57.0~),
+               libkf5plotting-dev (>= 5.57.0~),
+               libkf5solid-dev (>= 5.57.0~),
+               libkf5unitconversion-dev (>= 5.57.0~),
+               libkf5widgetsaddons-dev (>= 5.57.0~),
+               libopenbabel-dev (>= 3.1.1+dfsg-4),
+               libqt5opengl5-dev (>= 5.9.0~),
+               libqt5svg5-dev (>= 5.9.0~),
                pkg-config,
                pkg-kde-tools (>= 0.14),
-               qtbase5-dev,
-               qtdeclarative5-dev,
-               qtscript5-dev
-Standards-Version: 4.1.1
+               qtbase5-dev (>= 5.9.0~),
+               qtscript5-dev (>= 5.9.0~),
+Standards-Version: 4.5.1
+Rules-Requires-Root: no
 Homepage: http://edu.kde.org/
-Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kalzium
-Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kalzium.git
+Vcs-Browser: https://code.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kalzium
+Vcs-Git: https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/kalzium
 
 Package: kalzium
 Architecture: any
 Section: science
 Depends: kalzium-data (>= ${source:Version}),
          ${misc:Depends},
-         ${shlibs:Depends}
+         ${shlibs:Depends},
 Breaks: libkdeedu4 (<< 4:4.6.2), libscience4
 Replaces: libkdeedu4 (<< 4:4.6.2), libscience4
 Suggests: chemical-mime-data, khelpcenter
diff --git a/debian/kalzium-data.install b/debian/kalzium-data.install
index a859cef..ad3e6d3 100644
--- a/debian/kalzium-data.install
+++ b/debian/kalzium-data.install
@@ -2,6 +2,7 @@ usr/share/config.kcfg
 usr/share/doc
 usr/share/icons
 usr/share/kalzium
+usr/share/knsrcfiles/
 usr/share/libkdeedu
 usr/share/locale/
 usr/share/man
diff --git a/debian/kalzium.install b/debian/kalzium.install
index 1741d4d..e8e5ca4 100644
--- a/debian/kalzium.install
+++ b/debian/kalzium.install
@@ -1,4 +1,6 @@
 usr/bin/kalzium
+usr/lib/*/libcompoundviewer.so.5
+usr/lib/*/libcompoundviewer.so.5.*
 usr/lib/*/libscience.so.5
 usr/lib/*/libscience.so.5.*
 usr/share/applications/org.kde.kalzium.desktop
diff --git a/debian/kalzium.lintian-overrides b/debian/kalzium.lintian-overrides
index 2082017..bfe9315 100644
--- a/debian/kalzium.lintian-overrides
+++ b/debian/kalzium.lintian-overrides
@@ -1 +1,6 @@
-kalzium: package-name-doesnt-match-sonames libscience5
+# private library
+kalzium: package-name-doesnt-match-sonames libcompoundviewer5 libscience5
+# private library
+kalzium: no-symbols-control-file usr/lib/*/libcompoundviewer.so.*
+# private library
+kalzium: no-symbols-control-file usr/lib/*/libscience.so.*
diff --git a/debian/not-installed b/debian/not-installed
index 115c30a..2d799f2 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,18 +1,2 @@
 # compressed manpage
 usr/share/man/
-
-# These would belong to kalzium-dev
-usr/include/libkdeedu/chemicaldataobject.h
-usr/include/libkdeedu/element.h
-usr/include/libkdeedu/elementparser.h
-usr/include/libkdeedu/isotope.h
-usr/include/libkdeedu/isotopeparser.h
-usr/include/libkdeedu/libkdeedu_science_export.h
-usr/include/libkdeedu/moleculeparser.h
-usr/include/libkdeedu/parser.h
-usr/include/libkdeedu/psetables.h
-usr/include/libkdeedu/spectrum.h
-usr/include/libkdeedu/spectrumparser.h
-usr/include/libkdeedu/science_export.h
-usr/lib/*/libscience.so
-usr/lib/*/libcompoundviewer.so
diff --git a/debian/rules b/debian/rules
index 1d7803e..6fbfe42 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,19 @@
 #!/usr/bin/make -f
 
 l10npkgs_firstversion_ok := 4:16.04.3-6~
-
-include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk
 
+%:
+	dh $@ --with kf5
+
 override_dh_auto_install:
-	$(overridden_command)
+	dh_auto_install
 	# drop translations of plasma-related components, since they are
 	# not ported yet
 	rm -f debian/tmp/usr/share/locale/*/LC_MESSAGES/plasma_*.mo
+	# drop development stuff
+	rm -rf debian/tmp/usr/include/
+	find debian/tmp -name '*.so' -type l -delete
+
+override_dh_gencontrol-indep: l10npkgs_firstversion_ok
+	dh_gencontrol -i


More information about the Neon-commits mailing list