[Pkg-voip-commits] r6851 - in /mumble/trunk/debian: changelog control mumble-server.default patches/ rules

[slicer-guest at alioth.debian.org]

Author: slicer-guest
Date: Wed Mar  4 02:39:43 2009
New Revision: 6851

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6851
Log:
* New upstream release.
* New overlay library doesn't use private ELF symbols anymore.
* Update defaults file to match new init-script options.

Removed:
    mumble/trunk/debian/patches/
Modified:
    mumble/trunk/debian/changelog
    mumble/trunk/debian/control
    mumble/trunk/debian/mumble-server.default
    mumble/trunk/debian/rules

Modified: mumble/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/changelog?rev=6851&op=diff
==============================================================================
--- mumble/trunk/debian/changelog (original)
+++ mumble/trunk/debian/changelog Wed Mar  4 02:39:43 2009
@@ -1,8 +1,14 @@
-mumble (1.1.7-4) UNRELEASED; urgency=low
-
+mumble (1.1.8-1) UNRELEASED; urgency=low
+
+  [ Patrick Matthäi ]
   * Fix override disparity. Set section of mumble-dbg to devel.
 
- -- Patrick Matthäi <patrick.matthaei at web.de>  Tue, 24 Feb 2009 21:17:22 +0200
+  [ Thorvald Natvig ]
+  * New upstream release.
+  * New overlay library doesn't use private ELF symbols anymore.
+  * Update defaults file to match new init-script options.
+
+ -- Thorvald Natvig <slicer at users.sourceforge.net>  Wed, 04 Mar 2009 01:17:58 +0100
 
 mumble (1.1.7-3) unstable; urgency=low
 

Modified: mumble/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/control?rev=6851&op=diff
==============================================================================
--- mumble/trunk/debian/control (original)
+++ mumble/trunk/debian/control Wed Mar  4 02:39:43 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, 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]
+Build-Depends: debhelper (>= 5.0.51~), po-debconf, libogg-dev, 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, libcap2-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/

Modified: mumble/trunk/debian/mumble-server.default
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/mumble-server.default?rev=6851&op=diff
==============================================================================
--- mumble/trunk/debian/mumble-server.default (original)
+++ mumble/trunk/debian/mumble-server.default Wed Mar  4 02:39:43 2009
@@ -1,2 +1,17 @@
 # 0 = don't start, 1 = start
 MURMUR_DAEMON_START=1
+
+# 0 = don't use capabilities, 1 = start process as root and drop to non-privileged user
+# If started as root, mumble will keep the CAP_NET_ADMIN privilege and drop
+# all others. This allows it to set high-priority TOS on outgoing IP packets.
+# MURMUR_USE_CAPABILITIES=1
+
+# 0 = don't allow VoIP thread to assume realtime priority, 1 = allow realtime priority
+# Note that enabling MURMUR_USE_CAPABILITIES will always enable this.
+# MURMUR_LIMIT_RTPRIO=1
+
+# This controls how many file descriptors the murmur process can open.
+# As a rule of thumb, you should have 4 descriptors per virtaul server and
+# one for each client. So 30 servers with 20 clients each would need at
+# least 720 descriptors (30 * 4 + 30 * 20).
+# MURMUR_LIMIT_NOFILE=65536

Modified: mumble/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/mumble/trunk/debian/rules?rev=6851&op=diff
==============================================================================
--- mumble/trunk/debian/rules (original)
+++ mumble/trunk/debian/rules Wed Mar  4 02:39:43 2009
@@ -3,12 +3,10 @@
 # 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: $(QUILT_STAMPFN)
+configure-stamp:
 	echo $(DEB_BUILD_ARCH)
 	dh_testdir
 	qmake-qt4 -recursive main.pro \
@@ -39,7 +37,7 @@
 	slice2html src/murmur/Murmur.ice --output-dir Ice
 	touch $@
 
-clean:	unpatch
+clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-arch-stamp build-indep-stamp configure-stamp
@@ -105,7 +103,7 @@
 	dh_fixperms
 	dh_perl $(CURDIR)/debian/mumble-server-web/usr/lib/cgi-bin/mumble-server
 	dh_installdeb
-	dh_shlibdeps -Xlib32/mumble/ -- -xglibc-private
+	dh_shlibdeps -Xlib32/mumble/
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb