Package: xfce4-mixer
Severity: important
Version: 4.3.99.2-1
Tags: patch
Hi,
the current version fails to build on GNU/kFreeBSD.
It needs updated debian packaging, see attached patch.
It would be nice if it could be included in the next upload.
Thanks in advance.
Petr
diff -u xfce4-mixer-4.3.99.2/debian/control xfce4-mixer-4.3.99.2/debian/control
--- xfce4-mixer-4.3.99.2/debian/control
+++ xfce4-mixer-4.3.99.2/debian/control
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Debian Xfce Maintainers <pkg-xfce-devel@lists.alioth.debian.org>
Uploaders: Martin Loschwitz <[EMAIL PROTECTED]>, Emanuele Rocca <[EMAIL
PROTECTED]>, Simon Huggins <[EMAIL PROTECTED]>, Yves-Alexis Perez <[EMAIL
PROTECTED]>
-Build-Depends: debhelper (>= 4.2.1-1), libgtk2.0-dev, libxft-dev,
xfce4-panel-dev (>= 4.3.99.2), libasound2-dev (>= 0.9.0), libxml-parser-perl,
chrpath, quilt
+Build-Depends: debhelper (>= 4.2.1-1), libgtk2.0-dev, libxft-dev,
xfce4-panel-dev (>= 4.3.99.2), libasound2-dev (>= 0.9.0) [!kfreebsd-i386
!kfreebsd-amd64 !hurd-i386], libxml-parser-perl, chrpath, quilt
Standards-Version: 3.7.2
Package: xfce4-mixer
@@ -18,7 +18,7 @@
Homepage: http://www.xfce.org/
Package: xfce4-mixer-alsa
-Architecture: any
+Architecture: linux-any
Depends: ${shlibs:Depends}
Recommends: xfce4-mixer (= ${Source-Version})
Replaces: xfce4-mixer-oss
diff -u xfce4-mixer-4.3.99.2/debian/rules xfce4-mixer-4.3.99.2/debian/rules
--- xfce4-mixer-4.3.99.2/debian/rules
+++ xfce4-mixer-4.3.99.2/debian/rules
@@ -2,6 +2,7 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
CFLAGS = -Wall -g
@@ -11,6 +12,13 @@
CFLAGS += -O2
endif
+
+ifeq (linux,$(DEB_HOST_ARCH_OS))
+VARIANTS=oss alsa
+else
+VARIANTS=oss
+endif
+
patch: patch-stamp
patch-stamp:
dh_testdir
@@ -27,7 +35,7 @@
dh_testdir
#configure the two variants:
- for variant in alsa oss; do \
+ for variant in $(VARIANTS); do \
mkdir $(CURDIR)/debian/build-$$variant && \
cd $(CURDIR)/debian/build-$$variant && \
$(CURDIR)/configure --host=$(DEB_HOST_GNU_TYPE)
--build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man
--enable-final --libexecdir=\$${prefix}/lib --with-sound=$$variant;\
@@ -41,12 +49,12 @@
dh_testdir
#build the two variants:
- for variant in alsa oss;do \
+ for variant in $(VARIANTS);do \
cd $(CURDIR)/debian/build-$$variant/lib && $(MAKE);\
done
- #make the mixer from alsa variant
- cd $(CURDIR)/debian/build-alsa && $(MAKE)
+ #make the mixer from oss variant
+ cd $(CURDIR)/debian/build-oss && $(MAKE)
touch build-stamp
@@ -56,7 +64,7 @@
dh_testroot
rm -f build-stamp
- for variant in alsa oss;do \
+ for variant in $(VARIANTS);do \
rm -rf $(CURDIR)/debian/build-$$variant;\
done
@@ -79,13 +87,13 @@
dh_installdirs
#install the two variants:
- for variant in alsa oss;do \
+ for variant in $(VARIANTS);do \
cd $(CURDIR)/debian/build-$$variant/lib && \
$(MAKE) install DESTDIR=$(CURDIR)/debian/xfce4-mixer-$$variant;\
done
- #install common mixer from alsa variant
- cd $(CURDIR)/debian/build-alsa &&\
+ #install common mixer from oss variant
+ cd $(CURDIR)/debian/build-oss &&\
$(MAKE) install DESTDIR=$(CURDIR)/debian/xfce4-mixer
#and remove libs presents in alsa/oss variants:
rm -f $(CURDIR)/debian/xfce4-mixer/usr/lib/xfce4/modules/libxfce4mixer.*
@@ -128,10 +136,10 @@
dh_installdeb
dh_shlibdeps -l$(CURDIR)/debian/xfce4-mixer/usr/lib/xfce4/modules/
- dh_gencontrol
+ dh_gencontrol -s
- dh_md5sums
- dh_builddeb
+ dh_md5sums -s
+ dh_builddeb -s
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install
