[SCM] jack-audio-connection-kit/master: d/jackd1.install: Use dh-exec architecture filtering instead of code in d/rules

mattia at users.alioth.debian.org mattia at users.alioth.debian.org
Wed Nov 8 16:45:56 UTC 2017


The following commit has been merged in the master branch:
commit 7b322c70830e49cbb889a31620b2d061b6eef9df
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Wed Nov 8 16:19:49 2017 +0100

    d/jackd1.install: Use dh-exec architecture filtering instead of code in d/rules
    
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>

diff --git a/debian/control b/debian/control
index da4e732..db3f75e 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Build-Depends: cdbs (>= 0.4.93~),
  debhelper,
  bash-completion,
  d-shlibs,
+ dh-exec,
  doxygen,
  libasound2-dev [linux-any],
  libffado-dev (>= 2.0.0) [linux-any],
diff --git a/debian/jackd1.install b/debian/jackd1.install
old mode 100644
new mode 100755
index 63e79f3..a85d9c1
--- a/debian/jackd1.install
+++ b/debian/jackd1.install
@@ -1,3 +1,4 @@
+#!/usr/bin/dh-exec
 debian/tmp/usr/bin/jack*
 debian/tmp/usr/lib/*/libjackserver.so.*
 debian/tmp/usr/lib/*/jack/inprocess.so
@@ -6,3 +7,10 @@ debian/tmp/usr/lib/*/jack/jack_dummy.so
 debian/tmp/usr/lib/*/jack/jack_net.so
 debian/tmp/usr/lib/*/jack/jack_oss.so
 debian/audio.conf usr/share/jackd
+
+[linux-any] debian/tmp/usr/bin/alsa_in
+[linux-any] debian/tmp/usr/bin/alsa_out
+[linux-any] debian/tmp/usr/lib/*/jack/jack_alsa.so
+[linux-any] debian/tmp/usr/lib/*/jack/jack_alsa_midi.so
+[linux-any] debian/tmp/usr/lib/*/jack/zalsa_in.so
+[linux-any] debian/tmp/usr/lib/*/jack/zalsa_out.so
diff --git a/debian/rules b/debian/rules
index 3482e13..173918c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,4 @@
 #!/usr/bin/make -f
-# rules
-#
-# Robert Jordens <rjo at gmx.de>
-#
-# This software may be used and distributed according to the terms
-# of the GNU General Public License, incorporated herein by reference.
-#
-# $Id: rules 342 2004-03-25 14:00:53Z rj $
-#
 
 DEB_AUTO_UPDATE_LIBTOOL = pre
 DEB_AUTO_UPDATE_AUTOCONF = 2.65
@@ -100,16 +91,6 @@ clean::
 	find -name Makefile.in -exec rm {} +
 	rm -rf m4
 
-ifeq (linux,$(DEB_HOST_ARCH_OS))
-install/jackd1::
-	dh_install -pjackd1 debian/tmp/usr/bin/alsa_in
-	dh_install -pjackd1 debian/tmp/usr/bin/alsa_out
-	dh_install -pjackd1 debian/tmp/usr/lib/*/jack/jack_alsa.so
-	dh_install -pjackd1 debian/tmp/usr/lib/*/jack/jack_alsa_midi.so
-	dh_install -pjackd1 debian/tmp/usr/lib/*/jack/zalsa_in.so
-	dh_install -pjackd1 debian/tmp/usr/lib/*/jack/zalsa_out.so
-endif
-
 # Install bash completion. Drop this line once CDBS supports
 # dh_bash-completion.
 install/jackd1::

-- 
Debian packaging for jack-audio-connection-kit



More information about the pkg-multimedia-commits mailing list