[SCM] kwallet-pam packaging branch, master, updated. debian/5.10.5-2-6-g7ba09b2

Maximiliano Curia maxy at moszumanska.debian.org
Wed Jan 3 22:54:04 UTC 2018


Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kwallet-pam.git;a=commitdiff;h=6498197

The following commit has been merged in the master branch:
commit 64981977a4afaed0e0417f9b29288131b5c6ca17
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Dec 28 10:51:57 2017 -0300

    Move away from dhmk
    
    Gbp-Dch: Ignore
---
 debian/rules | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/debian/rules b/debian/rules
index 1cc5a34..d1abcfd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,27 +1,28 @@
 #!/usr/bin/make -f
 
-include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
-
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 QT4_BUILD_DIR = build-qt4
 
+%:
+	dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5
+
 override_dh_auto_clean:
-	$(overridden_command)
+	dh_auto_clean
 	rm -rf $(QT4_BUILD_DIR)
 
 override_dh_auto_configure:
-	$(overridden_command) -- \
+	dh_auto_configure -- \
 	    -DCMAKE_INSTALL_LIBDIR="/lib/${DEB_HOST_MULTIARCH}" \
 	    -DLIBEXEC_INSTALL_DIR="/usr/share/libpam-kwallet-common"
-	$(overridden_command) --builddirectory=$(QT4_BUILD_DIR) -- \
+	dh_auto_configure --builddirectory=$(QT4_BUILD_DIR) -- \
 	    -DKWALLET4=1 -DCMAKE_INSTALL_LIBDIR="/lib/${DEB_HOST_MULTIARCH}" \
 	    -DLIBEXEC_INSTALL_DIR="/usr/share/libpam-kwallet-common"
 
 override_dh_auto_build:
-	$(overridden_command)
-	$(overridden_command) --builddirectory=$(QT4_BUILD_DIR)
+	dh_auto_build
+	dh_auto_build --builddirectory=$(QT4_BUILD_DIR)
 
 override_dh_auto_install:
-	$(overridden_command)
-	$(overridden_command) --builddirectory=$(QT4_BUILD_DIR)
+	dh_auto_install
+	dh_auto_install --builddirectory=$(QT4_BUILD_DIR)

-- 
kwallet-pam packaging



More information about the pkg-kde-commits mailing list