[SCM] mpg123/master: Remove override_dh_shlibdeps.

[micove-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9e9055e9a24631b2b115cde6f5ae8132c9f20c00
Author: Miguel A. Colón Vélez <debian.micove at gmail.com>
Date:   Thu Aug 6 17:41:32 2015 -0400

    Remove override_dh_shlibdeps.
    
    This is done by debhelper and it's less error prone. It was skipping the
    pulseaudio dependencies since it was never updated. The code basically
    moved all the dependencies to Recommends.

diff --git a/debian/alt_deps.py b/debian/alt_deps.py
deleted file mode 100644
index 6b1b66a..0000000
--- a/debian/alt_deps.py
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/usr/bin/env python
-#
-# <alt_deps.py>
-#
-# Fold several dependency entries in a <substvars> file into a single
-# alternative dependency.
-
-import os
-import sys
-
-def mangle(substvars, keyfilter, initdeps):
-	def __str2list(kv):
-		kv[1] = map(lambda x: x.strip(), kv[1].split(','))
-		return kv[0], list(kv[1])
-
-	substvars=map(lambda x: x.split('=', 1), substvars)
-	substvars=map(__str2list, substvars)
-
-	initdeps=map(lambda x: x.split('=', 1), initdeps)
-	initdeps=dict(map(__str2list, initdeps))
-	
-	deps=dict(filter(lambda x: x[0] in keyfilter, substvars))
-
-	for k,v in initdeps.iteritems():
-		deps[k] = deps.get(k, []) + v
-
-	def __combine(a, b):
-		if len(b) == 0:
-			return [ [ x ] for x in a ]
-		return [ y + [ x ] for x in a for y in b ]
-
-	def __normalise(ll):
-		ret = []
-		for i in ll:
-			ret = __combine(i, ret)
-		return ret
-
-	# This is deps.values(), essentially, but preserves ordering of
-	# dependencies as given in keyfilter.
-	deplist = [ deps.get(k) for k in keyfilter ]
-	deplist = filter(lambda x: x is not None, deplist)
-
-	return ", ".join(map(lambda x: " | ".join(x), __normalise(deplist)))
-
-def usage():
-	print "Usage: alt_deps.py <substvars> <newkey> <altdeps> " + \
-	      "[ <adddeps> ...]"
-	print " Fold several dependency entries in a <substvars> file into a"
-	print " single alternative dependency.  The <substvars> is updated"
-	print " with a properly normalised new dependency entry."
-	print "  <substvars>  Name of substvars file to modify"
-	print "  <newkey>     Name of new dependency key"
-	print "  <altdeps>    Names of keys in <substvars> to fold into single alternative"
-	print "  <adddeps>    Additional dependencies in substvars format"
-
-def handle_sysexception(e):
-	if e.filename is None:
-		print e.strerror
-	else:
-		print ": ".join((e.filename, e.strerror))
-	sys.exit(1)
-
-if __name__ == "__main__":
-	if len(sys.argv) < 4:
-		usage()
-		sys.exit(1)
-	try:
-		fd = open(sys.argv[1], 'r+')
-	except EnvironmentError, e:
-		handle_sysexception(e)
-
-	newkey = sys.argv[2]
-	keyfilter = sys.argv[3].split()
-	try:
-		initdeps = sys.argv[4:]
-	except:
-		initdeps = []
-
-	substvars = fd.readlines()
-	newdep = mangle(substvars, keyfilter, initdeps)
-	substvars = filter(lambda x: not x.startswith(newkey + '='), substvars)
-	substvars.append("=".join((newkey, newdep)) + '\n')
-
-	try:
-		fd.seek(0, os.SEEK_SET)
-		fd.truncate()
-		fd.writelines(substvars)
-		fd.close()
-	except EnvironmentError, e:
-		handle_sysexception(e)
-
-	sys.exit(0)
diff --git a/debian/control b/debian/control
index 375237d..6d11ad1 100644
--- a/debian/control
+++ b/debian/control
@@ -27,14 +27,11 @@ Architecture: any
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
-Recommends:
- ${plugin:Recommends},
- ${shlibs:Recommends}
 Suggests:
  alsa-utils [linux-any],
  jackd,
  nas,
- oss-compat,
+ oss-compat [linux-any],
  oss4-base [linux-any],
  pulseaudio
 Provides:
diff --git a/debian/rules b/debian/rules
index b68b3dc..eaaec7d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -75,17 +75,3 @@ override_dh_installchangelogs:
 override_dh_makeshlibs:
 	dh_makeshlibs $(LIB_PKGSTR) -V "$(LIB_PKG) (>= 1.15.1)"
 
-override_dh_shlibdeps:
-	dh_shlibdeps $(ALL_PKGSTR) -Xdebian/mpg123/usr/lib/$(DEB_HOST_MULTIARCH)/mpg123/ -- \
-		-dSuggests `find debian/mpg123/usr/lib/$(DEB_HOST_MULTIARCH)/mpg123/ -name "output_*.so" -type f` -dDepends
-	for n in alsa nas jack dummy openal oss portaudio; do \
-		i="debian/mpg123/usr/lib/$(DEB_HOST_MULTIARCH)/mpg123/output_$$n.so"; \
-		test -e "$$i" || continue; \
-		dh_shlibdeps $(ARCH_PKGSTR) -Xdebian/mpg123/usr/lib/$(DEB_HOST_MULTIARCH)/mpg123 debian/mpg123 -- -p"$$n"plugin -dRecommends "$$i" -dDepends; \
-	done
-	chmod +x "$(CURDIR)/debian/alt_deps.py"
-	"$(CURDIR)/debian/alt_deps.py" "$(CURDIR)/debian/mpg123.substvars" \
-	  plugin:Recommends \
-	  "alsaplugin:Recommends ossplugin:Recommends dummyplugin:Recommends jackplugin:Recommends openalplugin:Recommends portaudioplugin:Recommends" \
-	  "ossplugin:Recommends=oss-compat | oss4-base"
-	dh_shlibdeps --remaining-packages

-- 
mpg123 packaging