[Pkg-voip-commits] r6761 - in /mumble/trunk/debian: changelog control mumble-doc.docs mumble-doc.examples patches/ patches/amd64-32bit-overlay patches/no-alsa-reread patches/series rules
slicer-guest at alioth.debian.org
slicer-guest at alioth.debian.org
Fri Feb 13 15:55:20 UTC 2009
Author: slicer-guest
Date: Fri Feb 13 15:55:20 2009
New Revision: 6761
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6761
Log:
* Add workaround for threading bug in ALSA.
* Add mumble-doc package, which includes examples and documentation for Ice
interface.
* Add 32-bit overlay library on amd64.
Added:
mumble/trunk/debian/mumble-doc.docs
mumble/trunk/debian/mumble-doc.examples
mumble/trunk/debian/patches/
mumble/trunk/debian/patches/amd64-32bit-overlay
mumble/trunk/debian/patches/no-alsa-reread
mumble/trunk/debian/patches/series
Modified:
mumble/trunk/debian/changelog
mumble/trunk/debian/control
mumble/trunk/debian/rules
Modified: mumble/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/changelog?rev=6761&op=diff
==============================================================================
--- mumble/trunk/debian/changelog (original)
+++ mumble/trunk/debian/changelog Fri Feb 13 15:55:20 2009
@@ -1,3 +1,12 @@
+mumble (1.1.7-2) UNRELEASED; urgency=low
+
+ * Add workaround for threading bug in ALSA.
+ * Add mumble-doc package, which includes examples and documentation for Ice
+ interface.
+ * Add 32-bit overlay library on amd64.
+
+ -- Thorvald Natvig <slicer at users.sourceforge.net> Fri, 13 Feb 2009 14:21:35 +0100
+
mumble (1.1.7-1) unstable; urgency=low
[ Patrick Matthäi ]
Modified: mumble/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/control?rev=6761&op=diff
==============================================================================
--- mumble/trunk/debian/control (original)
+++ mumble/trunk/debian/control Fri Feb 13 15:55:20 2009
@@ -4,7 +4,7 @@
Homepage: http://mumble.sourceforge.net/
Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
Uploaders: Patrick Matthäi <patrick.matthaei at web.de>, Thorvald Natvig <slicer at users.sourceforge.net>
-Build-Depends: debhelper (>= 5.0.51~), po-debconf, libspeechd-dev, libasound2-dev, libboost-dev, libqt4-dev, libqt4-opengl-dev, libspeex-dev, libspeexdsp-dev, libpulse-dev, libssl-dev, libxevie-dev, libzeroc-ice33-dev | libzeroc-ice32-dev | libzeroc-ice-dev , ice33-translators | ice32-translators | ice-translators, libg15daemon-client-dev
+Build-Depends: debhelper (>= 5.0.51~), po-debconf, quilt (>= 0.40), libspeechd-dev, libasound2-dev, libboost-dev, libqt4-dev, libqt4-opengl-dev, libspeex-dev, libspeexdsp-dev, libpulse-dev, libssl-dev, libxevie-dev, libzeroc-ice33-dev | libzeroc-ice32-dev | libzeroc-ice-dev , ice33-translators | ice32-translators | ice-translators, libg15daemon-client-dev, libc6-dev-i386 [amd64], gcc-multilib [amd64]
Standards-Version: 3.8.0
DM-Upload-Allowed: yes
Vcs-Svn: svn://svn.debian.org/pkg-voip/mumble/trunk/
@@ -60,3 +60,16 @@
Murmur (in the package mumble-server) is the VoIP server component for
Mumble. This package contains web scripts for registering users, uploading
custom textures and showing a list of currently connected users.
+
+Package: mumble-doc
+Section: doc
+Architecture: all
+Priority: extra
+Depends: ${misc:Depends}
+Description: Low latency VoIP client and server documentation
+ Mumble is a low-latency, high quality voice chat program for gaming. It
+ features noise suppression, automatic gain control and low latency audio
+ with support for multiple audio standards.
+ .
+ This package contains documentation and examples for the 'mumble',
+ 'mumble-server' and 'mumble-server-web' packages.
Added: mumble/trunk/debian/mumble-doc.docs
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/mumble-doc.docs?rev=6761&op=file
==============================================================================
--- mumble/trunk/debian/mumble-doc.docs (added)
+++ mumble/trunk/debian/mumble-doc.docs Fri Feb 13 15:55:20 2009
@@ -1,0 +1,1 @@
+Ice/
Added: mumble/trunk/debian/mumble-doc.examples
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/mumble-doc.examples?rev=6761&op=file
==============================================================================
--- mumble/trunk/debian/mumble-doc.examples (added)
+++ mumble/trunk/debian/mumble-doc.examples Fri Feb 13 15:55:20 2009
@@ -1,0 +1,2 @@
+scripts/dbusauth.pl
+scripts/icedemo.php
Added: mumble/trunk/debian/patches/amd64-32bit-overlay
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/patches/amd64-32bit-overlay?rev=6761&op=file
==============================================================================
--- mumble/trunk/debian/patches/amd64-32bit-overlay (added)
+++ mumble/trunk/debian/patches/amd64-32bit-overlay Fri Feb 13 15:55:20 2009
@@ -1,0 +1,36 @@
+Index: mumble-1.1.7/overlay_gl/overlay_gl.pro
+===================================================================
+--- mumble-1.1.7.orig/overlay_gl/overlay_gl.pro 2009-01-25 15:51:27.000000000 +0100
++++ mumble-1.1.7/overlay_gl/overlay_gl.pro 2009-02-13 15:55:13.000000000 +0100
+@@ -1,15 +1,16 @@
+-# Simple project file to build Speex with same compilers
++# Simple project file to build overlay with same compilers
+ # as Qt used.
+
+ TEMPLATE = lib
+ CONFIG -= qt
+ CONFIG *= debug_and_release
+-TARGET = mumble
++TARGET = mumble$(TARGET_ADD)
+ VERSION = 1.1.7
+ SOURCES = overlay.c
+ LIBS *= -lrt -ldl
+-QMAKE_CFLAGS *= -fvisibility=hidden
++QMAKE_CFLAGS *= -fvisibility=hidden $(CFLAGS_ADD)
+ QMAKE_LFLAGS -= -Wl,--no-undefined
++QMAKE_LFLAGS *= $(LFLAGS_ADD)
+ equals(QMAKE_LINK,g++) {
+ message(Overriding linker)
+ QMAKE_LINK = gcc
+@@ -17,9 +18,9 @@
+ }
+
+ CONFIG(debug, debug|release) {
+- DESTDIR = ../debug
++ DESTDIR = ../debug$(DESTDIR_ADD)
+ }
+
+ CONFIG(release, debug|release) {
+- DESTDIR = ../release
++ DESTDIR = ../release$(DESTDIR_ADD)
+ }
Added: mumble/trunk/debian/patches/no-alsa-reread
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/patches/no-alsa-reread?rev=6761&op=file
==============================================================================
--- mumble/trunk/debian/patches/no-alsa-reread (added)
+++ mumble/trunk/debian/patches/no-alsa-reread Fri Feb 13 15:55:20 2009
@@ -1,0 +1,30 @@
+Index: mumble-1.1.7/src/mumble/ALSAAudio.cpp
+===================================================================
+--- mumble-1.1.7.orig/src/mumble/ALSAAudio.cpp 2009-02-13 14:02:05.000000000 +0100
++++ mumble-1.1.7/src/mumble/ALSAAudio.cpp 2009-02-13 14:02:16.000000000 +0100
+@@ -112,12 +112,6 @@
+ const QList<audioDevice> ALSAAudioInputRegistrar::getDeviceChoices() {
+ QList<audioDevice> qlReturn;
+
+- // Refresh the list of cards each time it is requested
+- if (cards) {
+- delete cards;
+- cards = new ALSAEnumerator();
+- }
+-
+ QStringList qlInputDevs = cards->qhInput.keys();
+ qSort(qlInputDevs);
+
+@@ -152,12 +146,6 @@
+ const QList<audioDevice> ALSAAudioOutputRegistrar::getDeviceChoices() {
+ QList<audioDevice> qlReturn;
+
+- // Refresh the list of cards each time it is requested
+- if (cards) {
+- delete cards;
+- cards = new ALSAEnumerator();
+- }
+-
+ QStringList qlOutputDevs = cards->qhOutput.keys();
+ qSort(qlOutputDevs);
+
Added: mumble/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/patches/series?rev=6761&op=file
==============================================================================
--- mumble/trunk/debian/patches/series (added)
+++ mumble/trunk/debian/patches/series Fri Feb 13 15:55:20 2009
@@ -1,0 +1,2 @@
+no-alsa-reread
+amd64-32bit-overlay
Modified: mumble/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/rules?rev=6761&op=diff
==============================================================================
--- mumble/trunk/debian/rules (original)
+++ mumble/trunk/debian/rules Fri Feb 13 15:55:20 2009
@@ -3,10 +3,13 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+include /usr/share/quilt/quilt.make
+
export DH_OPTIONS
configure: configure-stamp
-configure-stamp:
+configure-stamp: $(QUILT_STAMPFN)
+ echo $(DEB_BUILD_ARCH)
dh_testdir
qmake-qt4 main.pro \
CONFIG*=release \
@@ -19,22 +22,32 @@
DEFINES*=HAVE_ENDIAN_H
touch configure-stamp
-build: build-arch
+build: build-arch build-indep
build-arch: build-arch-stamp
build-arch-stamp: configure-stamp
- $(MAKE) release
+ $(MAKE)
+ifeq ($(DEB_BUILD_ARCH), amd64)
+ (cd overlay_gl && touch overlay.c && $(MAKE) clean && $(MAKE) DESTDIR_ADD=-32 CFLAGS_ADD=-m32 LFLAGS_ADD=-m32 && $(MAKE) clean)
+endif
touch $@
-clean:
+build-indep: build-indep-stamp
+
+build-indep-stamp:
+ slice2html src/murmur/Murmur.ice --output-dir Ice
+ touch $@
+
+clean: unpatch
dh_testdir
dh_testroot
- rm -f build-arch-stamp configure-stamp
+ rm -f build-arch-stamp build-indep-stamp configure-stamp
[ ! -f Makefile ] || $(MAKE) distclean
# Remove files from previous builds.
+ [ ! -d gendoc ] || rm -rf Ice
rm -rf release debug
- rm -f src/mumble/*.qm
+ [ ! -d release-32 ] || rm -rf release-32
rm -f $(CURDIR)/debian/mumble-server.logrotate $(CURDIR)/mumble-server.init
debconf-updatepo
dh_clean
@@ -67,6 +80,10 @@
install -m 0644 -D ./icons/mumble.64x64.png $(CURDIR)/debian/mumble/usr/share/icons/hicolor/apps/64x64/mumble.png
install -m 0644 -D ./scripts/murmur.conf $(CURDIR)/debian/mumble-server/etc/dbus-1/system.d/mumble-server.conf
install -m 0644 -D ./scripts/murmur.ini.system $(CURDIR)/debian/mumble-server/etc/mumble-server.ini
+ifeq ($(DEB_BUILD_ARCH), amd64)
+ install -m 0755 -d $(CURDIR)/debian/mumble/usr/lib32/mumble
+ cp -dp ./release-32/libmumble.so* $(CURDIR)/debian/mumble/usr/lib32/mumble/
+endif
binary-common:
dh_testdir
@@ -88,12 +105,12 @@
dh_fixperms
dh_perl $(CURDIR)/debian/mumble-server-web/usr/lib/cgi-bin/mumble-server
dh_installdeb
- dh_shlibdeps -- -xglibc-private
+ dh_shlibdeps -Xlib32/mumble/ -- -xglibc-private
dh_gencontrol
dh_md5sums
dh_builddeb
-binary-indep: install-indep
+binary-indep: build-indep install-indep
$(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
binary-arch: build-arch install-arch
More information about the Pkg-voip-commits
mailing list