rev 20150 - kde-extras/kwave/trunk/debian

[Pino Toscano]

Author: pino
Date: 2015-12-13 09:23:59 +0000 (Sun, 13 Dec 2015)
New Revision: 20150

Modified:
   kde-extras/kwave/trunk/debian/changelog
   kde-extras/kwave/trunk/debian/rules
Log:
extend dh_strip hack also to dh_shlibdeps


Modified: kde-extras/kwave/trunk/debian/changelog
===================================================================
--- kde-extras/kwave/trunk/debian/changelog	2015-12-13 08:45:56 UTC (rev 20149)
+++ kde-extras/kwave/trunk/debian/changelog	2015-12-13 09:23:59 UTC (rev 20150)
@@ -4,6 +4,9 @@
   * Backport part of upstream commit 90f6e432e06e9ec1480a24b37f5ffe5dec4f75fc
     to fix a double vs float mismatch in sonagram plugin (fixing build on arm*
     architectures); patch upstream_compile-fix-for-armv7l.patch.
+  * Extend the dh_strip hack into an helper function, and apply it also to
+    dh_shlibdeps: this way we have proper dependencies for all the libraries
+    used by plugins.
 
  -- Pino Toscano <pino at debian.org>  Sun, 13 Dec 2015 09:21:50 +0100
 

Modified: kde-extras/kwave/trunk/debian/rules
===================================================================
--- kde-extras/kwave/trunk/debian/rules	2015-12-13 08:45:56 UTC (rev 20149)
+++ kde-extras/kwave/trunk/debian/rules	2015-12-13 09:23:59 UTC (rev 20150)
@@ -6,23 +6,28 @@
   DEB_CMAKE_CUSTOM_FLAGS += -DWITH_ALSA=OFF
 endif
 
+# since the kwave plugins have no .so extension, debhelper tools do not
+# find them; since we want to act on them, do a small hack:
+# 1) link each plugin to a new a .so name
+# 2) invoke the command normally (which will do the job)
+# 3) remove the .so links
+define override-so-plugins
+
+override_$(1):
+	find debian/kwave/usr/lib/kde4/plugins/kwave/ -type f -execdir ln '{}' '{}.so' \;
+	$(1) $(2)
+	find debian/kwave/usr/lib/kde4/plugins/kwave/ -type f -name '*.so' -delete
+
+endef
+
 %:
 	dh $@ --parallel --with kde
 
 override_dh_auto_configure:
 	dh_auto_configure -- $(DEB_CMAKE_CUSTOM_FLAGS)
 
-override_dh_strip:
-	# since the kwave plugins have no .so extension, dh_strip does not
-	# find them (leaving them unstripped); since we want to both strip
-	# them and place their debug symbols in the -dbg package, do a small
-	# hack:
-	# 1) link each plugin to a new a .so name
-	find debian/kwave/usr/lib/kde4/plugins/kwave/ -type f -execdir ln '{}' '{}.so' \;
-	# 2) invoke dh_strip normally (which will do the job)
-	dh_strip --dbg-package=kwave-dbg
-	# 3) remove the .so links
-	find debian/kwave/usr/lib/kde4/plugins/kwave/ -type f -name '*.so' -delete
+$(eval $(call override-so-plugins,dh_strip,--dbg-package=kwave-dbg))
+$(eval $(call override-so-plugins,dh_shlibdeps,))
 
 override_dh_auto_install:
 	dh_auto_install --destdir=debian/kwave