[SCM] libshout/master: Stop pre-depend on multiarch. Closes: Bug#870425, #870515. Thanks to Jörg-Volker Peetz and Aurelien Jarno.

js at users.alioth.debian.org js at users.alioth.debian.org
Tue Aug 29 11:14:27 UTC 2017


The following commit has been merged in the master branch:
commit 7d6c4b3e850071e51787ad34d957c9a7b868220a
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Aug 29 11:05:41 2017 +0200

    Stop pre-depend on multiarch. Closes: Bug#870425, #870515. Thanks to Jörg-Volker Peetz and Aurelien Jarno.

diff --git a/debian/control.in b/debian/control.in
index 798206a..5e14a71 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -40,8 +40,7 @@ Package: libshout3
 Section: libs
 Architecture: any
 Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends},
- ${cdbs:Pre-Depends}
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
  ${misc:Depends}
 Description: MP3/Ogg Vorbis broadcast streaming library
diff --git a/debian/rules b/debian/rules
index 20f791d..a1031eb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,9 +43,6 @@ deps-pkg +=, d-shlibs (>= 0.48)
 
 CDBS_BUILD_DEPENDS +=, $(deps), $(deps-pkg)
 
-# Multiarch quirk (see also other uses of that variable in this file)
-CDBS_PREDEPENDS_$(libpkg) = $(if $(DEB_HOST_MULTIARCH),multiarch-support)
-
 DEB_UPSTREAM_PACKAGE = $(srcpkg)
 DEB_UPSTREAM_URL = http://downloads.us.xiph.org/releases/$(srcpkg)
 DEB_UPSTREAM_TARBALL_MD5 = 11765b2592e7ea623ccd93d3f8df172c

-- 
libshout packaging



More information about the pkg-multimedia-commits mailing list