r22222 - in /desktop/unstable/esound/debian: changelog control control.in libesd-alsa0.install rules
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Tue Nov 3 19:38:01 UTC 2009
Author: joss
Date: Tue Nov 3 19:38:00 2009
New Revision: 22222
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22222
Log:
* Remove libesd-alsa0. Only build one package, libesd0. On Linux it
uses ALSA unconditionally, we don’t support OSS anymore.
Closes: #553182.
* Make esound-common conflict against libesd-alsa0 so that it gets
removed from user systems.
* Simplify the build process accordingly.
Removed:
desktop/unstable/esound/debian/libesd-alsa0.install
Modified:
desktop/unstable/esound/debian/changelog
desktop/unstable/esound/debian/control
desktop/unstable/esound/debian/control.in
desktop/unstable/esound/debian/rules
Modified: desktop/unstable/esound/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/esound/debian/changelog?rev=22222&op=diff
==============================================================================
--- desktop/unstable/esound/debian/changelog [utf-8] (original)
+++ desktop/unstable/esound/debian/changelog [utf-8] Tue Nov 3 19:38:00 2009
@@ -1,3 +1,14 @@
+esound (0.2.41-6) unstable; urgency=low
+
+ * Remove libesd-alsa0. Only build one package, libesd0. On Linux it
+ uses ALSA unconditionally, we don’t support OSS anymore.
+ Closes: #553182.
+ * Make esound-common conflict against libesd-alsa0 so that it gets
+ removed from user systems.
+ * Simplify the build process accordingly.
+
+ -- Josselin Mouette <joss at debian.org> Tue, 03 Nov 2009 20:32:35 +0100
+
esound (0.2.41-5) unstable; urgency=low
* Fix FTBFS on kfreebsd. Closes: #532092.
Modified: desktop/unstable/esound/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/esound/debian/control?rev=22222&op=diff
==============================================================================
--- desktop/unstable/esound/debian/control [utf-8] (original)
+++ desktop/unstable/esound/debian/control [utf-8] Tue Nov 3 19:38:00 2009
@@ -18,14 +18,14 @@
Package: esound
Architecture: any
-Depends: ${shlibs:Depends}, esound-common (>= ${source:Version})
+Depends: ${shlibs:Depends}, esound-common (= ${source:Version})
Description: Enlightened Sound Daemon - Support binaries
This program is designed to mix together several digitized
audio streams for playback by a single device.
Package: esound-clients
Architecture: any
-Depends: ${shlibs:Depends}, esound-common (>= ${source:Version})
+Depends: ${shlibs:Depends}, esound-common (= ${source:Version})
Conflicts: libesd0 (<< 0.2.40-1), libesd-alsa0 (<< 0.2.40-1)
Description: Enlightened Sound Daemon - clients
Utilities that control and interact with the Enlightened Sound Daemon.
@@ -33,6 +33,7 @@
Package: esound-common
Architecture: all
Recommends: esound-clients
+Conflicts: libesd-alsa0
Description: Enlightened Sound Daemon - Common files
This program is designed to mix together several digitized
audio streams for playback by a single device.
@@ -42,38 +43,24 @@
Package: libesd0
Architecture: any
Section: libs
-Depends: ${shlibs:Depends}, esound-common (>= ${source:Version})
+Depends: ${shlibs:Depends}, esound-common (= ${source:Version})
Suggests: esound-clients, esound
-Conflicts: esound-clients (<< 0.2.36-1)
+Conflicts: esound-clients (<< 0.2.36-1), libesd-alsa0
Description: Enlightened Sound Daemon - Shared libraries
This program is designed to mix together several digitized
audio streams for playback by a single device.
.
- This package is for use with OSS sound drivers.
+ This package contains the shared library.
Package: libesd0-dev
Architecture: any
Section: libdevel
-Depends: libesd0 (= ${binary:Version}) | libesd-alsa0 (= ${binary:Version}),
+Depends: libesd0 (= ${binary:Version}),
libaudiofile-dev (>= 0.1.5),
- esound-common (>= ${source:Version})
+ esound-common (= ${source:Version})
Description: Enlightened Sound Daemon - Development files
This program is designed to mix together several digitized
audio streams for playback by a single device.
.
This package contains the header files needed to compile applications that
use libesd0.
-
-Package: libesd-alsa0
-Architecture: alpha amd64 arm armeb armel hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc
-Section: libs
-Depends: ${shlibs:Depends}, esound-common (>= ${source:Version})
-Suggests: esound, esound-clients
-Priority: extra
-Conflicts: libesd0, esound-clients (<< 0.2.36-1)
-Provides: libesd0
-Description: Enlightened Sound Daemon (ALSA) - Shared libraries
- This program is designed to mix together several digitized
- audio streams for playback by a single device.
- .
- This package is for use with ALSA sound drivers.
Modified: desktop/unstable/esound/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/esound/debian/control.in?rev=22222&op=diff
==============================================================================
--- desktop/unstable/esound/debian/control.in [utf-8] (original)
+++ desktop/unstable/esound/debian/control.in [utf-8] Tue Nov 3 19:38:00 2009
@@ -18,14 +18,14 @@
Package: esound
Architecture: any
-Depends: ${shlibs:Depends}, esound-common (>= ${source:Version})
+Depends: ${shlibs:Depends}, esound-common (= ${source:Version})
Description: Enlightened Sound Daemon - Support binaries
This program is designed to mix together several digitized
audio streams for playback by a single device.
Package: esound-clients
Architecture: any
-Depends: ${shlibs:Depends}, esound-common (>= ${source:Version})
+Depends: ${shlibs:Depends}, esound-common (= ${source:Version})
Conflicts: libesd0 (<< 0.2.40-1), libesd-alsa0 (<< 0.2.40-1)
Description: Enlightened Sound Daemon - clients
Utilities that control and interact with the Enlightened Sound Daemon.
@@ -33,6 +33,7 @@
Package: esound-common
Architecture: all
Recommends: esound-clients
+Conflicts: libesd-alsa0
Description: Enlightened Sound Daemon - Common files
This program is designed to mix together several digitized
audio streams for playback by a single device.
@@ -42,38 +43,24 @@
Package: libesd0
Architecture: any
Section: libs
-Depends: ${shlibs:Depends}, esound-common (>= ${source:Version})
+Depends: ${shlibs:Depends}, esound-common (= ${source:Version})
Suggests: esound-clients, esound
-Conflicts: esound-clients (<< 0.2.36-1)
+Conflicts: esound-clients (<< 0.2.36-1), libesd-alsa0
Description: Enlightened Sound Daemon - Shared libraries
This program is designed to mix together several digitized
audio streams for playback by a single device.
.
- This package is for use with OSS sound drivers.
+ This package contains the shared library.
Package: libesd0-dev
Architecture: any
Section: libdevel
-Depends: libesd0 (= ${binary:Version}) | libesd-alsa0 (= ${binary:Version}),
+Depends: libesd0 (= ${binary:Version}),
libaudiofile-dev (>= 0.1.5),
- esound-common (>= ${source:Version})
+ esound-common (= ${source:Version})
Description: Enlightened Sound Daemon - Development files
This program is designed to mix together several digitized
audio streams for playback by a single device.
.
This package contains the header files needed to compile applications that
use libesd0.
-
-Package: libesd-alsa0
-Architecture: @ALSA_ARCHES@
-Section: libs
-Depends: ${shlibs:Depends}, esound-common (>= ${source:Version})
-Suggests: esound, esound-clients
-Priority: extra
-Conflicts: libesd0, esound-clients (<< 0.2.36-1)
-Provides: libesd0
-Description: Enlightened Sound Daemon (ALSA) - Shared libraries
- This program is designed to mix together several digitized
- audio streams for playback by a single device.
- .
- This package is for use with ALSA sound drivers.
Modified: desktop/unstable/esound/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/esound/debian/rules?rev=22222&op=diff
==============================================================================
--- desktop/unstable/esound/debian/rules [utf-8] (original)
+++ desktop/unstable/esound/debian/rules [utf-8] Tue Nov 3 19:38:00 2009
@@ -7,42 +7,22 @@
include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
-DEB_BUILDDIR := $(CURDIR)/debian/build-oss
-DEB_DESTDIR := $(CURDIR)/debian/tmp
-DEB_BUILDDIR_libesd-alsa0 := $(CURDIR)/debian/build-alsa
-DEB_DESTDIR_libesd-alsa0 := $(CURDIR)/debian/tmp-alsa
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-ipv6 --with-libwrap
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-ipv6 --with-libwrap
-DEB_CONFIGURE_USER_FLAGS := --enable-oss --disable-alsa
-DEB_CONFIGURE_SYSCONFDIR := /etc/esound
-
-ifeq ($(DEB_BUILD_ARCH),hurd-i386)
- DEB_CONFIGURE_EXTRA_FLAGS += --disable-local-sound
- DEB_DH_MAKESHLIBS_ARGS_ALL := -V "libesd0 (>= 0.2.35)"
-else
- DEB_DH_MAKESHLIBS_ARGS_ALL := -V "libesd-alsa0 (>= 0.2.35) | libesd0 (>= 0.2.35)"
-endif
+DEB_DH_MAKESHLIBS_ARGS_ALL := -V "libesd0 (>= 0.2.35)"
DEB_DH_MAKESHLIBS_ARGS_esound-clients := --no-act
-clean::
- sed -i "s/@ALSA_ARCHES@/$(shell type-handling any linux)/g" debian/control
- rm -fr $(DEB_BUILDDIR) $(DEB_BUILDDIR_libesd-alsa0)
- rm -rf $(DEB_DESTDIR) $(DEB_DESTDIR_libesd-alsa0)
+ifeq ($(DEB_HOST_ARCH_OS),linux)
+ DEB_CONFIGURE_EXTRA_FLAGS += --enable-alsa --disable-oss
+else
+ DEB_CONFIGURE_EXTRA_FLAGS += --enable-oss --disable-alsa
+endif
-configure/libesd-alsa0:: $(DEB_BUILDDIR_libesd-alsa0)/config.status
-$(DEB_BUILDDIR_libesd-alsa0)/config.status:
- cd $(DEB_BUILDDIR_libesd-alsa0) && \
- $(DEB_CONFIGURE_SCRIPT_ENV) $(DEB_CONFIGURE_SCRIPT) \
- $(DEB_CONFIGURE_NORMAL_ARGS) \
- $(cdbs_configure_flags) \
- $(DEB_CONFIGURE_EXTRA_FLAGS) \
- --enable-alsa --disable-oss
+ifeq ($(DEB_HOST_ARCH),hurd-i386)
+ DEB_CONFIGURE_EXTRA_FLAGS += --disable-local-sound
+endif
-build/libesd-alsa0::
- $(MAKE) -C $(DEB_BUILDDIR_libesd-alsa0)
-
-install/libesd-alsa0::
- $(MAKE) -C $(DEB_BUILDDIR_libesd-alsa0) install DESTDIR=$(DEB_DESTDIR_libesd-alsa0)
+DEB_CONFIGURE_SYSCONFDIR := /etc/esound
binary-post-install/%::
if [ $* != esound-common ]; then \
More information about the pkg-gnome-commits
mailing list