On Monday, July 23, 2012 13:26:57, Don Armstrong wrote:
> On Mon, 23 Jul 2012, Chris Knadle wrote:
> > On Monday, July 23, 2012 10:34:28, Ian Jackson wrote:
> > > Of these 2. would seem to be the best option.
> >
> > I agree.
>
> [...]
>
> I believe in order to actually evaluate any of these solutions,
> someone is going to have to prepare binaries, and do an table showing
> the tested (not theoretical) compatibility of with multiple different
> clients (and servers?) to their solution's server and client.
>
> I propose that whoever wants to see a particular solution actually sit
> down and do the work for their particular solution, with sources,
> binaries, interdiffs, and compatibility table conveniently available in
> some public location.
Attached is a patch for fixing the build for the "348" version of Mumble in
Wheezy, which includes embedding celt 0.7.1 into the mumble package and
removing the dependency on the celt library. There are two versions attached:
a diff that can be applied directly via 'patch -p1 < ', and an mbox file
that can be applied to the git repository via 'git am ' against tag
v1.2.3-348-g317f5a0-1.
Quick summary of changes:
- Remove broken mumble-server-web package
- Change maintainer from Debian VoIP team to Ron Lee
- Remove Patrick Matthäi from Uploaders
- Hardcode use of and add dependency on g++-4.6
- Remove boost 1.46 dependency resolution
- Remove libgl dependency resolution
- Depend on ice34 and drop resolution via older versions
- Build and embed celt 0.7.1 (and not celt 0.11.0)
One interesting difference when using the embedded version rather than the
celt library is that Mumble reports using "Celt 0.7.0" in the Server ->
Information screen, rather than "Celt 0.0.0" that is reported when using the
external celt library.
-- Chris
--
Chris Knadle
chris.kna...@coredump.us
GPG Key: 4096R/0x1E759A726A9FDD74
diff --git a/debian/MurmurPHP.ini b/debian/MurmurPHP.ini
deleted file mode 100644
index 4937106..000
--- a/debian/MurmurPHP.ini
+++ /dev/null
@@ -1 +0,0 @@
-ice.slice=/usr/share/slice/Murmur.ice
diff --git a/debian/changelog b/debian/changelog
index e0fa95f..79bd682 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+mumble (1.2.3-348-g317f5a0-1.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove broken mumble-server-web package
+ * Change maintainer from Debian VoIP team to Ron Lee
+ * Remove uploader Patrick Matthäi
+ * Hardcode use of and add dependency on g++-4.6
+ * Remove boost 1.46 dependency resolution
+ * Remove libgl dependency resolution
+ * Depend on ice34 and drop resolution via older versions
+ * Use embedded celt 0.7.1
+
+ -- Christopher Knadle Wed, 01 Aug 2012 06:42:30 -0400
+
mumble (1.2.3-348-g317f5a0-1) unstable; urgency=low
* New upstream snapshot from 20.05.2012.
diff --git a/debian/control b/debian/control
index 435588e..066ad12 100644
--- a/debian/control
+++ b/debian/control
@@ -2,27 +2,25 @@ Source: mumble
Section: sound
Priority: optional
Homepage: http://mumble.sourceforge.net/
-Maintainer: Debian VoIP Team
-Uploaders: Patrick Matthäi ,
- Thorvald Natvig
-Build-Depends: debhelper (>= 7.0.8),
+Maintainer: Ron Lee
+Uploaders: Thorvald Natvig
+Build-Depends: debhelper (>= 7.0.8), g++-4.6,
po-debconf,
- libboost1.46-dev | libboost-dev (>= 1.38.0),
- libboost-python1.46-dev | libboost-python-dev (>= 1.38.0),
+ libboost-dev (>= 1.42),
+ libboost-python-dev (>= 1.42),
libqt4-dev (>= 4.5.0),
hardening-wrapper,
- libgl1-mesa-dev | libgl-dev,
+ libgl1-mesa-dev,
libasound2-dev,
libpulse-dev,
libogg-dev,
libspeex-dev,
libspeexdsp-dev,
- libcelt-dev (>= 0.7.0),
libsndfile1-dev,
libssl-dev,
- libzeroc-ice34-dev | libzeroc-ice33-dev | libzeroc-ice32-dev | libzeroc-ice-dev,
- ice34-translators | ice33-translators | ice32-translators | ice-translators,
- ice34-slice | ice33-slice | ice32-slice | ice-slice,
+ libzeroc-ice34-dev (>= 3.4.2-8.1),
+ ice34-translators (>= 3.4.2-8.1),
+ ice34-slice (>= 3.4.2-8.1),
libg15daemon-client-dev,
libspeechd-dev,
protobuf-compiler,
@@ -38,7 +36,6 @@ Package: mumble
Architecture: any
Depends: ${shlibs:Depends},
${misc:Depends},
- libcelt0 (>= 0.7.0) | libcelt0-0 (>= 0.7.1~),
libqt4-sql-sqlite,
lsb-release
Recommends: speech-dispatcher
@@ -87,21 +84,3 @@ Description: Low latency VoIP client (debugging symbols)
.
This package contains the debugging symbols for the 'mumble' and
'mumble-server' packages.
-
-Package: mumble-server-web
-Architecture: all
-Depends: ${misc:Depends},
- ${perl:Depends},
- mumble-server (>= ${binary:Version}),
- apache2,
- exim4 | mail-transport-agent,
- libnet-dbus-perl,
- libcgi-session-perl,
- libhtml-template-perl,
- php-zeroc-ice,
- ice34-translators | ice33-translators | ice32-translators | ice-translators,
- ice34-slice | ice33-slice | ice32-slice | ice-slice
-Description: Web scripts for mumble-server
- Murmur (in the package mumble-server) is the VoIP server compo
