On Sun, 07 Oct 2012 16:57:51 +0200, gregor herrmann wrote:
Still, I'd appreciate a quick look by a CTTE member to check if this
implements their decision correctly, and especially a pre-approval of
the RT, since this is targetted at wheezy (please note that the
versions in wheezy and sid are already different, and this patch
applies on top of the version in sid). -- Thanks in advance!
I'm attaching the diff between the versions in wheezy and the version
in sid + the proposed patch for easier reviewing.
Cheers,
gregor
--
.''`. Homepage: http://info.comodo.priv.at/ - OpenPGP key 0xBB3A68018649AA06
: :' : Debian GNU/Linux user, admin, and developer - http://www.debian.org/
`. `' Member of VIBE!AT SPI, fellow of the Free Software Foundation Europe
`- NP: Donovan: Dignity Of Man
diff -Nru mumble-1.2.3-348-g317f5a0/debian/MurmurPHP.ini mumble-1.2.3-349-g315b5f5/debian/MurmurPHP.ini
--- mumble-1.2.3-348-g317f5a0/debian/MurmurPHP.ini 2012-05-24 20:33:03.0 +0200
+++ mumble-1.2.3-349-g315b5f5/debian/MurmurPHP.ini 1970-01-01 01:00:00.0 +0100
@@ -1 +0,0 @@
-ice.slice=/usr/share/slice/Murmur.ice
diff -Nru mumble-1.2.3-348-g317f5a0/debian/changelog mumble-1.2.3-349-g315b5f5/debian/changelog
--- mumble-1.2.3-348-g317f5a0/debian/changelog 2012-05-24 20:33:03.0 +0200
+++ mumble-1.2.3-349-g315b5f5/debian/changelog 2012-10-14 18:37:03.0 +0200
@@ -1,3 +1,72 @@
+mumble (1.2.3-349-g315b5f5-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Fix Cannot communicate with the vast majority of Mumble servers due
+to lack of required baseline codec:
+re-enable using the bundled celt library:
+ debian/patches/series:
+ - add 07-use-embedded-celt-baseline patch
+ debian/patches/07-use-embedded-celt-baseline:
+ - build Celt 0.7.1 and not 0.11.0
+ debian/mumble.install:
+ - ship Celt 0.7.1 library from the embedded source
+ debian/rules:
+ - re-enable Celt using the bundled 0.7.1 version
+ debian/patches/20-add-opus-threshold-option:
+ - fix src/murmur/Meta.cpp to set default iOpusThreshold=100 to only
+ switch from Celt to Opus if 100% of connected clients support Opus
+ (instead of 1%)
+ - fix murmur.ini example for opusthreshold option to =100
+ (instead of =1)
+ - add #opusthreshold=100 comments to murmur.ini.system (shipped as
+ etc/mumble-server.ini) to match murmur.ini example
+Closes: #675971.
+This implements the TC decision in #682010.
+[Thanks to Gregor Herrmann for his help and guidance.]
+
+ -- Christopher Knadle chris.kna...@coredump.us Thu, 04 Oct 2012 11:45:05 -0400
+
+mumble (1.2.3-349-g315b5f5-2) unstable; urgency=low
+
+ * Drop the hard dep on boost-1.46, that's been removed now. Closes: #678759
+Drop the | dep on alternative boost, since that's what got this package
+overlooked when people were removing boost-1.46.
+
+ * Drop the | dep on libgl-dev, that's been gone a long time now too and
+leaves us vulnerable to a similar problem.
+
+ * Drop the mumble-server-web package altogether. Upstream reports that it
+is unmaintained and pretty useless anyway, which seems to be well backed
+up by the fact that a call to Ice_intversion() was added in March 2010,
+and that function has never existed in any version of zeroc-ice ever.
+A function named Ice_intVersion was added to -ice 3.2.1 though ...
+Since it's taken this long for anyone to notice, we can be pretty sure that
+there aren't any actual users of it. Closes: #676815, #676816
+
+ * Build-Depend on the unfycked version of zeroc-ice, so the ABI broken one
+doesn't accidentally get used by an out of date buildd. Closes: #675955
+Force building with gcc-4.6, since that's required for zeroc-ice deps now,
+until they get their act together and write some actually legal code.
+
+ * Cherry-pick the upstream patches to fix the audio glitches, and provide
+codec thresholds and warnings. Closes: #675971 since it fixes the only
+actual bug reported there.
+
+ * Drop the watch file, since this has been building snapshots from git now
+since 1.2.3-3 (and before).
+
+ -- Ron Lee r...@debian.org Sun, 08 Jul 2012 06:18:50 +0930
+
+mumble (1.2.3-349-g315b5f5-1) unstable; urgency=low
+
+ * Adopt the package. Closes: #674719
+ * Drop the dependency on the celt package. Closes: #674650
+ * Add the upstream patch to enable opus support.
+ * Explicitly disable the bundled libs, don't rely on system lib detection
+doing that as a side-effect.
+
+ -- Ron Lee r...@debian.org Mon, 04 Jun 2012 03:56:35 +0930
+
mumble (1.2.3-348-g317f5a0-1) unstable; urgency=low
* New upstream snapshot from 20.05.2012.
diff -Nru mumble-1.2.3-348-g317f5a0/debian/control mumble-1.2.3-349-g315b5f5/debian/control
--- mumble-1.2.3-348-g317f5a0/debian/control 2012-05-24 20:33:03.0 +0200
+++