[SCM] mpg123/master: Drop the esd output plugin.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 42fa471866404d116caa261c040965665dac9019
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Mar 27 12:15:40 2012 +0200

    Drop the esd output plugin.
    
    Closes: #646390

diff --git a/debian/control b/debian/control
index a0cd344..9da7a6a 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,6 @@ Build-Depends:
  debhelper (>> 5),
  libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
  libaudio-dev,
- libesd0-dev,
  libjack-dev,
  libltdl-dev,
  libpulse-dev [!hurd-i386],
@@ -128,26 +127,6 @@ Description: MPEG layer 1/2/3 audio player for 3DNow! machines - dummy package
  package mpg123. This is an empty dummy package to facilitate upgrades and
  can be safely removed.
 
-Package: mpg123-esd
-Architecture: any
-Depends:
- mpg123 (>= 1.4.3-1),
- ${esdplugin:Recommends},
- ${misc:Depends}
-Suggests:
- esound
-Description: MPEG layer 1/2/3 audio player with Esound support - dummy package
- Mpg123 is a fast and portable MPEG audio player for Unix.  It supports
- MPEG 1.0/2.0 layers 1, 2 and 3 (those famous "mp3" files).
- .
- For full CD quality playback (44 kHz, 16 bit, stereo) a Pentium,
- SPARCstation10, DEC Alpha or similar CPU is required.  Mono and/or reduced
- quality playback (22 kHz or 11 kHz) is even possible on 486 CPUs.
- .
- The main mpg123 nowadays already contains an esd output plugin by default.
- This is an empty dummy package to facilitate upgrades. It can be safely
- removed afterwards.
-
 Package: mpg123-nas
 Architecture: any
 Depends:
diff --git a/debian/mpg123.install b/debian/mpg123.install
index 33fa6ca..e09724b 100644
--- a/debian/mpg123.install
+++ b/debian/mpg123.install
@@ -1,4 +1,3 @@
-
 debian/tmp/usr/bin/*
 debian/tmp/usr/lib/mpg123/*.la
 debian/tmp/usr/lib/mpg123/*.so
diff --git a/debian/rules b/debian/rules
index 39226d2..1c3c143 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ ARCH:=$(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
 OS:=$(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 CPU:=$(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 
-WRAPPER_TARGETS:=mpg123-oss mpg123-esd mpg123-nas
+WRAPPER_TARGETS:=mpg123-oss mpg123-nas
 
 ifeq ($(ARCH),i486)
 WRAPPER_TARGETS += mpg123-oss-i486
@@ -28,7 +28,7 @@ LIB_PKGSTR:=-p$(LIB_PKG) -p$(DEV_PKG)
 ARCH_PKGSTR=-pmpg123
 ALL_PKGSTR=$(LIB_PKGSTR) $(ARCH_PKGSTR)
 
-DUMMY_PKGSTR=-pmpg123-esd -pmpg123-nas
+DUMMY_PKGSTR=-pmpg123-nas
 ifeq ($(OS),linux)
 DUMMY_PKGSTR += -pmpg123-alsa
 ifeq ($(ARCH),i486)
@@ -145,16 +145,6 @@ clean:
 		fi; \
 	fi
 
-	# Cleanup after autoreconf
-	-rm -f "$(CURDIR)"/Makefile.in \
-	       "$(CURDIR)"/aclocal.m4 \
-	       "$(CURDIR)"/configure \
-	       "$(CURDIR)"/doc/Makefile.in \
-	       "$(CURDIR)"/src/Makefile.in \
-	       "$(CURDIR)"/src/config.h.in \
-	       "$(CURDIR)"/src/libmpg123/Makefile.in \
-	       "$(CURDIR)"/src/output/Makefile.in
-
 	dh_clean
 
 binary-indep: build
@@ -180,7 +170,7 @@ install: build
 	dh_installdeb $(ALL_PKGSTR)
 	dh_shlibdeps $(ALL_PKGSTR) -Xdebian/mpg123/usr/lib/mpg123/ -- \
 		-dSuggests `find debian/mpg123/usr/lib/mpg123/ -name "output_*.so" -type f` -dDepends
-	for n in alsa dummy esd nas oss; do \
+	for n in alsa dummy nas oss; do \
 		i="debian/mpg123/usr/lib/mpg123/output_$$n.so"; \
 		test -e "$$i" || continue; \
 		dh_shlibdeps $(ARCH_PKGSTR) $(DUMMY_PKGSTR) -Xdebian/mpg123/usr/lib/mpg123 debian/mpg123 -- -p"$$n"plugin -dRecommends "$$i" -dDepends; \

-- 
mpg123 packaging