Pkg-kde-tools Changes

Updated 2,131 Days AgoPublic

Actions

diff --git a/debian/changelog b/debian/changelog
index f0e1ccb..25ccdbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+pkg-kde-tools (0.15.28ubuntu2) UNRELEASED; urgency=medium
+
+  * perllib/Debian/Debhelper/Sequence/kf5.pm:
+    - execute the new dh_kubuntu_list-missing after the package is built i.e.
+      after dh_builddeb
+    - execute the new dh_kubuntu_execute_lintian after dh_kubuntu_list-missing
+  * Don't execute anymore the lintian and list-missing targets in
+    qt-kde-team/3/debian-qt-kde.mk since that is now managed by
+    perllib/Debian/Debhelper/Sequence/kf5.pm
+
+ -- José Manuel Santamaría Lema <panfaust@gmail.com>  Fri, 08 Jun 2018 12:46:31 +0200
+
 pkg-kde-tools (0.15.28ubuntu1) bionic; urgency=medium
 
   * Merge with current Debian unstable for dpkg 1.19.0 compatibility.
diff --git a/kubuntu/bin/dh_kubuntu_execute_lintian b/kubuntu/bin/dh_kubuntu_execute_lintian
new file mode 100755
index 0000000..d23ab60
--- /dev/null
+++ b/kubuntu/bin/dh_kubuntu_execute_lintian
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+dpkg-genchanges > ../.pkg-kde-lintian.changes
+echo "=== Start lintian"
+lintian --allow-root ../.pkg-kde-lintian.changes
+echo "=== End lintian"
+rm -f ../.pkg-kde-lintian.changes
diff --git a/kubuntu/bin/dh_kubuntu_list-missing b/kubuntu/bin/dh_kubuntu_list-missing
new file mode 100755
index 0000000..708bea5
--- /dev/null
+++ b/kubuntu/bin/dh_kubuntu_list-missing
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+echo "=== Start list-missing"
+#This will print a list missing files in this format:
+#usr/bin/foo
+#usr/share/bar
+#so if we have missing files we just have to copy the lines into *.install
+#or not-installed files
+dh_missing --list-missing 2>&1 | grep 'dh_missing:' \
+       | sed -E 's/dh_missing:[[:space:]]*([^[:space:]]*)[[:space:]]*.*/\1/'
+echo "=== End list-missing"
diff --git a/perllib/Debian/Debhelper/Sequence/kf5.pm b/perllib/Debian/Debhelper/Sequence/kf5.pm
index 566d977..a52a5d3 100644
--- a/perllib/Debian/Debhelper/Sequence/kf5.pm
+++ b/perllib/Debian/Debhelper/Sequence/kf5.pm
@@ -41,4 +41,11 @@ add_command_options("dh_compress",
 
 insert_after("dh_install", "dh_movelibkdeinit");
 
+#Execute dh_missing --list-missing between marks recognized by Kubuntu's
+#CI and status reports
+insert_after("dh_builddeb","dh_kubuntu_list-missing");
+
+#Execute lintian once the package is built
+insert_after("dh_kubuntu_list-missing", "dh_kubuntu_execute_lintian");
+
 1;
diff --git a/qt-kde-team/3/debian-qt-kde.mk b/qt-kde-team/3/debian-qt-kde.mk
index 6a564de..e963208 100644
--- a/qt-kde-team/3/debian-qt-kde.mk
+++ b/qt-kde-team/3/debian-qt-kde.mk
@@ -21,12 +21,6 @@ dh := --with=kf5,pkgkde-symbolshelper $(dh)
 dqk_disable_policy_check ?=
 include $(dqk_dir)policy.mk
 
-# Support list-missing target
-include $(dqk_dir)list-missing.mk
-
-# Support lintian target
-include $(dqk_dir)lintian.mk
-
 # KDE packages are parallel safe. Add --parallel to dh_auto_% commands
 $(call set_command_options,dh_auto_%, += --parallel)
 
@@ -96,8 +90,6 @@ install_to_doc-html_package:
        fi
 $(foreach t,install-indep install,post_$(t)_dh_install): install_to_doc-html_package
 
-post_binary: list-missing lintian
-
 .PHONY: run_dh_sameversiondep cleanup_manpages install_to_doc-html_package
 
 endif # ifneq ($(dhmk_override_info_mode),yes)