Ron:
Please consider this patch, or a polished version of it makefiles
are not my forte)
It generates, for me, correct packages in both squeeze and
experimental.
Regards,
Gerardo
diff -ruN opus-1.1~beta/debian/changelog opus-1.1~beta+squeeze1/debian/changelog
--- opus-1.1~beta/debian/changelog 2013-11-19 02:42:36.000000000 -0400
+++ opus-1.1~beta+squeeze1/debian/changelog 2013-11-18 23:45:57.919096566 -0400
@@ -1,3 +1,10 @@
+opus (1.1~beta-4+b1) UNRELEASED; urgency=low
+
+ * Binary-only non-maintainer upload for amd64; no source changes.
+ * Support both multiarch and non-multiarch building environments.
+
+ -- Gerardo Esteban Malazdrewicz <gera...@malazdrewicz.com.ar> Mon, 18 Nov 2013 23:45:11 -0400
+
opus (1.1~beta-4) unstable; urgency=low
* Revert bogus NMU.
diff -ruN opus-1.1~beta/debian/control opus-1.1~beta+squeeze1/debian/control
--- opus-1.1~beta/debian/control 2013-11-19 02:42:36.000000000 -0400
+++ opus-1.1~beta+squeeze1/debian/control 1969-12-31 20:00:00.000000000 -0400
@@ -1,81 +0,0 @@
-Source: opus
-Section: sound
-Priority: optional
-Maintainer: Ron Lee <r...@debian.org>
-Build-Depends: debhelper (>= 5), doxygen
-Standards-Version: 3.9.4.0
-Homepage: http://www.opus-codec.org
-Vcs-Git: git://git.debian.org/users/ron/opus.git
-Vcs-Browser: http://git.debian.org/?p=users/ron/opus.git;a=summary
-
-Package: libopus0
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}
-Suggests: opus-tools
-Description: Opus codec runtime library
- The Opus codec is designed for interactive speech and audio transmission over
- the Internet. It is designed by the IETF Codec Working Group and incorporates
- technology from Skype's SILK codec and Xiph.Org's CELT codec.
- .
- It is intended to suit a wide range of interactive audio applications,
- including Voice over IP, videoconferencing, in-game chat, and even remote live
- music performances. It can scale from low bit-rate narrowband speech to very
- high quality stereo music. The current features are:
- .
- Bit-rates from 6 kb/s 510 kb/s
- Sampling rates from 8 to 48 kHz
- Frame sizes from 2.5 ms to 60 ms
- Support for both constant bit-rate (CBR) and variable bit-rate (VBR)
- Audio bandwidth from narrowband to full-band
- Support for speech and music
- Support for mono and stereo
- Support for up to 255 channels (multistream frames)
- Dynamically adjustable bitrate, audio bandwidth, and frame size
- Good loss robustness and packet loss concealment (PLC)
- Floating point and fixed-point implementation
- .
- This package provides the Opus runtime library.
-
-Package: libopus-dev
-Section: libdevel
-Architecture: any
-Depends: libopus0 (= ${binary:Version})
-Description: Opus codec library development files
- The Opus codec is designed for interactive speech and audio transmission over
- the Internet. It is designed by the IETF Codec Working Group and incorporates
- technology from Skype's SILK codec and Xiph.Org's CELT codec.
- .
- It is intended to suit a wide range of interactive audio applications,
- including Voice over IP, videoconferencing, in-game chat, and even remote live
- music performances. It can scale from low bit-rate narrowband speech to very
- high quality stereo music. The current features are:
- .
- Bit-rates from 6 kb/s 510 kb/s
- Sampling rates from 8 to 48 kHz
- Frame sizes from 2.5 ms to 60 ms
- Support for both constant bit-rate (CBR) and variable bit-rate (VBR)
- Audio bandwidth from narrowband to full-band
- Support for speech and music
- Support for mono and stereo
- Support for up to 255 channels (multistream frames)
- Dynamically adjustable bitrate, audio bandwidth, and frame size
- Good loss robustness and packet loss concealment (PLC)
- Floating point and fixed-point implementation
- .
- This package provides the Opus library headers and development files.
-
-Package: libopus-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: libopus0 (= ${binary:Version})
-Description: debugging symbols for libopus
- This package provides the detached debug symbols for libopus.
-
-Package: libopus-doc
-Section: doc
-Architecture: all
-Description: libopus API documentation
- This package contains the developer documentation for libopus.
-
diff -ruN opus-1.1~beta/debian/control.in opus-1.1~beta+squeeze1/debian/control.in
--- opus-1.1~beta/debian/control.in 1969-12-31 20:00:00.000000000 -0400
+++ opus-1.1~beta+squeeze1/debian/control.in 2013-11-18 22:44:13.647962816 -0400
@@ -0,0 +1,81 @@
+Source: opus
+Section: sound
+Priority: optional
+Maintainer: Ron Lee <r...@debian.org>
+Build-Depends: debhelper (>= 5), doxygen
+Standards-Version: 3.9.4.0
+Homepage: http://www.opus-codec.org
+Vcs-Git: git://git.debian.org/users/ron/opus.git
+Vcs-Browser: http://git.debian.org/?p=users/ron/opus.git;a=summary
+
+Package: libopus0
+Section: libs
+Architecture: any
+__MULTIARCH__Depends: ${shlibs:Depends}
+Suggests: opus-tools
+Description: Opus codec runtime library
+ The Opus codec is designed for interactive speech and audio transmission over
+ the Internet. It is designed by the IETF Codec Working Group and incorporates
+ technology from Skype's SILK codec and Xiph.Org's CELT codec.
+ .
+ It is intended to suit a wide range of interactive audio applications,
+ including Voice over IP, videoconferencing, in-game chat, and even remote live
+ music performances. It can scale from low bit-rate narrowband speech to very
+ high quality stereo music. The current features are:
+ .
+ Bit-rates from 6 kb/s 510 kb/s
+ Sampling rates from 8 to 48 kHz
+ Frame sizes from 2.5 ms to 60 ms
+ Support for both constant bit-rate (CBR) and variable bit-rate (VBR)
+ Audio bandwidth from narrowband to full-band
+ Support for speech and music
+ Support for mono and stereo
+ Support for up to 255 channels (multistream frames)
+ Dynamically adjustable bitrate, audio bandwidth, and frame size
+ Good loss robustness and packet loss concealment (PLC)
+ Floating point and fixed-point implementation
+ .
+ This package provides the Opus runtime library.
+
+Package: libopus-dev
+Section: libdevel
+Architecture: any
+Depends: libopus0 (= ${binary:Version})
+Description: Opus codec library development files
+ The Opus codec is designed for interactive speech and audio transmission over
+ the Internet. It is designed by the IETF Codec Working Group and incorporates
+ technology from Skype's SILK codec and Xiph.Org's CELT codec.
+ .
+ It is intended to suit a wide range of interactive audio applications,
+ including Voice over IP, videoconferencing, in-game chat, and even remote live
+ music performances. It can scale from low bit-rate narrowband speech to very
+ high quality stereo music. The current features are:
+ .
+ Bit-rates from 6 kb/s 510 kb/s
+ Sampling rates from 8 to 48 kHz
+ Frame sizes from 2.5 ms to 60 ms
+ Support for both constant bit-rate (CBR) and variable bit-rate (VBR)
+ Audio bandwidth from narrowband to full-band
+ Support for speech and music
+ Support for mono and stereo
+ Support for up to 255 channels (multistream frames)
+ Dynamically adjustable bitrate, audio bandwidth, and frame size
+ Good loss robustness and packet loss concealment (PLC)
+ Floating point and fixed-point implementation
+ .
+ This package provides the Opus library headers and development files.
+
+Package: libopus-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: libopus0 (= ${binary:Version})
+Description: debugging symbols for libopus
+ This package provides the detached debug symbols for libopus.
+
+Package: libopus-doc
+Section: doc
+Architecture: all
+Description: libopus API documentation
+ This package contains the developer documentation for libopus.
+
diff -ruN opus-1.1~beta/debian/libopus0.install opus-1.1~beta+squeeze1/debian/libopus0.install
--- opus-1.1~beta/debian/libopus0.install 2013-11-19 02:42:36.000000000 -0400
+++ opus-1.1~beta+squeeze1/debian/libopus0.install 1969-12-31 20:00:00.000000000 -0400
@@ -1 +0,0 @@
-usr/lib/lib*.so.*
diff -ruN opus-1.1~beta/debian/libopus0.install.in opus-1.1~beta+squeeze1/debian/libopus0.install.in
--- opus-1.1~beta/debian/libopus0.install.in 1969-12-31 20:00:00.000000000 -0400
+++ opus-1.1~beta+squeeze1/debian/libopus0.install.in 2013-11-18 22:35:49.485821294 -0400
@@ -0,0 +1 @@
+usr/lib/__MULTIARCH__lib*.so.*
diff -ruN opus-1.1~beta/debian/libopus-dev.install opus-1.1~beta+squeeze1/debian/libopus-dev.install
--- opus-1.1~beta/debian/libopus-dev.install 2013-11-19 02:42:36.000000000 -0400
+++ opus-1.1~beta+squeeze1/debian/libopus-dev.install 1969-12-31 20:00:00.000000000 -0400
@@ -1,4 +0,0 @@
-usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/opus.pc
diff -ruN opus-1.1~beta/debian/libopus-dev.install.in opus-1.1~beta+squeeze1/debian/libopus-dev.install.in
--- opus-1.1~beta/debian/libopus-dev.install.in 1969-12-31 20:00:00.000000000 -0400
+++ opus-1.1~beta+squeeze1/debian/libopus-dev.install.in 2013-11-18 22:36:51.046566912 -0400
@@ -0,0 +1,4 @@
+usr/include/*
+usr/lib/__MULTIARCH__lib*.a
+usr/lib/__MULTIARCH__lib*.so
+usr/lib/__MULTIARCH__pkgconfig/opus.pc
diff -ruN opus-1.1~beta/debian/rules opus-1.1~beta+squeeze1/debian/rules
--- opus-1.1~beta/debian/rules 2013-11-19 02:42:36.000000000 -0400
+++ opus-1.1~beta+squeeze1/debian/rules 2013-11-19 02:00:06.944337919 -0400
@@ -14,7 +14,14 @@
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+ifneq "$(DEB_HOST_MULTIARCH)" "" # MultiArch is supported
+ MULTIARCH_SUPPORTED = multiarch_supported
+ LIBDIR ?= /usr/lib/$(DEB_HOST_MULTIARCH)
+else
+ MULTIARCH_SUPPORTED = multiarch_not_supported
+ LIBDIR ?= /usr/lib
+endif
HARD_CPPFLAGS = -D_FORTIFY_SOURCE=2
HARD_CFLAGS = -Wformat=2
@@ -65,15 +72,28 @@
$(RM) -r $(objdir)
$(RM) *-stamp
dh_clean
+ $(RM) debian/libopus0.install
+ $(RM) debian/libopus-dev.install
+ $(RM) debian/control
+
+multiarch_supported:
+ sed 's@__MULTIARCH__@*/@g' debian/libopus0.install.in > debian/libopus0.install
+ sed 's@__MULTIARCH__@*/@g' debian/libopus-dev.install.in > debian/libopus-dev.install
+ sed 's@__MULTIARCH__@Multi-Arch: same\nPre-Depends: $$\{misc:Pre-Depends\}\n@g' debian/control.in > debian/control
+
+multiarch_not_supported:
+ sed 's@__MULTIARCH__@@g' debian/libopus0.install.in > debian/libopus0.install
+ sed 's@__MULTIARCH__@@g' debian/libopus-dev.install.in > debian/libopus-dev.install
+ sed 's@__MULTIARCH__@@g' debian/control.in > debian/control
-
-$(objdir)/config.status: configure
+$(objdir)/config.status: configure $(MULTIARCH_SUPPORTED)
dh_testdir
mkdir -p $(objdir)
cd $(objdir) && ../configure --disable-maintainer-mode \
--host=$(DEB_HOST_GNU_TYPE) \
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr \
+ --libdir=$(LIBDIR) \
$(EXTRA_CONFIG_FLAGS) \
CPPFLAGS="$(CPPFLAGS)" \
CFLAGS="$(CFLAGS)" \
