[SCM] Debian Qt/KDE packaging tools branch, experimental, updated. debian/0.15.16-3-g7b99b1b

Maximiliano Curia maxy at moszumanska.debian.org
Thu Mar 26 16:22:56 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/pkg-kde-tools.git;a=commitdiff;h=ed78c97

The following commit has been merged in the experimental branch:
commit ed78c97b898022c79bf3bceca0816cc1765cc690
Author: Maximiliano Curia <maxy at debian.org>
Date:   Wed Mar 4 09:46:19 2015 +0100

    Run list-missing by default, allow ~dh_install syntax in not-installed
---
 qt-kde-team/3/debian-qt-kde.mk |  2 ++
 qt-kde-team/3/list-missing.mk  | 10 ++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/qt-kde-team/3/debian-qt-kde.mk b/qt-kde-team/3/debian-qt-kde.mk
index 09c290a..5642223 100644
--- a/qt-kde-team/3/debian-qt-kde.mk
+++ b/qt-kde-team/3/debian-qt-kde.mk
@@ -93,6 +93,8 @@ install_to_doc-html_package:
 	fi
 $(foreach t,install-indep install,post_$(t)_dh_install): install_to_doc-html_package
 
+post_binary: list-missing
+
 .PHONY: run_dh_sameversiondep cleanup_manpages install_to_doc-html_package
 
 endif # ifneq ($(dhmk_override_info_mode),yes)
diff --git a/qt-kde-team/3/list-missing.mk b/qt-kde-team/3/list-missing.mk
index 8fb82ac..388d304 100644
--- a/qt-kde-team/3/list-missing.mk
+++ b/qt-kde-team/3/list-missing.mk
@@ -19,15 +19,21 @@
 ifdef dqk_dir
 
 list-missing:
-	@if test -d debian/tmp; then \
+	@echo "=== Start list-missing"; \
+	if test -d debian/tmp; then \
 	  (cd debian/tmp && find . -type f -o -type l | grep -v '/DEBIAN/' | sort) > debian/dhmk-install-list; \
 	  (for package in $(shell dh_listpackages); do \
 	     (cd debian/$$package && find . -type f -o -type l); \
 	   done; \
-	   test -e debian/not-installed && grep -v '^#' debian/not-installed; \
+	   test -e debian/not-installed && grep -v '^#' debian/not-installed | \
+	   while read glob_patt; do \
+	      (cd debian/tmp; find . -path ./"$${glob_patt}" '(' -type f -o -type l ')'); \
+	   done; \
 	   ) | sort -u > debian/dhmk-package-list; \
 	  diff -u debian/dhmk-install-list debian/dhmk-package-list | sed '1,2d' | egrep '^-' || true; \
+	  echo "=== End list-missing"; \
 	else \
+	  echo "=== End list-missing"; \
 	  echo "All files were installed into debian/$(shell dh_listpackages | head -n1)."; \
 	fi
 

-- 
Debian Qt/KDE packaging tools



More information about the pkg-kde-commits mailing list