diff -urNp mumble-0.9.4/debian/changelog mumble-0.9.4-jjl/debian/changelog --- mumble-0.9.4/debian/changelog 2006-10-30 12:20:38.000000000 +0100 +++ mumble-0.9.4-jjl/debian/changelog 2006-12-15 22:43:48.000000000 +0100 @@ -1,3 +1,9 @@ +mumble (0.9.4-0ubuntu1) dapper; urgency=low + + * Ugly backport to dapper (speex static build) + + -- JJL Fri, 15 Dec 2006 21:20:50 +0100 + mumble (0.9.4) edgy; urgency=low * Global shortcuts working diff -urNp mumble-0.9.4/debian/control mumble-0.9.4-jjl/debian/control --- mumble-0.9.4/debian/control 2006-10-30 12:20:38.000000000 +0100 +++ mumble-0.9.4-jjl/debian/control 2006-12-15 21:36:41.000000000 +0100 @@ -2,7 +2,7 @@ Source: mumble Section: comm Priority: optional Maintainer: Thorvald Natvig -Build-Depends: debhelper (>= 4.0.0), libqt4-dev (>= 4.2.0), libspeex-dev (>= 1.1.12), libboost-dev (>= 1.33.1), libasound2-dev (>= 1.0.10), libxevie-dev (>= 1.0.0) +Build-Depends: debhelper (>= 4.0.0), libqt4-dev (>= 4.1.2), libboost-dev (>= 1.33.1), libasound2-dev (>= 1.0.10), libxevie-dev (>= 1.0.0) Standards-Version: 3.6.2 Package: mumble diff -urNp mumble-0.9.4/debian/rules mumble-0.9.4-jjl/debian/rules --- mumble-0.9.4/debian/rules 2006-10-30 12:20:38.000000000 +0100 +++ mumble-0.9.4-jjl/debian/rules 2006-12-16 13:41:13.000000000 +0100 @@ -90,9 +90,14 @@ install-arch: # $(MAKE) install install -d $(CURDIR)/debian/mumble/usr/bin install -d $(CURDIR)/debian/mumble-server/usr/bin + install -d $(CURDIR)/debian/mumble-server/opt/mumble-server + install -d $(CURDIR)/debian/mumble-server/opt/mumble-server/cgi-bin install ./mumble $(CURDIR)/debian/mumble/usr/bin install ./murmur $(CURDIR)/debian/mumble-server/usr/bin - + install ./murmur.ini $(CURDIR)/debian/mumble-server/opt/mumble-server + install ./web.py $(CURDIR)/debian/mumble-server/opt/mumble-server + install ./murmur.pl $(CURDIR)/debian/mumble-server/opt/mumble-server/cgi-bin + dh_install -s # Must not depend on anything. This is to be called by # binary-arch/binary-indep diff -urNp mumble-0.9.4/mumble.pro mumble-0.9.4-jjl/mumble.pro --- mumble-0.9.4/mumble.pro 2006-10-30 12:20:38.000000000 +0100 +++ mumble-0.9.4-jjl/mumble.pro 2006-12-15 21:33:42.000000000 +0100 @@ -7,15 +7,15 @@ RC_FILE = mumble.rc HEADERS = ACL.h BanEditor.h Group.h ACLEditor.h Channel.h Log.h TrayIcon.h AudioConfigDialog.h AudioStats.h AudioInput.h AudioOutput.h MainWindow.h Connection.h ServerHandler.h Player.h About.h Message.h ConnectDialog.h GlobalShortcut.h TextToSpeech.h Settings.h Database.h VersionCheck.h Global.h PlayerModel.h Audio.h ConfigDialog.h Plugins.h SOURCES = ACL.cpp BanEditor.cpp Group.cpp ACLEditor.cpp Channel.cpp Log.cpp AudioConfigDialog.cpp AudioStats.cpp AudioInput.cpp AudioOutput.cpp main.cpp MainWindow.cpp Message.cpp Connection.cpp ServerHandler.cpp Player.cpp About.cpp ConnectDialog.cpp Settings.cpp Database.cpp VersionCheck.cpp Global.cpp PlayerModel.cpp Audio.cpp ConfigDialog.cpp Plugins.cpp DIST += licenses.h mumble.ico plugins/mumble_plugin.h overlay/overlay.h -INCLUDEPATH += include -LIBS += -Llib -L. +INCLUDEPATH += include ../speex-1.2beta1/include +LIBS += -L../speex-1.2beta1/libspeex/.libs -Llib -L. RESOURCES += mumble.qrc TRANSLATIONS = mumble_es.ts mumble_de.ts mumble_tr.ts PRECOMPILED_HEADER = mumble_pch.h -LIBS += -lspeex +LIBS += -Bstatic -lspeex -Bdynamic win32 { HEADERS += DXAudioInput.h DXAudioOutput.h DXConfigDialog.h GlobalShortcut_win.h Overlay.h diff -urNp mumble-0.9.4/murmur.ini mumble-0.9.4-jjl/murmur.ini --- mumble-0.9.4/murmur.ini 2006-10-30 12:20:38.000000000 +0100 +++ mumble-0.9.4-jjl/murmur.ini 2006-12-16 13:31:45.000000000 +0100 @@ -9,7 +9,7 @@ loop=false # Path to database. If blank, will search for # murmur.sqlite in default locations. -database= +database=/opt/mumble-server/murmur.sqlite # Password to join server serverpassword= diff -urNp mumble-0.9.4/murmur.pl mumble-0.9.4-jjl/murmur.pl --- mumble-0.9.4/murmur.pl 2006-10-30 12:20:38.000000000 +0100 +++ mumble-0.9.4-jjl/murmur.pl 2006-12-16 13:31:39.000000000 +0100 @@ -21,10 +21,10 @@ use DBI; our $servername = "Mumble & Murmur Test Server"; # Where is the murmur.sqlite database to be found? -our $dbpath = "murmur.sqlite"; +our $dbpath = "/opt/mumble-server/murmur.sqlite"; # Who should outgoing authentication emails be from? -our $emailfrom = ""; +our $emailfrom = "murmur"; # And what server should be used? our $emailserver = "localhost"; diff -urNp mumble-0.9.4/web.py mumble-0.9.4-jjl/web.py --- mumble-0.9.4/web.py 1970-01-01 01:00:00.000000000 +0100 +++ mumble-0.9.4-jjl/web.py 2006-12-16 14:16:33.000000000 +0100 @@ -0,0 +1,18 @@ +#!/usr/bin/python +# very small python web server for murmur.pl +# JJL + +from BaseHTTPServer import HTTPServer +from CGIHTTPServer import CGIHTTPRequestHandler + +class murmurRH (CGIHTTPRequestHandler): + + def send_head(self): + if not self.is_cgi(): + self.cgi_info = "/cgi-bin","murmur.pl" + return self.run_cgi() + + +serv = HTTPServer( ("", 31284), murmurRH) +serv.serve_forever() +