[SCM] mpg123/master: Remove dummy packages mpg123-oss-3dnow, mpg123-oss-i486.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 124db8630085122bfc5b0f9d280774a1d7e63ab9
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Mar 27 21:07:59 2012 +0200

    Remove dummy packages mpg123-oss-3dnow, mpg123-oss-i486.

diff --git a/debian/control b/debian/control
index da60efc..834f23f 100644
--- a/debian/control
+++ b/debian/control
@@ -90,43 +90,3 @@ Description: MPEG layer 1/2/3 audio decoder -- development files
  .
  This package contains the C development headers and library files needed to
  compile programs using the mpg123 library.
-
-Package: mpg123-oss-i486
-Architecture: i386 kfreebsd-i386
-Depends:
- mpg123 (>= 1.4.3-1),
- oss-compat,
- ${misc:Depends}
-Provides:
- mp3-decoder,
- mpg123
-Conflicts:
- mpg123 (<< 0.59r-2)
-Description: MPEG layer 1/2/3 audio player for i486 machines - 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.
- .
- This package used to contain an executable specially optimized for i486
- processors, but nowadays just depends on the generic package mpg123. It is
- an empty dummy package to facilitate upgrades and can be safely removed.
-
-Package: mpg123-oss-3dnow
-Architecture: i386
-Depends:
- mpg123 (>= 0.61-1),
- ${misc:Depends}
-Description: MPEG layer 1/2/3 audio player for 3DNow! machines - 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.
- .
- An mpg123 optimised for the 3DNow! command set nowadays is part of the main
- package mpg123. This is an empty dummy package to facilitate upgrades and
- can be safely removed.
diff --git a/debian/rules b/debian/rules
index 98d1029..337b3f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,10 +9,6 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 WRAPPER_TARGETS:=mpg123-oss mpg123-nas
 
-ifeq ($(ARCH),i486)
-WRAPPER_TARGETS += mpg123-oss-i486
-endif
-
 ifeq ($(OS),linux)
 WRAPPER_TARGETS += mpg123-alsa
 endif
@@ -29,19 +25,6 @@ LIB_PKGSTR:=-p$(LIB_PKG) -p$(DEV_PKG)
 ARCH_PKGSTR=-pmpg123
 ALL_PKGSTR=$(LIB_PKGSTR) $(ARCH_PKGSTR)
 
-DUMMY_PKGSTR=
-ifeq ($(OS),linux)
-ifeq ($(ARCH),i486)
-DUMMY_PKGSTR += -pmpg123-oss-3dnow -pmpg123-oss-i486
-endif
-else
-ifeq ($(OS),kfreebsd)
-ifeq ($(ARCH),i486)
-DUMMY_PKGSTR += -pmpg123-oss-i486
-endif
-endif
-endif
-
 CFLAGS = 
 LDFLAGS =
 

-- 
mpg123 packaging