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

[Pino Toscano]

Author: pino
Date: 2016-03-25 10:24:36 +0000 (Fri, 25 Mar 2016)
New Revision: 20401

Modified:
   kde-extras/kwave/trunk/debian/changelog
   kde-extras/kwave/trunk/debian/rules
Log:
rules: remove plugins hack

now plugins have a proper .so extension, so debhelper tools can handle
them correctly


Modified: kde-extras/kwave/trunk/debian/changelog
===================================================================
--- kde-extras/kwave/trunk/debian/changelog	2016-03-25 10:11:15 UTC (rev 20400)
+++ kde-extras/kwave/trunk/debian/changelog	2016-03-25 10:24:36 UTC (rev 20401)
@@ -19,6 +19,8 @@
    * Use the right dh addon:
      - switch from kde to kf5 dh addon
      - bump the pkg-kde-tools build dependency to >= 0.15.16
+  * Remove the plugins hack in rules: now plugins have a proper .so extension,
+    so debhelper tools can handle them correctly.
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Fri, 25 Mar 2016 10:25:08 +0100
 

Modified: kde-extras/kwave/trunk/debian/rules
===================================================================
--- kde-extras/kwave/trunk/debian/rules	2016-03-25 10:11:15 UTC (rev 20400)
+++ kde-extras/kwave/trunk/debian/rules	2016-03-25 10:24:36 UTC (rev 20401)
@@ -6,28 +6,14 @@
   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 kf5
 
 override_dh_auto_configure:
 	dh_auto_configure -- $(DEB_CMAKE_CUSTOM_FLAGS)
 
-$(eval $(call override-so-plugins,dh_strip,--dbg-package=kwave-dbg))
-$(eval $(call override-so-plugins,dh_shlibdeps,))
+override_dh_strip:
+	dh_strip --dbg-package=kwave-dbg
 
 override_dh_auto_install:
 	dh_auto_install --destdir=debian/kwave