[SCM] calf/master: Use linux-any wildcard for libasound dependency.

js at users.alioth.debian.org js at users.alioth.debian.org
Thu Apr 5 08:30:31 UTC 2012


The following commit has been merged in the master branch:
commit 2cc3098db5260c149ab022140ea8ff7ba3bc18ff
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Thu Apr 5 10:22:02 2012 +0200

    Use linux-any wildcard for libasound dependency.

diff --git a/debian/pkgarchs.sh b/debian/pkgarchs.sh
deleted file mode 100644
index 33f2758..0000000
--- a/debian/pkgarchs.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/sh
-#
-# Copyright © 2008 Jonas Smedegaard <dr at jones.dk>
-# Description: Resolves supported archs of a Debian package
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-#
-# Depends: devscripts
-
-set -e
-
-defaultsuite="unstable"
-currentsuite="`dpkg-parsechangelog | grep ^Distribution: | awk '{print $2}'`"
-
-pkg="$1"
-suite="${2:-$currentsuite}"
-
-case "$suite" in
-    UNRELEASED|"")
-	echo >&2 "WARNING: bad suite \"$suite\", using \"$defaultsuite\" instead."
-	suite="$defaultsuite"
-	;;
-esac
-
-echo >&2 "INFO: Resolving architectures for package \"$pkg\" through rmadison Internet request."
-rmadison -s "$suite" "$pkg" \
-	| awk -F'|' '{ print $4 }' \
-	| sed 's/ //g;s/,/\n/g' \
-	| LANG=C sort \
-	| tr '\n' ' ' \
-	| sed 's/ $/\n/'
diff --git a/debian/rules b/debian/rules
index 768979b..8e86165 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,15 +47,7 @@ clean::
 	rm -f debian/stamp-upstreamtmpstuff
 
 # Needed by upstream build process
-#  * ALSA is optional upstream and only available on some archs
-#    (potentially varying, so we resolve list in maintainer builds)
 #  * libjack-dev 0.105 recommended (better MIDI) but not required
-alsa_archs := $(if $(DEB_MAINTAINER_MODE),$(shell sh debian/pkgarchs.sh libasound2-dev))
 CDBS_BUILD_DEPENDS += , libglib2.0-dev, libgtk2.0-dev (>= 2.8), libreadline-dev, libexpat1-dev
-CDBS_BUILD_DEPENDS += , libasound2-dev [$(alsa_archs)]
+CDBS_BUILD_DEPENDS += , libasound2-dev [linux-any]
 CDBS_BUILD_DEPENDS += , ladspa-sdk, dssi-dev, libjack-dev (>= 0.103.0), lv2core
-
-# Needed for our packaging
-#  * devscript needed by pkgarchs.sh (only really needed for maintainer
-#    builds, but adding always as it won't hurt and avoids confusion)
-CDBS_BUILD_DEPENDS += , devscripts

-- 
calf audio plugins packaging



More information about the pkg-multimedia-commits mailing list