[SCM] kalzium packaging branch, master, updated. debian/16.08.3-1-69-gd174ceb

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kalzium.git;a=commitdiff;h=dcbf605

The following commit has been merged in the master branch:
commit dcbf6058b754e43741a217a25de4bbebb66397d9
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Thu Mar 2 15:13:36 2017 +0000

    update for qt5 port, sorry no avogadro yet https://phabricator.kde.org/T4833
---
 debian/control              |  1 -
 debian/kalzium-data.install | 23 +++++++++--------------
 debian/kalzium.install      | 23 +++++------------------
 debian/patches/series       |  1 -
 debian/rules                | 10 +---------
 5 files changed, 15 insertions(+), 43 deletions(-)

diff --git a/debian/control b/debian/control
index 3810444..a9cf910 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,6 @@ Build-Depends: chemical-mime-data,
                cmake,
                debhelper (>= 9),
                extra-cmake-modules,
-               libavogadro-dev [!armhf],
                libboost-python-dev,
                libeigen3-dev (>> 2.0.3),
                libfacile-ocaml-dev,
diff --git a/debian/kalzium-data.install b/debian/kalzium-data.install
index 2f4a6dc..98854bb 100644
--- a/debian/kalzium-data.install
+++ b/debian/kalzium-data.install
@@ -1,15 +1,10 @@
-usr/share/doc/kde/HTML/en/kalzium/
-usr/share/icons/hicolor/128x128/apps/kalzium.png
-usr/share/icons/hicolor/16x16/apps/kalzium.png
-usr/share/icons/hicolor/22x22/apps/kalzium.png
-usr/share/icons/hicolor/32x32/apps/kalzium.png
-usr/share/icons/hicolor/48x48/apps/kalzium.png
-usr/share/icons/hicolor/64x64/apps/kalzium.png
-usr/share/icons/hicolor/scalable/apps/kalzium.svgz
-usr/share/kde4/apps/desktoptheme/default/widgets/chalkboard.svg
-usr/share/kde4/apps/kalzium/
-usr/share/kde4/apps/libkdeedu/data/
-usr/share/kde4/config.kcfg/kalzium.kcfg
-usr/share/kde4/config/kalzium.knsrc
+etc/xdg/kalzium.knsrc
+usr/share/config.kcfg
+usr/share/doc
+usr/share/doc/HTML/en/kalzium/
+usr/share/icons
+usr/share/kalzium
+usr/share/kxmlgui5
+usr/share/libkdeedu
+usr/share/man
 usr/share/man/man1/kalzium.1
-usr/share/metainfo/kalzium.appdata.xml
diff --git a/debian/kalzium.install b/debian/kalzium.install
index f3332a5..1741d4d 100644
--- a/debian/kalzium.install
+++ b/debian/kalzium.install
@@ -1,19 +1,6 @@
 usr/bin/kalzium
-usr/lib/kde4/concentrationCalculator.so
-usr/lib/kde4/gasCalculator.so
-usr/lib/kde4/nuclearCalculator.so
-usr/lib/kde4/plasma_applet_didyouknow.so
-usr/lib/kde4/plasma_applet_molmassCalculator.so
-usr/lib/kde4/plasma_engine_kalzium.so
-usr/lib/libcompoundviewer.so.4
-usr/lib/libcompoundviewer.so.4.*
-usr/lib/libscience.so.4
-usr/lib/libscience.so.4.*
-usr/share/applications/kde4/kalzium.desktop
-usr/share/applications/kde4/kalzium_cml.desktop
-usr/share/kde4/services/concentrationCalculator.desktop
-usr/share/kde4/services/gasCalculator.desktop
-usr/share/kde4/services/nuclearCalculator.desktop
-usr/share/kde4/services/plasma-applet-Molmasscalculator.desktop
-usr/share/kde4/services/plasma-dataengine-kalzium.desktop
-usr/share/kde4/services/plasma_didyouknow.desktop
+usr/lib/*/libscience.so.5
+usr/lib/*/libscience.so.5.*
+usr/share/applications/org.kde.kalzium.desktop
+usr/share/applications/org.kde.kalzium_cml.desktop
+usr/share/metainfo/
diff --git a/debian/patches/series b/debian/patches/series
index df0603a..4413ab1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 no_install_rpath_use_link_path.diff
 avoid_nameclash.patch
-kde_no-operator-names.diff
diff --git a/debian/rules b/debian/rules
index 0e5c5dc..b57f3e9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,3 @@
 #!/usr/bin/make -f
 
-include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
-libpkgs_gen_strict_local_shlibs = $(libpkgs_all_packages)
-include /usr/share/pkg-kde-tools/qt-kde-team/2/library-packages.mk
-
-override_dh_makeshlibs:
-	$(overridden_command) -V
-
-override_dh_strip:
-	$(overridden_command) --dbgsym-migration='kalzium-dbg (<= 4:15.08.3-1~~)'
+include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk

-- 
kalzium packaging